From b80ddba30fdd7cc354e72ffa59d4498d16cf3670 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 26 Jul 2024 18:04:40 +0000
Subject: [PATCH 001/128] Port sample visual units component code (from
 nathang15) to current development

---
 package-lock.json                             | 693 +++++++++++++++++-
 package.json                                  |   2 +
 .../app/components/HeaderButtonsComponent.tsx |  11 +-
 src/client/app/components/RouteComponent.tsx  |   4 +-
 .../CreateVisualUnitModalMapComponent.tsx     | 131 ++++
 .../visual-unit/VisualUnitDetailComponent.tsx |  65 ++
 src/client/app/translations/data.ts           |   3 +
 7 files changed, 899 insertions(+), 10 deletions(-)
 create mode 100644 src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
 create mode 100644 src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx

diff --git a/package-lock.json b/package-lock.json
index 29a99bf36..68bc1cd28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
 				"bootstrap": "~5.3.3",
 				"csv": "~5.3.2",
 				"csv-stringify": "~5.6.5",
+				"d3": "~7.8.5",
 				"dotenv": "~16.4.5",
 				"escape-html": "~1.0.3",
 				"express": "~4.19.2",
@@ -57,6 +58,7 @@
 			},
 			"devDependencies": {
 				"@redux-devtools/extension": "~3.2.5",
+				"@types/d3": "~7.4.3",
 				"@types/lodash": "~4.17.4",
 				"@types/node": "~20.14.10",
 				"@types/plotly.js": "~2.29.2",
@@ -976,6 +978,259 @@
 			"integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
 			"dev": true
 		},
+		"node_modules/@types/d3": {
+			"version": "7.4.3",
+			"resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
+			"integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-array": "*",
+				"@types/d3-axis": "*",
+				"@types/d3-brush": "*",
+				"@types/d3-chord": "*",
+				"@types/d3-color": "*",
+				"@types/d3-contour": "*",
+				"@types/d3-delaunay": "*",
+				"@types/d3-dispatch": "*",
+				"@types/d3-drag": "*",
+				"@types/d3-dsv": "*",
+				"@types/d3-ease": "*",
+				"@types/d3-fetch": "*",
+				"@types/d3-force": "*",
+				"@types/d3-format": "*",
+				"@types/d3-geo": "*",
+				"@types/d3-hierarchy": "*",
+				"@types/d3-interpolate": "*",
+				"@types/d3-path": "*",
+				"@types/d3-polygon": "*",
+				"@types/d3-quadtree": "*",
+				"@types/d3-random": "*",
+				"@types/d3-scale": "*",
+				"@types/d3-scale-chromatic": "*",
+				"@types/d3-selection": "*",
+				"@types/d3-shape": "*",
+				"@types/d3-time": "*",
+				"@types/d3-time-format": "*",
+				"@types/d3-timer": "*",
+				"@types/d3-transition": "*",
+				"@types/d3-zoom": "*"
+			}
+		},
+		"node_modules/@types/d3-array": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
+			"integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
+			"dev": true
+		},
+		"node_modules/@types/d3-axis": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+			"integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-selection": "*"
+			}
+		},
+		"node_modules/@types/d3-brush": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+			"integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-selection": "*"
+			}
+		},
+		"node_modules/@types/d3-chord": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+			"integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
+			"dev": true
+		},
+		"node_modules/@types/d3-color": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+			"integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
+			"dev": true
+		},
+		"node_modules/@types/d3-contour": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+			"integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-array": "*",
+				"@types/geojson": "*"
+			}
+		},
+		"node_modules/@types/d3-delaunay": {
+			"version": "6.0.4",
+			"resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+			"integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
+			"dev": true
+		},
+		"node_modules/@types/d3-dispatch": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
+			"integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
+			"dev": true
+		},
+		"node_modules/@types/d3-drag": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+			"integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-selection": "*"
+			}
+		},
+		"node_modules/@types/d3-dsv": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+			"integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
+			"dev": true
+		},
+		"node_modules/@types/d3-ease": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+			"integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
+			"dev": true
+		},
+		"node_modules/@types/d3-fetch": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+			"integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-dsv": "*"
+			}
+		},
+		"node_modules/@types/d3-force": {
+			"version": "3.0.10",
+			"resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
+			"integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
+			"dev": true
+		},
+		"node_modules/@types/d3-format": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
+			"integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
+			"dev": true
+		},
+		"node_modules/@types/d3-geo": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+			"integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/geojson": "*"
+			}
+		},
+		"node_modules/@types/d3-hierarchy": {
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
+			"integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
+			"dev": true
+		},
+		"node_modules/@types/d3-interpolate": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+			"integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-color": "*"
+			}
+		},
+		"node_modules/@types/d3-path": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
+			"integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==",
+			"dev": true
+		},
+		"node_modules/@types/d3-polygon": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+			"integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
+			"dev": true
+		},
+		"node_modules/@types/d3-quadtree": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+			"integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
+			"dev": true
+		},
+		"node_modules/@types/d3-random": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
+			"integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
+			"dev": true
+		},
+		"node_modules/@types/d3-scale": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+			"integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-time": "*"
+			}
+		},
+		"node_modules/@types/d3-scale-chromatic": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
+			"integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==",
+			"dev": true
+		},
+		"node_modules/@types/d3-selection": {
+			"version": "3.0.10",
+			"resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz",
+			"integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==",
+			"dev": true
+		},
+		"node_modules/@types/d3-shape": {
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+			"integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-path": "*"
+			}
+		},
+		"node_modules/@types/d3-time": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
+			"integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==",
+			"dev": true
+		},
+		"node_modules/@types/d3-time-format": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+			"integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
+			"dev": true
+		},
+		"node_modules/@types/d3-timer": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+			"integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
+			"dev": true
+		},
+		"node_modules/@types/d3-transition": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz",
+			"integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-selection": "*"
+			}
+		},
+		"node_modules/@types/d3-zoom": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+			"integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
+			"dev": true,
+			"dependencies": {
+				"@types/d3-interpolate": "*",
+				"@types/d3-selection": "*"
+			}
+		},
 		"node_modules/@types/eslint": {
 			"version": "8.44.7",
 			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz",
@@ -1002,6 +1257,12 @@
 			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
 			"dev": true
 		},
+		"node_modules/@types/geojson": {
+			"version": "7946.0.14",
+			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
+			"integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==",
+			"dev": true
+		},
 		"node_modules/@types/hoist-non-react-statics": {
 			"version": "3.3.5",
 			"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
@@ -1633,14 +1894,6 @@
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
-		"node_modules/add-dom-event-listener": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
-			"integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
-			"dependencies": {
-				"object-assign": "4.x"
-			}
-		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -3018,11 +3271,85 @@
 				"type": "^1.0.1"
 			}
 		},
+		"node_modules/d3": {
+			"version": "7.8.5",
+			"resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
+			"integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
+			"dependencies": {
+				"d3-array": "3",
+				"d3-axis": "3",
+				"d3-brush": "3",
+				"d3-chord": "3",
+				"d3-color": "3",
+				"d3-contour": "4",
+				"d3-delaunay": "6",
+				"d3-dispatch": "3",
+				"d3-drag": "3",
+				"d3-dsv": "3",
+				"d3-ease": "3",
+				"d3-fetch": "3",
+				"d3-force": "3",
+				"d3-format": "3",
+				"d3-geo": "3",
+				"d3-hierarchy": "3",
+				"d3-interpolate": "3",
+				"d3-path": "3",
+				"d3-polygon": "3",
+				"d3-quadtree": "3",
+				"d3-random": "3",
+				"d3-scale": "4",
+				"d3-scale-chromatic": "3",
+				"d3-selection": "3",
+				"d3-shape": "3",
+				"d3-time": "3",
+				"d3-time-format": "4",
+				"d3-timer": "3",
+				"d3-transition": "3",
+				"d3-zoom": "3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-array": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
 			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
 		},
+		"node_modules/d3-axis": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+			"integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-brush": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+			"integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+			"dependencies": {
+				"d3-dispatch": "1 - 3",
+				"d3-drag": "2 - 3",
+				"d3-interpolate": "1 - 3",
+				"d3-selection": "3",
+				"d3-transition": "3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-chord": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+			"integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+			"dependencies": {
+				"d3-path": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-collection": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
@@ -3036,11 +3363,118 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-contour": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+			"integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+			"dependencies": {
+				"d3-array": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-contour/node_modules/d3-array": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+			"dependencies": {
+				"internmap": "1 - 2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-delaunay": {
+			"version": "6.0.4",
+			"resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+			"integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+			"dependencies": {
+				"delaunator": "5"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-dispatch": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
 			"integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
 		},
+		"node_modules/d3-drag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+			"integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+			"dependencies": {
+				"d3-dispatch": "1 - 3",
+				"d3-selection": "3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-dsv": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+			"integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+			"dependencies": {
+				"commander": "7",
+				"iconv-lite": "0.6",
+				"rw": "1"
+			},
+			"bin": {
+				"csv2json": "bin/dsv2json.js",
+				"csv2tsv": "bin/dsv2dsv.js",
+				"dsv2dsv": "bin/dsv2dsv.js",
+				"dsv2json": "bin/dsv2json.js",
+				"json2csv": "bin/json2dsv.js",
+				"json2dsv": "bin/json2dsv.js",
+				"json2tsv": "bin/json2dsv.js",
+				"tsv2csv": "bin/dsv2dsv.js",
+				"tsv2json": "bin/dsv2json.js"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-dsv/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/d3-dsv/node_modules/iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/d3-ease": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+			"integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-fetch": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+			"integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+			"dependencies": {
+				"d3-dsv": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-force": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
@@ -3104,11 +3538,84 @@
 			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
 			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
 		},
+		"node_modules/d3-polygon": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+			"integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-quadtree": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
 			"integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
 		},
+		"node_modules/d3-random": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+			"integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-scale": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+			"integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+			"dependencies": {
+				"d3-array": "2.10.0 - 3",
+				"d3-format": "1 - 3",
+				"d3-interpolate": "1.2.0 - 3",
+				"d3-time": "2.1.1 - 3",
+				"d3-time-format": "2 - 4"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-scale-chromatic": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+			"integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+			"dependencies": {
+				"d3-color": "1 - 3",
+				"d3-interpolate": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-scale/node_modules/d3-array": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+			"dependencies": {
+				"internmap": "1 - 2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-scale/node_modules/d3-time": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+			"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+			"dependencies": {
+				"d3-array": "2 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-selection": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+			"integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-shape": {
 			"version": "1.3.7",
 			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
@@ -3135,6 +3642,155 @@
 			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
 			"integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
 		},
+		"node_modules/d3-transition": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+			"integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+			"dependencies": {
+				"d3-color": "1 - 3",
+				"d3-dispatch": "1 - 3",
+				"d3-ease": "1 - 3",
+				"d3-interpolate": "1 - 3",
+				"d3-timer": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"d3-selection": "2 - 3"
+			}
+		},
+		"node_modules/d3-zoom": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+			"integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+			"dependencies": {
+				"d3-dispatch": "1 - 3",
+				"d3-drag": "2 - 3",
+				"d3-interpolate": "1 - 3",
+				"d3-selection": "2 - 3",
+				"d3-transition": "2 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-array": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+			"dependencies": {
+				"internmap": "1 - 2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-dispatch": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+			"integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-force": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+			"integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+			"dependencies": {
+				"d3-dispatch": "1 - 3",
+				"d3-quadtree": "1 - 3",
+				"d3-timer": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-format": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+			"integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-geo": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+			"integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+			"dependencies": {
+				"d3-array": "2.5.0 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-hierarchy": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+			"integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-path": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+			"integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-quadtree": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+			"integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-shape": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+			"integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+			"dependencies": {
+				"d3-path": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-time": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+			"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+			"dependencies": {
+				"d3-array": "2 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-time-format": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+			"integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+			"dependencies": {
+				"d3-time": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-timer": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+			"integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/debug": {
 			"version": "4.3.4",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -3230,6 +3886,14 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/delaunator": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+			"integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+			"dependencies": {
+				"robust-predicates": "^3.0.2"
+			}
+		},
 		"node_modules/delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -5234,6 +5898,14 @@
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
+		"node_modules/internmap": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+			"integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/interpret": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
@@ -8329,6 +9001,11 @@
 				"inherits": "^2.0.1"
 			}
 		},
+		"node_modules/robust-predicates": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+			"integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
diff --git a/package.json b/package.json
index f9a48c1bb..fa5f6d8de 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
 		"bootstrap": "~5.3.3",
 		"csv": "~5.3.2",
 		"csv-stringify": "~5.6.5",
+		"d3": "~7.8.5",
 		"dotenv": "~16.4.5",
 		"escape-html": "~1.0.3",
 		"express": "~4.19.2",
@@ -104,6 +105,7 @@
 	},
 	"devDependencies": {
 		"@redux-devtools/extension": "~3.2.5",
+		"@types/d3": "~7.4.3",
 		"@types/lodash": "~4.17.4",
 		"@types/node": "~20.14.10",
 		"@types/plotly.js": "~2.29.2",
diff --git a/src/client/app/components/HeaderButtonsComponent.tsx b/src/client/app/components/HeaderButtonsComponent.tsx
index 5e289288e..6be18cf34 100644
--- a/src/client/app/components/HeaderButtonsComponent.tsx
+++ b/src/client/app/components/HeaderButtonsComponent.tsx
@@ -60,6 +60,7 @@ export default function HeaderButtonsComponent() {
 		shouldCSVButtonDisabled: true,
 		shouldUnitsButtonDisabled: true,
 		shouldConversionsButtonDisabled: true,
+		shouldVisualUnitMapButtonDisabled: true,
 		// Translated menu title that depend on whether logged in.
 		menuTitle: '',
 		// link to help page for page choices. Should not see default but use general help URL.
@@ -93,7 +94,8 @@ export default function HeaderButtonsComponent() {
 			shouldMapsButtonDisabled: pathname === '/maps',
 			shouldCSVButtonDisabled: pathname === '/csv',
 			shouldUnitsButtonDisabled: pathname === '/units',
-			shouldConversionsButtonDisabled: pathname === '/conversions'
+			shouldConversionsButtonDisabled: pathname === '/conversions',
+			shouldVisualUnitMapButtonDisabled: pathname === '/visual-unit'
 		}));
 	}, [pathname]);
 
@@ -203,6 +205,13 @@ export default function HeaderButtonsComponent() {
 								to="/units">
 								<FormattedMessage id='units' />
 							</DropdownItem>
+							<DropdownItem
+								style={state.adminViewableLinkStyle}
+								disabled={state.shouldVisualUnitMapButtonDisabled}
+								tag={Link}
+								to="/visual-unit">
+								<FormattedMessage id='visual-unit' />
+							</DropdownItem>
 							<DropdownItem divider style={state.adminViewableLinkStyle} />
 							<DropdownItem
 								style={state.adminViewableLinkStyle}
diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
index ddeb46469..cbbe212f8 100644
--- a/src/client/app/components/RouteComponent.tsx
+++ b/src/client/app/components/RouteComponent.tsx
@@ -26,6 +26,7 @@ import UnitsDetailComponent from './unit/UnitsDetailComponent';
 import ErrorComponent from './router/ErrorComponent';
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
 import CreateUserComponent from './admin/CreateUserComponent';
+import VisualUnitDetailComponent from './visual-unit/VisualUnitDetailComponent';
 
 /**
  * @returns the router component Responsible for client side routing.
@@ -60,7 +61,8 @@ const router = createBrowserRouter([
 					{ path: 'users/new', element: <CreateUserComponent /> },
 					{ path: 'units', element: <UnitsDetailComponent /> },
 					{ path: 'conversions', element: <ConversionsDetailComponent /> },
-					{ path: 'users', element: <UsersDetailComponent /> }
+					{ path: 'users', element: <UsersDetailComponent /> },
+					{ path: 'visual-unit', element: <VisualUnitDetailComponent/> }
 				]
 			},
 			{
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
new file mode 100644
index 000000000..c44de5d99
--- /dev/null
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -0,0 +1,131 @@
+import * as React from 'react';
+import * as d3 from 'd3';
+import { useEffect } from 'react';
+// import { useSelector } from 'react-redux';
+// import { State } from 'types/redux/state';
+// import { noUnitTranslated } from 'utils/input';
+// import { MeterData } from 'types/redux/meters';
+// import { CurrentUserState } from 'types/redux/currentUser';
+// import { UnitData } from 'types/redux/units';
+// import { Dispatch } from 'types/redux/actions';
+// import { useDispatch } from 'react-redux';
+// import { fetchMetersDetailsIfNeeded } from 'actions/meters';
+
+interface Node {
+	id: string;
+	x?: number;
+	y?: number;
+}
+
+interface Link {
+	source: string;
+	target: string;
+}
+
+interface GraphData {
+	nodes: Node[];
+	links: Link[];
+}
+
+// interface MeterViewComponentProps {
+// 	meter: MeterData;
+// 	currentUser: CurrentUserState;
+// 	// These two aren't used in this component but are passed to the edit component
+// 	// This is done to avoid having to recalculate the possible units sets in each view component
+// 	possibleMeterUnits: Set<UnitData>;
+// 	possibleGraphicUnits: Set<UnitData>;
+// }
+
+export default function CreateVisualUnitMapModalComponent() {
+	// const dispatch: Dispatch = useDispatch();
+
+	// useEffect(() => {
+	// 	// Makes async call to Meters API for Meters details if one has not already been made somewhere else, stores Meter ids in state
+	// 	dispatch(fetchMetersDetailsIfNeeded());
+	// }, []);
+
+	// // Access Redux state directly
+	// const currentUnitState = useSelector((state: State) => state.units.units);
+	// const meterDetails = useSelector((state: State) => state.meters); // Replace with your actual slice name
+
+	// useEffect(() => {
+	//   // Check if meterDetails are available
+	//   if (meterDetails && meterDetails.length > 0) {
+	//     meterDetails.forEach((meter: MeterData) => {
+	//       const unitName = (Object.keys(currentUnitState).length === 0 || meter.unitId === -99) ?
+	//         noUnitTranslated().identifier : currentUnitState[meter.unitId].identifier;
+
+	//       const graphicName = (Object.keys(currentUnitState).length === 0 || meter.defaultGraphicUnit === -99) ?
+	//         noUnitTranslated().identifier : currentUnitState[meter.defaultGraphicUnit].identifier;
+
+	//       console.log('Meter Unit Name:', unitName);
+	//       console.log('Meter Graphic Name:', graphicName);
+	//       console.log('Meter Details:', meter);
+	//     });
+	//   }
+	// }, [currentUnitState, meterDetails]);
+
+	useEffect(() => {
+		const margin = { top: 10, right: 30, bottom: 30, left: 40 };
+		const width = 400 - margin.left - margin.right;
+		const height = 400 - margin.top - margin.bottom;
+
+		const svg = d3.select('#sample')
+			.append('svg')
+			.attr('width', width + margin.left + margin.right)
+			.attr('height', height + margin.top + margin.bottom)
+			.append('g')
+			.attr('transform', `translate(${margin.left}, ${margin.top})`);
+
+		d3.json<GraphData>('https://raw.githubusercontent.com/holtzy/D3-graph-gallery/master/DATA/data_network.json').then(function (data) {
+			if (!data) {
+				console.error('Data is undefined or null.');
+				return;
+			}
+
+			// connection link style
+			const link = svg.selectAll('line')
+				.data(data.links)
+				.enter().append('line')
+				.style('stroke', '#aaa');
+
+			// node style
+			const node = svg.selectAll('circle')
+				.data(data.nodes)
+				.enter().append('circle')
+				.attr('r', 20)
+				.style('fill', '#69b3a2');
+
+			d3.forceSimulation(data.nodes)
+				.force('link', d3.forceLink()
+					.id(function (d) { return (d as Node).id; })
+					.links(data.links)
+				)
+				.force('charge', d3.forceManyBody().strength(-400))
+				.force('center', d3.forceCenter(width / 2, height / 2))
+				.on('tick', ticked);
+
+			function ticked() {
+				link
+					.attr('x1', function (d) { return (d.source as d3.SimulationNodeDatum).x ?? 0; })
+					.attr('y1', function (d) { return (d.source as d3.SimulationNodeDatum).y ?? 0; })
+					.attr('x2', function (d) { return (d.target as d3.SimulationNodeDatum).x ?? 0; })
+					.attr('y2', function (d) { return (d.target as d3.SimulationNodeDatum).y ?? 0; });
+
+				node
+					.attr('cx', function (d) { return (d.x as number) + 6; })
+					.attr('cy', function (d) { return (d.y as number) - 6; });
+			}
+
+		}).catch(error => {
+			console.error('Error loading data:', error);
+		});
+	}, []); // Empty dependency array to run the effect only once
+
+	return (
+		<div>
+			<h2>Sample Network Graph</h2>
+			<div id="sample"></div>
+		</div>
+	);
+}
\ No newline at end of file
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
new file mode 100644
index 000000000..1b19f9cd5
--- /dev/null
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -0,0 +1,65 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+import { FormattedMessage } from 'react-intl';
+import TooltipHelpComponent from '../TooltipHelpComponent';
+// import TooltipMarkerComponent from '../TooltipMarkerComponent';
+import * as React from 'react';
+// import { useDispatch, useSelector } from 'react-redux';
+// import { useEffect } from 'react';
+// import { State } from '../../types/redux/state';
+// import { fetchUnitsDetailsIfNeeded } from '../../actions/units';
+// import UnitViewComponent from './UnitViewComponent';
+// import CreateUnitModalComponent from './CreateUnitModalComponent';
+// import { UnitData } from 'types/redux/units';
+// import SpinnerComponent from '../../components/SpinnerComponent';
+// import { Dispatch } from 'types/redux/actions';
+import CreateVisualUnitMapModalComponent from './CreateVisualUnitModalMapComponent';
+
+/**
+ * Defines the units page card view
+ * @returns Units page element
+ */
+export default function VisualUnitDetailComponent() {
+	// The route stops you from getting to this page if not an admin.
+
+	// const dispatch: Dispatch = useDispatch();
+
+	// useEffect(() => {
+	// 	// Makes async call to units API for units details if one has not already been made somewhere else, stores unit ids in state
+	// 	dispatch(fetchUnitsDetailsIfNeeded());
+	// }, []);
+
+	//Units state
+	// const unitsState = useSelector((state: State) => state.units.units);
+
+	const titleStyle: React.CSSProperties = {
+		textAlign: 'center'
+	};
+
+	// const tooltipStyle = {
+	// 	display: 'inline-block',
+	// 	fontSize: '50%',
+	// 	// For now, only an admin can see the unit page.
+	// 	tooltipVisualUnitView: 'help.admin.unitview'
+	// };
+
+	return (
+		<div>
+			<TooltipHelpComponent page='visual-unit' />
+
+			<div className='container-fluid'>
+				<h2 style={titleStyle}>
+					<FormattedMessage id='visual-unit' />
+					{/* <div style={tooltipStyle}>
+							<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
+						</div> */}
+				</h2>
+			</div>
+
+			<div style={titleStyle}>
+				<CreateVisualUnitMapModalComponent/>
+			</div>
+		</div>
+	);
+}
\ No newline at end of file
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 0b21ce823..29293cc90 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -496,6 +496,7 @@ const LocaleTranslationData = {
 		"uses": "uses",
 		"view.groups": "View Groups",
 		"visit": " or visit our ",
+		"visual-unit": "Visual Units Graph",
 		"website": "website",
 		"week": "Week",
 		"yes": "yes",
@@ -992,6 +993,7 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Visionner les groupes",
 		"visit": " ou visitez notre ",
+		"visual-unit": "Visual Units Graph.\u{26A1}",
 		"website": "site web",
 		"week": "Semaine",
 		"yes": " yes\u{26A1}",
@@ -1487,6 +1489,7 @@ const LocaleTranslationData = {
 		"uses":"usos",
 		"view.groups": "Ver grupos",
 		"visit": " o visite nuestro ",
+		"visual-unit": "Visual Units Graph.\u{26A1}",
 		"website": "sitio web",
 		"week": "semana",
 		"yes": "sí",

From 5e2b5bd33d7a1b3ef3b714224a22ebdb274c0d8e Mon Sep 17 00:00:00 2001
From: ianLewis8 <ianlewis319@gmail.com>
Date: Tue, 30 Jul 2024 15:18:06 -0400
Subject: [PATCH 002/128] Developing new database model

Initial commit towards making a database to store logs.
---
 src/server/models/LogBase.js                  | 76 +++++++++++++++++++
 .../sql/logbase/create_logbase_table.sql      |  7 ++
 src/server/sql/logbase/get_all_logs.sql       |  4 +
 .../sql/logbase/get_logs_from_dates.sql       | 10 +++
 src/server/sql/logbase/get_logs_from_type.sql |  9 +++
 src/server/sql/logbase/insert_new_log.sql     |  5 ++
 6 files changed, 111 insertions(+)
 create mode 100644 src/server/models/LogBase.js
 create mode 100644 src/server/sql/logbase/create_logbase_table.sql
 create mode 100644 src/server/sql/logbase/get_all_logs.sql
 create mode 100644 src/server/sql/logbase/get_logs_from_dates.sql
 create mode 100644 src/server/sql/logbase/get_logs_from_type.sql
 create mode 100644 src/server/sql/logbase/insert_new_log.sql

diff --git a/src/server/models/LogBase.js b/src/server/models/LogBase.js
new file mode 100644
index 000000000..dcc54d6ee
--- /dev/null
+++ b/src/server/models/LogBase.js
@@ -0,0 +1,76 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const database = require('./database');
+const { mapToObject, threeDHoleAlgorithm } = require('../util');
+const determineMaxPoints = require('../util/determineMaxPoints');
+const log = require('../log');
+const { isReadonlyKeywordOrPlusOrMinusToken } = require('typescript');
+const LogEmail = require('./LogEmail');
+
+const sqlFile = database.sqlFile;
+
+class LogBase {
+	/**
+	 * Creates a new log
+	 * @param logType
+	 * @param logMessage
+	 * @param {Moment} logTime
+	 */
+  constructor(logType, logMessage, logTime) {
+		this.logType = logType;
+		this.logMessage = logMessage;
+		this.logTime = logTime;
+	}
+
+	/**
+	 * Returns a promise to create the logging table
+	 * @param conn the database connection to use
+	 * @returns {Promise.<>}
+	 */
+	static createTable(conn) {
+		return conn.none(sqlFile('logbase/create_logbase_table.sql'));
+	}
+
+  /**
+   * Returns a promise to insert this log into the database
+   * @param conn the database connection to use
+   * @returns {Promise.<>}
+   */
+  async insert(conn) {
+    const logBase = this;
+    await conn.none(sqlFile('logbase/insert_new_log.sql'), logBase);
+  }
+
+  /**
+   * Returns a promise to get all of the logs from the database
+   * @param conn the connection to be used.
+   * @returns {Promise.<array.<LogBase>>}
+   */
+  static async getAll(conn) {
+    const rows = await conn.any(sqlFile('logbase/get_all_logs.sql'));
+    if (rows.length > 0) {
+      return rows.map(row => new LogEmail(row.logType, row.logMessage, row.logTime));
+    }
+  }
+
+  /**
+   * Returns a promise to get all of the logs in between two dates.
+   * If no startDate is specified, all logs before the endDate are returned.
+   * If no endDate is specified, all logs after the startDate are returned.
+   * @param {Date} startDate
+   * @param {Date} endDate
+   * @param conn is the connection to use.
+   * @returns {Promise.<array.<LogBase>>}
+   */
+  static async getLogsByDateRange(startDate, endDate, conn) {
+    const rows = await conn.any(sqlFile('logbase/get_logs_from_dates.sql'), {
+      startDate: startDate,
+      endDate: endDate
+    });
+
+    return rows;
+  }
+}
+module.exports = LogBase;
\ No newline at end of file
diff --git a/src/server/sql/logbase/create_logbase_table.sql b/src/server/sql/logbase/create_logbase_table.sql
new file mode 100644
index 000000000..db13bd1e4
--- /dev/null
+++ b/src/server/sql/logbase/create_logbase_table.sql
@@ -0,0 +1,7 @@
+
+--create logbase table
+CREATE TABLE IF NOT EXISTS logbase (
+  log_type VARCHAR(5) NOT NULL,
+  log_message VARCHAR(100) NOT NULL,
+  log_time TIMESTAMP NOT NULL
+);
\ No newline at end of file
diff --git a/src/server/sql/logbase/get_all_logs.sql b/src/server/sql/logbase/get_all_logs.sql
new file mode 100644
index 000000000..3e3e55bc4
--- /dev/null
+++ b/src/server/sql/logbase/get_all_logs.sql
@@ -0,0 +1,4 @@
+
+
+-- gets all logs in the database
+SELECT * FROM logbase;
\ No newline at end of file
diff --git a/src/server/sql/logbase/get_logs_from_dates.sql b/src/server/sql/logbase/get_logs_from_dates.sql
new file mode 100644
index 000000000..3294a0f2f
--- /dev/null
+++ b/src/server/sql/logbase/get_logs_from_dates.sql
@@ -0,0 +1,10 @@
+
+
+-- Gets logs in table by date range. This is then ordered by time ascending.
+SELECT 
+  -- Short column names for smaller data.
+  log_type as p, log_message as m, log_time as i
+FROM logbase 
+WHERE log_time >= COALESCE(${startDate}, '-infinity'::TIMESTAMP)
+  AND log_time <= COALESCE(${endDate}, 'infinity'::TIMESTAMP)
+ORDER BY log_time ASC;
\ No newline at end of file
diff --git a/src/server/sql/logbase/get_logs_from_type.sql b/src/server/sql/logbase/get_logs_from_type.sql
new file mode 100644
index 000000000..8d453ab5e
--- /dev/null
+++ b/src/server/sql/logbase/get_logs_from_type.sql
@@ -0,0 +1,9 @@
+
+
+-- Gets logs in table by date range. This is then ordered by time ascending.
+SELECT 
+  -- Short column names for smaller data.
+  log_type as p, log_message as m, log_time as i
+FROM logbase 
+WHERE log_type = ${logType}
+ORDER BY log_time ASC;
\ No newline at end of file
diff --git a/src/server/sql/logbase/insert_new_log.sql b/src/server/sql/logbase/insert_new_log.sql
new file mode 100644
index 000000000..e8e20caa0
--- /dev/null
+++ b/src/server/sql/logbase/insert_new_log.sql
@@ -0,0 +1,5 @@
+
+
+--Inserts a new log into the table
+INSERT INTO logbase (log_type, log_message, log_time)
+VALUES (${logType}, ${logMessage}, ${logTime});

From 0578ebedcac5a48df789fff30bbe75e525c15112 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Wed, 31 Jul 2024 22:20:25 +0000
Subject: [PATCH 003/128] Readded buttons and removed unecessary buttons

---
 src/client/app/components/BarChartComponent.tsx    | 3 ++-
 src/client/app/components/LineChartComponent.tsx   | 4 ++--
 src/client/app/components/RadarChartComponent.tsx  | 2 +-
 src/client/app/components/ThreeDComponent.tsx      | 3 ++-
 src/client/app/containers/CompareChartContainer.ts | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index 755509308..8e80d6636 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -100,7 +100,8 @@ export default function BarChartComponent() {
 				}}
 				config={{
 					responsive: true,
-					displayModeBar: false,
+					displayModeBar: true,
+					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],
 					// Current Locale
 					locale,
 					// Available Locales
diff --git a/src/client/app/components/LineChartComponent.tsx b/src/client/app/components/LineChartComponent.tsx
index f71058629..299aeb9d3 100644
--- a/src/client/app/components/LineChartComponent.tsx
+++ b/src/client/app/components/LineChartComponent.tsx
@@ -86,8 +86,8 @@ export default function LineChartComponent() {
 				}}
 				config={{
 					responsive: true,
-					displayModeBar: false,
-					// Current Locale
+					displayModeBar: true,
+					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],					// Current Locale
 					locale,
 					// Available Locales
 					locales: Locales
diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index 37ce9a0b7..b40deebc0 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -328,7 +328,7 @@ export default function RadarChartComponent() {
 				useResizeHandler={true}
 				config={{
 					displayModeBar: true,
-					responsive: true,
+					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],					responsive: true,
 					locales: Locales // makes locales available for use
 				}}
 				layout={layout}
diff --git a/src/client/app/components/ThreeDComponent.tsx b/src/client/app/components/ThreeDComponent.tsx
index 658df7415..d25d156b5 100644
--- a/src/client/app/components/ThreeDComponent.tsx
+++ b/src/client/app/components/ThreeDComponent.tsx
@@ -80,7 +80,8 @@ export default function ThreeDComponent() {
 					layout={layout as Plotly.Layout}
 					config={{
 						responsive: true,
-						displayModeBar: false,
+						displayModeBar: true,
+						modeBarButtonsToRemove: ['resetCameraDefault3d'],
 						// Current Locale
 						locale,
 						// Available Locales
diff --git a/src/client/app/containers/CompareChartContainer.ts b/src/client/app/containers/CompareChartContainer.ts
index bfbce1b9c..82599c8c8 100644
--- a/src/client/app/containers/CompareChartContainer.ts
+++ b/src/client/app/containers/CompareChartContainer.ts
@@ -230,7 +230,8 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		data: datasets,
 		layout,
 		config: {
-			displayModeBar: false,
+			displayModeBar: true,
+			modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],
 			locale,
 			locales: Locales // makes locales available for use
 		}

From bb54aa3838e132c316bd97498213494926d02608 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 2 Aug 2024 17:54:48 +0000
Subject: [PATCH 004/128] Build graph from unit and conversion data from redux

---
 .../CreateVisualUnitModalMapComponent.tsx     | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index c44de5d99..4c9dad34d 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -1,6 +1,9 @@
 import * as React from 'react';
 import * as d3 from 'd3';
 import { useEffect } from 'react';
+import { useAppSelector } from '../../redux/reduxHooks';
+import { selectAllUnits } from '../../redux/api/unitsApi';
+import { selectConversionsDetails } from '../../redux/api/conversionsApi';
 // import { useSelector } from 'react-redux';
 // import { State } from 'types/redux/state';
 // import { noUnitTranslated } from 'utils/input';
@@ -65,10 +68,31 @@ export default function CreateVisualUnitMapModalComponent() {
 	//   }
 	// }, [currentUnitState, meterDetails]);
 
+	const jsonData: { nodes: any[], links: any[] } = {
+		nodes: [],
+		links: []
+	};
+
+	const unitData = useAppSelector(selectAllUnits);
+	unitData.map(function (value) {
+		jsonData.nodes.push({
+			'name': value.name,
+			'id': value.id
+		});
+	});
+
+	const conversionData = useAppSelector(selectConversionsDetails);
+	conversionData.map(function (value) {
+		jsonData.links.push({
+			'source': value.sourceId,
+			'target': value.destinationId
+		});
+	});
+
 	useEffect(() => {
 		const margin = { top: 10, right: 30, bottom: 30, left: 40 };
-		const width = 400 - margin.left - margin.right;
-		const height = 400 - margin.top - margin.bottom;
+		const width = 1200 - margin.left - margin.right;
+		const height = 600 - margin.top - margin.bottom;
 
 		const svg = d3.select('#sample')
 			.append('svg')
@@ -85,23 +109,23 @@ export default function CreateVisualUnitMapModalComponent() {
 
 			// connection link style
 			const link = svg.selectAll('line')
-				.data(data.links)
+				.data(jsonData.links)
 				.enter().append('line')
 				.style('stroke', '#aaa');
 
 			// node style
 			const node = svg.selectAll('circle')
-				.data(data.nodes)
+				.data(jsonData.nodes)
 				.enter().append('circle')
-				.attr('r', 20)
+				.attr('r', 15)
 				.style('fill', '#69b3a2');
 
-			d3.forceSimulation(data.nodes)
+			d3.forceSimulation(jsonData.nodes)
 				.force('link', d3.forceLink()
 					.id(function (d) { return (d as Node).id; })
-					.links(data.links)
+					.links(jsonData.links)
 				)
-				.force('charge', d3.forceManyBody().strength(-400))
+				.force('charge', d3.forceManyBody().strength(-50))
 				.force('center', d3.forceCenter(width / 2, height / 2))
 				.on('tick', ticked);
 

From b4dae28791c64b69d4669ab66a7061b57ee86107 Mon Sep 17 00:00:00 2001
From: ianLewis8 <ianlewis319@gmail.com>
Date: Fri, 2 Aug 2024 15:10:02 -0400
Subject: [PATCH 005/128] LogMsg Model

Almost finished LogMsg database model
---
 src/server/models/LogBase.js                  |  76 -----------
 src/server/models/LogMsg.js                   | 126 ++++++++++++++++++
 .../sql/logbase/create_logbase_table.sql      |   7 -
 src/server/sql/logbase/get_all_logs.sql       |   4 -
 src/server/sql/logbase/get_logs_from_type.sql |   9 --
 src/server/sql/logbase/insert_new_log.sql     |   5 -
 .../sql/logmsg/create_log_types_enum.sql      |   9 ++
 src/server/sql/logmsg/create_logmsg_table.sql |  13 ++
 src/server/sql/logmsg/get_all_logs.sql        |   6 +
 .../get_logs_from_dates.sql                   |   8 +-
 .../logmsg/get_logs_from_dates_and_type.sql   |  13 ++
 src/server/sql/logmsg/get_logs_from_type.sql  |  11 ++
 src/server/sql/logmsg/insert_new_log.sql      |   7 +
 13 files changed, 189 insertions(+), 105 deletions(-)
 delete mode 100644 src/server/models/LogBase.js
 create mode 100644 src/server/models/LogMsg.js
 delete mode 100644 src/server/sql/logbase/create_logbase_table.sql
 delete mode 100644 src/server/sql/logbase/get_all_logs.sql
 delete mode 100644 src/server/sql/logbase/get_logs_from_type.sql
 delete mode 100644 src/server/sql/logbase/insert_new_log.sql
 create mode 100644 src/server/sql/logmsg/create_log_types_enum.sql
 create mode 100644 src/server/sql/logmsg/create_logmsg_table.sql
 create mode 100644 src/server/sql/logmsg/get_all_logs.sql
 rename src/server/sql/{logbase => logmsg}/get_logs_from_dates.sql (51%)
 create mode 100644 src/server/sql/logmsg/get_logs_from_dates_and_type.sql
 create mode 100644 src/server/sql/logmsg/get_logs_from_type.sql
 create mode 100644 src/server/sql/logmsg/insert_new_log.sql

diff --git a/src/server/models/LogBase.js b/src/server/models/LogBase.js
deleted file mode 100644
index dcc54d6ee..000000000
--- a/src/server/models/LogBase.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const database = require('./database');
-const { mapToObject, threeDHoleAlgorithm } = require('../util');
-const determineMaxPoints = require('../util/determineMaxPoints');
-const log = require('../log');
-const { isReadonlyKeywordOrPlusOrMinusToken } = require('typescript');
-const LogEmail = require('./LogEmail');
-
-const sqlFile = database.sqlFile;
-
-class LogBase {
-	/**
-	 * Creates a new log
-	 * @param logType
-	 * @param logMessage
-	 * @param {Moment} logTime
-	 */
-  constructor(logType, logMessage, logTime) {
-		this.logType = logType;
-		this.logMessage = logMessage;
-		this.logTime = logTime;
-	}
-
-	/**
-	 * Returns a promise to create the logging table
-	 * @param conn the database connection to use
-	 * @returns {Promise.<>}
-	 */
-	static createTable(conn) {
-		return conn.none(sqlFile('logbase/create_logbase_table.sql'));
-	}
-
-  /**
-   * Returns a promise to insert this log into the database
-   * @param conn the database connection to use
-   * @returns {Promise.<>}
-   */
-  async insert(conn) {
-    const logBase = this;
-    await conn.none(sqlFile('logbase/insert_new_log.sql'), logBase);
-  }
-
-  /**
-   * Returns a promise to get all of the logs from the database
-   * @param conn the connection to be used.
-   * @returns {Promise.<array.<LogBase>>}
-   */
-  static async getAll(conn) {
-    const rows = await conn.any(sqlFile('logbase/get_all_logs.sql'));
-    if (rows.length > 0) {
-      return rows.map(row => new LogEmail(row.logType, row.logMessage, row.logTime));
-    }
-  }
-
-  /**
-   * Returns a promise to get all of the logs in between two dates.
-   * If no startDate is specified, all logs before the endDate are returned.
-   * If no endDate is specified, all logs after the startDate are returned.
-   * @param {Date} startDate
-   * @param {Date} endDate
-   * @param conn is the connection to use.
-   * @returns {Promise.<array.<LogBase>>}
-   */
-  static async getLogsByDateRange(startDate, endDate, conn) {
-    const rows = await conn.any(sqlFile('logbase/get_logs_from_dates.sql'), {
-      startDate: startDate,
-      endDate: endDate
-    });
-
-    return rows;
-  }
-}
-module.exports = LogBase;
\ No newline at end of file
diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
new file mode 100644
index 000000000..b0f67007f
--- /dev/null
+++ b/src/server/models/LogMsg.js
@@ -0,0 +1,126 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const database = require('./database');
+const { mapToObject, threeDHoleAlgorithm } = require('../util');
+const determineMaxPoints = require('../util/determineMaxPoints');
+const log = require('../log');
+const { isReadonlyKeywordOrPlusOrMinusToken } = require('typescript');
+const LogEmail = require('./LogEmail');
+
+const sqlFile = database.sqlFile;
+
+class LogMsg {
+	/**
+	 * Creates a new log
+	 * @param logType
+	 * @param logMessage
+	 * @param {Moment} logTime
+	 */
+	constructor(logType, logMessage, logTime) {
+		this.logType = logType;
+		this.logMessage = logMessage;
+		this.logTime = logTime;
+	}
+
+	/**
+	 * Creates a new log from data in the row
+	 * @param {*} row The row from which the log is to be created.
+	 * @returns The new log object.
+	 */
+	static mapRow(row) {
+		return new LogMsg(row.logType, row.logMessage, row.logTime);
+	}
+
+	/**
+	 * Returns a promise to create the logging table
+	 * @param conn the database connection to use
+	 * @returns {Promise.<>}
+	 */
+	static createTable(conn) {
+		return conn.none(sqlFile('logmsg/create_logmsg_table.sql'));
+	}
+
+	/**
+	 * Returns a promise to create the logMsgType enum.
+	 * @param {*} conn The connection to use.
+	 * @returns {Promise.<>}
+	 */
+		static createLogMsgTypeEnum(conn) {
+			return conn.none(sqlFile('logmsg/create_log_types_enum.sql'));
+		}
+
+	/**
+	 * Returns a promise to insert this log into the database
+	 * @param conn the database connection to use
+	 * @returns {Promise.<>}
+	 */
+	async insert(conn) {
+		const logMsg = this;
+		await conn.none(sqlFile('logmsg/insert_new_log.sql'), logMsg);
+	}
+
+	/**
+	 * Returns a promise to get all of the logs from the database
+	 * @param conn the connection to be used.
+	 * @returns {Promise.<array.<logMsg>>}
+	 */
+	static async getAll(conn) {
+		const rows = await conn.any(sqlFile('logmsg/get_all_logs.sql'));
+		if (rows.length > 0) {
+			return rows.map(LogMsg.mapRow);
+		}
+	}
+
+	/**
+	 * Returns a promise to get all of the logs in between two dates.
+	 * If no startDate is specified, all logs before the endDate are returned.
+	 * If no endDate is specified, all logs after the startDate are returned.
+	 * @param {Date} startDate
+	 * @param {Date} endDate
+	 * @param conn is the connection to use.
+	 * @returns {Promise.<array.<LogMsg>>}
+	 */
+	static async getLogsByDateRange(startDate, endDate, conn) {
+		const rows = await conn.any(sqlFile('logmsg/get_logs_from_dates.sql'), {
+			startDate: startDate,
+			endDate: endDate
+		});
+
+		return rows.map(LogMsg.mapRow);
+	}
+
+	/**
+	 * Returns a promise to get all of the logs of a certain type
+	 * @param logType
+	 * @param conn is the connection to use.
+	 * @returns {Promise.<array.<LogMsg>>}
+	 */
+	static async getLogsByType(logType, conn){
+		const rows = await conn.any(sqlFile('logmsg/get_logs_from_type.sql'), {logType: logType});
+
+		return rows.map(LogMsg.mapRow);
+	}
+
+	/**
+	 * Returns a promise to get all of the logs in between two dates.
+	 * If no startDate is specified, all logs before the endDate are returned.
+	 * If no endDate is specified, all logs after the startDate are returned.
+	 * @param {Date} startDate
+	 * @param {Date} endDate
+	 * @param logType
+	 * @param conn is the connection to use.
+	 * @returns {Promise.<array.<LogMsg>>}
+	 */
+	static async getLogsByDateRangeAndType(startDate, endDate, logType, conn) {
+		const rows = await conn.any(sqlFile('logmsg/get_logs_from_dates_and_type.sql'), {
+			startDate: startDate,
+			endDate: endDate,
+			logType: logType
+		});
+
+		return rows.map(LogMsg.mapRow);
+	}
+}
+module.exports = LogMsg;
\ No newline at end of file
diff --git a/src/server/sql/logbase/create_logbase_table.sql b/src/server/sql/logbase/create_logbase_table.sql
deleted file mode 100644
index db13bd1e4..000000000
--- a/src/server/sql/logbase/create_logbase_table.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-
---create logbase table
-CREATE TABLE IF NOT EXISTS logbase (
-  log_type VARCHAR(5) NOT NULL,
-  log_message VARCHAR(100) NOT NULL,
-  log_time TIMESTAMP NOT NULL
-);
\ No newline at end of file
diff --git a/src/server/sql/logbase/get_all_logs.sql b/src/server/sql/logbase/get_all_logs.sql
deleted file mode 100644
index 3e3e55bc4..000000000
--- a/src/server/sql/logbase/get_all_logs.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
--- gets all logs in the database
-SELECT * FROM logbase;
\ No newline at end of file
diff --git a/src/server/sql/logbase/get_logs_from_type.sql b/src/server/sql/logbase/get_logs_from_type.sql
deleted file mode 100644
index 8d453ab5e..000000000
--- a/src/server/sql/logbase/get_logs_from_type.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
--- Gets logs in table by date range. This is then ordered by time ascending.
-SELECT 
-  -- Short column names for smaller data.
-  log_type as p, log_message as m, log_time as i
-FROM logbase 
-WHERE log_type = ${logType}
-ORDER BY log_time ASC;
\ No newline at end of file
diff --git a/src/server/sql/logbase/insert_new_log.sql b/src/server/sql/logbase/insert_new_log.sql
deleted file mode 100644
index e8e20caa0..000000000
--- a/src/server/sql/logbase/insert_new_log.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
---Inserts a new log into the table
-INSERT INTO logbase (log_type, log_message, log_time)
-VALUES (${logType}, ${logMessage}, ${logTime});
diff --git a/src/server/sql/logmsg/create_log_types_enum.sql b/src/server/sql/logmsg/create_log_types_enum.sql
new file mode 100644
index 000000000..64df5b2ab
--- /dev/null
+++ b/src/server/sql/logmsg/create_log_types_enum.sql
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+DO $$ BEGIN 
+	CREATE TYPE log_msg_type AS ENUM('INFO', 'WARN', 'ERROR', 'DEBUG', 'SILENT');
+EXCEPTION
+	WHEN duplicate_object THEN null;
+END $$;
\ No newline at end of file
diff --git a/src/server/sql/logmsg/create_logmsg_table.sql b/src/server/sql/logmsg/create_logmsg_table.sql
new file mode 100644
index 000000000..1e6cfc5d8
--- /dev/null
+++ b/src/server/sql/logmsg/create_logmsg_table.sql
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+--create logmsg table
+CREATE TABLE IF NOT EXISTS logmsg (
+	id SERIAL PRIMARY KEY,
+	log_type log_msg_type NOT NULL,
+	log_message TEXT NOT NULL,
+	log_time TIMESTAMP NOT NULL
+);
+
+-- TODO Consider index optimization for queries
\ No newline at end of file
diff --git a/src/server/sql/logmsg/get_all_logs.sql b/src/server/sql/logmsg/get_all_logs.sql
new file mode 100644
index 000000000..b44910172
--- /dev/null
+++ b/src/server/sql/logmsg/get_all_logs.sql
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- gets all logs in the database
+SELECT * FROM logmsg;
\ No newline at end of file
diff --git a/src/server/sql/logbase/get_logs_from_dates.sql b/src/server/sql/logmsg/get_logs_from_dates.sql
similarity index 51%
rename from src/server/sql/logbase/get_logs_from_dates.sql
rename to src/server/sql/logmsg/get_logs_from_dates.sql
index 3294a0f2f..17780ef5a 100644
--- a/src/server/sql/logbase/get_logs_from_dates.sql
+++ b/src/server/sql/logmsg/get_logs_from_dates.sql
@@ -2,9 +2,9 @@
 
 -- Gets logs in table by date range. This is then ordered by time ascending.
 SELECT 
-  -- Short column names for smaller data.
-  log_type as p, log_message as m, log_time as i
-FROM logbase 
+	-- Short column names for smaller data.
+	log_type, log_message as log_msg, log_time
+FROM logmsg 
 WHERE log_time >= COALESCE(${startDate}, '-infinity'::TIMESTAMP)
-  AND log_time <= COALESCE(${endDate}, 'infinity'::TIMESTAMP)
+	AND log_time <= COALESCE(${endDate}, 'infinity'::TIMESTAMP)
 ORDER BY log_time ASC;
\ No newline at end of file
diff --git a/src/server/sql/logmsg/get_logs_from_dates_and_type.sql b/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
new file mode 100644
index 000000000..90fe43b1f
--- /dev/null
+++ b/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- Gets logs in table by date range. This is then ordered by time ascending.
+SELECT 
+	-- Short column names for smaller data.
+	log_type as p, log_message as m, log_time as i
+FROM logmsg 
+WHERE log_type = ${logType}
+	AND log_time >= COALESCE(${startDate}, '-infinity'::TIMESTAMP)
+	AND log_time <= COALESCE(${endDate}, 'infinity'::TIMESTAMP)
+ORDER BY log_time ASC;
\ No newline at end of file
diff --git a/src/server/sql/logmsg/get_logs_from_type.sql b/src/server/sql/logmsg/get_logs_from_type.sql
new file mode 100644
index 000000000..2997292ff
--- /dev/null
+++ b/src/server/sql/logmsg/get_logs_from_type.sql
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- Gets logs in table by date range. This is then ordered by time ascending.
+SELECT 
+	-- Short column names for smaller data.
+	log_type, log_message as log_msg, log_time
+FROM logmsg 
+WHERE log_type = ${logType}
+ORDER BY log_time ASC;
\ No newline at end of file
diff --git a/src/server/sql/logmsg/insert_new_log.sql b/src/server/sql/logmsg/insert_new_log.sql
new file mode 100644
index 000000000..2c5726ca7
--- /dev/null
+++ b/src/server/sql/logmsg/insert_new_log.sql
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+--Inserts a new log into the table
+INSERT INTO logmsg (log_type, log_message, log_time)
+VALUES (${logType}, ${logMessage}, ${logTime});

From 25ad55cd862066b08454cfcb5d159daf76c87590 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 2 Aug 2024 19:25:49 +0000
Subject: [PATCH 006/128] Remove sample data framework and reorganize

---
 .../CreateVisualUnitModalMapComponent.tsx     | 106 +++++++-----------
 1 file changed, 43 insertions(+), 63 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 4c9dad34d..a2bbc4fc9 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -14,22 +14,6 @@ import { selectConversionsDetails } from '../../redux/api/conversionsApi';
 // import { useDispatch } from 'react-redux';
 // import { fetchMetersDetailsIfNeeded } from 'actions/meters';
 
-interface Node {
-	id: string;
-	x?: number;
-	y?: number;
-}
-
-interface Link {
-	source: string;
-	target: string;
-}
-
-interface GraphData {
-	nodes: Node[];
-	links: Link[];
-}
-
 // interface MeterViewComponentProps {
 // 	meter: MeterData;
 // 	currentUser: CurrentUserState;
@@ -68,14 +52,14 @@ export default function CreateVisualUnitMapModalComponent() {
 	//   }
 	// }, [currentUnitState, meterDetails]);
 
-	const jsonData: { nodes: any[], links: any[] } = {
+	const data: { nodes: any[], links: any[] } = {
 		nodes: [],
 		links: []
 	};
 
 	const unitData = useAppSelector(selectAllUnits);
 	unitData.map(function (value) {
-		jsonData.nodes.push({
+		data.nodes.push({
 			'name': value.name,
 			'id': value.id
 		});
@@ -83,7 +67,7 @@ export default function CreateVisualUnitMapModalComponent() {
 
 	const conversionData = useAppSelector(selectConversionsDetails);
 	conversionData.map(function (value) {
-		jsonData.links.push({
+		data.links.push({
 			'source': value.sourceId,
 			'target': value.destinationId
 		});
@@ -91,64 +75,60 @@ export default function CreateVisualUnitMapModalComponent() {
 
 	useEffect(() => {
 		const margin = { top: 10, right: 30, bottom: 30, left: 40 };
-		const width = 1200 - margin.left - margin.right;
+		const width = 600 - margin.left - margin.right;
 		const height = 600 - margin.top - margin.bottom;
 
+		const nodes = data.nodes.map(d => ({...d}));
+		const links = data.links.map(d => ({...d}));
+
+		const simulation = d3.forceSimulation(nodes)
+			.force('link', d3.forceLink(links).id((d: any) => d.id))
+			.force('charge', d3.forceManyBody().strength(-200))
+			.force('x', d3.forceX())
+			.force('y', d3.forceY());
+
 		const svg = d3.select('#sample')
 			.append('svg')
 			.attr('width', width + margin.left + margin.right)
 			.attr('height', height + margin.top + margin.bottom)
+			.attr('viewBox',
+				[-(width + margin.left + margin.right) / 2, -(height + margin.top + margin.bottom) / 2,
+					width + margin.left + margin.right, height + margin.top + margin.bottom]
+			)
 			.append('g')
 			.attr('transform', `translate(${margin.left}, ${margin.top})`);
 
-		d3.json<GraphData>('https://raw.githubusercontent.com/holtzy/D3-graph-gallery/master/DATA/data_network.json').then(function (data) {
-			if (!data) {
-				console.error('Data is undefined or null.');
-				return;
-			}
-
-			// connection link style
-			const link = svg.selectAll('line')
-				.data(jsonData.links)
-				.enter().append('line')
-				.style('stroke', '#aaa');
-
-			// node style
-			const node = svg.selectAll('circle')
-				.data(jsonData.nodes)
-				.enter().append('circle')
-				.attr('r', 15)
-				.style('fill', '#69b3a2');
-
-			d3.forceSimulation(jsonData.nodes)
-				.force('link', d3.forceLink()
-					.id(function (d) { return (d as Node).id; })
-					.links(jsonData.links)
-				)
-				.force('charge', d3.forceManyBody().strength(-50))
-				.force('center', d3.forceCenter(width / 2, height / 2))
-				.on('tick', ticked);
-
-			function ticked() {
-				link
-					.attr('x1', function (d) { return (d.source as d3.SimulationNodeDatum).x ?? 0; })
-					.attr('y1', function (d) { return (d.source as d3.SimulationNodeDatum).y ?? 0; })
-					.attr('x2', function (d) { return (d.target as d3.SimulationNodeDatum).x ?? 0; })
-					.attr('y2', function (d) { return (d.target as d3.SimulationNodeDatum).y ?? 0; });
-
-				node
-					.attr('cx', function (d) { return (d.x as number) + 6; })
-					.attr('cy', function (d) { return (d.y as number) - 6; });
-			}
-
-		}).catch(error => {
-			console.error('Error loading data:', error);
+		// connection link style
+		const link = svg.selectAll('line')
+			.data(links)
+			.enter().append('line')
+			.style('stroke', '#aaa')
+			.attr('stroke-width', 3);
+
+		// node style
+		const node = svg.selectAll('.node')
+			.data(nodes)
+			.enter().append('circle')
+			.attr('r', 12)
+			.style('fill', '#69b3a2')
+			.text(function(d) { return d.name; });
+
+		simulation.on('tick', () => {
+			link
+				.attr('x1', d => d.source.x)
+				.attr('y1', d => d.source.y)
+				.attr('x2', d => d.target.x)
+				.attr('y2', d => d.target.y);
+
+			node
+				.attr('cx', d => d.x)
+				.attr('cy', d => d.y);
 		});
+
 	}, []); // Empty dependency array to run the effect only once
 
 	return (
 		<div>
-			<h2>Sample Network Graph</h2>
 			<div id="sample"></div>
 		</div>
 	);

From 195396cdd8a822923b655dd018a095a13dc7f5be Mon Sep 17 00:00:00 2001
From: ianLewis8 <ianlewis319@gmail.com>
Date: Fri, 2 Aug 2024 16:19:33 -0400
Subject: [PATCH 007/128] slight changes

forgot to include these in push
---
 src/server/sql/logmsg/get_logs_from_dates_and_type.sql | 3 +--
 src/server/sql/logmsg/get_logs_from_type.sql           | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/server/sql/logmsg/get_logs_from_dates_and_type.sql b/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
index 90fe43b1f..48450804a 100644
--- a/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
+++ b/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
@@ -4,8 +4,7 @@
 
 -- Gets logs in table by date range. This is then ordered by time ascending.
 SELECT 
-	-- Short column names for smaller data.
-	log_type as p, log_message as m, log_time as i
+	log_type, log_message, log_time
 FROM logmsg 
 WHERE log_type = ${logType}
 	AND log_time >= COALESCE(${startDate}, '-infinity'::TIMESTAMP)
diff --git a/src/server/sql/logmsg/get_logs_from_type.sql b/src/server/sql/logmsg/get_logs_from_type.sql
index 2997292ff..0e72fd0d1 100644
--- a/src/server/sql/logmsg/get_logs_from_type.sql
+++ b/src/server/sql/logmsg/get_logs_from_type.sql
@@ -4,7 +4,6 @@
 
 -- Gets logs in table by date range. This is then ordered by time ascending.
 SELECT 
-	-- Short column names for smaller data.
 	log_type, log_message as log_msg, log_time
 FROM logmsg 
 WHERE log_type = ${logType}

From 07584018e18c138a20eb3b86d4869ecbf70265eb Mon Sep 17 00:00:00 2001
From: ianLewis8 <ianlewis319@gmail.com>
Date: Wed, 7 Aug 2024 16:34:59 -0400
Subject: [PATCH 008/128] Update get logs from dates

added header file
---
 src/server/sql/logmsg/get_logs_from_dates.sql | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/sql/logmsg/get_logs_from_dates.sql b/src/server/sql/logmsg/get_logs_from_dates.sql
index 17780ef5a..7e20b1350 100644
--- a/src/server/sql/logmsg/get_logs_from_dates.sql
+++ b/src/server/sql/logmsg/get_logs_from_dates.sql
@@ -1,4 +1,6 @@
-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 -- Gets logs in table by date range. This is then ordered by time ascending.
 SELECT 

From 1aad2d3bea9caf26cbf6b038d28e286e05a7a5d1 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Thu, 8 Aug 2024 21:07:21 +0000
Subject: [PATCH 009/128] Put unit labels on each node

---
 .../CreateVisualUnitModalMapComponent.tsx      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index a2bbc4fc9..58af62417 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -110,8 +110,18 @@ export default function CreateVisualUnitMapModalComponent() {
 			.data(nodes)
 			.enter().append('circle')
 			.attr('r', 12)
-			.style('fill', '#69b3a2')
-			.text(function(d) { return d.name; });
+			.style('fill', '#69b3a2');
+
+		// label style
+		const label = svg.selectAll('.label')
+			.data(nodes)
+			.enter()
+			.append('text')
+			.text(function (d) { return d.name; })
+			.style('text-anchor', 'middle')
+			.style('fill', '#555')
+			.style('font-family', 'Arial')
+			.style('font-size', 12);
 
 		simulation.on('tick', () => {
 			link
@@ -123,6 +133,10 @@ export default function CreateVisualUnitMapModalComponent() {
 			node
 				.attr('cx', d => d.x)
 				.attr('cy', d => d.y);
+
+			label
+				.attr('x', function(d){ return d.x; })
+				.attr('y', function (d) {return d.y - 10; });
 		});
 
 	}, []); // Empty dependency array to run the effect only once

From 338cb02c09589617fbda803db6158c826eeec5c0 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 9 Aug 2024 18:20:04 +0000
Subject: [PATCH 010/128] Add arrows to links and removed unused code

---
 .../CreateVisualUnitModalMapComponent.tsx     | 148 +++++++++---------
 1 file changed, 75 insertions(+), 73 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 58af62417..6431c747a 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -4,124 +4,105 @@ import { useEffect } from 'react';
 import { useAppSelector } from '../../redux/reduxHooks';
 import { selectAllUnits } from '../../redux/api/unitsApi';
 import { selectConversionsDetails } from '../../redux/api/conversionsApi';
-// import { useSelector } from 'react-redux';
-// import { State } from 'types/redux/state';
-// import { noUnitTranslated } from 'utils/input';
-// import { MeterData } from 'types/redux/meters';
-// import { CurrentUserState } from 'types/redux/currentUser';
-// import { UnitData } from 'types/redux/units';
-// import { Dispatch } from 'types/redux/actions';
-// import { useDispatch } from 'react-redux';
-// import { fetchMetersDetailsIfNeeded } from 'actions/meters';
-
-// interface MeterViewComponentProps {
-// 	meter: MeterData;
-// 	currentUser: CurrentUserState;
-// 	// These two aren't used in this component but are passed to the edit component
-// 	// This is done to avoid having to recalculate the possible units sets in each view component
-// 	possibleMeterUnits: Set<UnitData>;
-// 	possibleGraphicUnits: Set<UnitData>;
-// }
 
 export default function CreateVisualUnitMapModalComponent() {
-	// const dispatch: Dispatch = useDispatch();
-
-	// useEffect(() => {
-	// 	// Makes async call to Meters API for Meters details if one has not already been made somewhere else, stores Meter ids in state
-	// 	dispatch(fetchMetersDetailsIfNeeded());
-	// }, []);
-
-	// // Access Redux state directly
-	// const currentUnitState = useSelector((state: State) => state.units.units);
-	// const meterDetails = useSelector((state: State) => state.meters); // Replace with your actual slice name
-
-	// useEffect(() => {
-	//   // Check if meterDetails are available
-	//   if (meterDetails && meterDetails.length > 0) {
-	//     meterDetails.forEach((meter: MeterData) => {
-	//       const unitName = (Object.keys(currentUnitState).length === 0 || meter.unitId === -99) ?
-	//         noUnitTranslated().identifier : currentUnitState[meter.unitId].identifier;
-
-	//       const graphicName = (Object.keys(currentUnitState).length === 0 || meter.defaultGraphicUnit === -99) ?
-	//         noUnitTranslated().identifier : currentUnitState[meter.defaultGraphicUnit].identifier;
-
-	//       console.log('Meter Unit Name:', unitName);
-	//       console.log('Meter Graphic Name:', graphicName);
-	//       console.log('Meter Details:', meter);
-	//     });
-	//   }
-	// }, [currentUnitState, meterDetails]);
+
+	const unitData = useAppSelector(selectAllUnits);
+	const conversionData = useAppSelector(selectConversionsDetails);
 
 	const data: { nodes: any[], links: any[] } = {
 		nodes: [],
 		links: []
 	};
-
-	const unitData = useAppSelector(selectAllUnits);
 	unitData.map(function (value) {
-		data.nodes.push({
-			'name': value.name,
+		data.nodes.push({'name': value.name,
 			'id': value.id
 		});
 	});
-
-	const conversionData = useAppSelector(selectConversionsDetails);
 	conversionData.map(function (value) {
 		data.links.push({
 			'source': value.sourceId,
-			'target': value.destinationId
+			'target': value.destinationId,
+			'bidirectional': value.bidirectional
 		});
 	});
 
 	useEffect(() => {
-		const margin = { top: 10, right: 30, bottom: 30, left: 40 };
-		const width = 600 - margin.left - margin.right;
-		const height = 600 - margin.top - margin.bottom;
+		const width = window.innerWidth;
+		const height = 750;
 
 		const nodes = data.nodes.map(d => ({...d}));
 		const links = data.links.map(d => ({...d}));
 
 		const simulation = d3.forceSimulation(nodes)
-			.force('link', d3.forceLink(links).id((d: any) => d.id))
-			.force('charge', d3.forceManyBody().strength(-200))
+			.force('link', d3.forceLink(links)
+				.id((d: any) => d.id)
+				.distance(60)
+			)
+			.force('charge', d3.forceManyBody()
+				.strength(-500)
+			)
 			.force('x', d3.forceX())
 			.force('y', d3.forceY());
 
 		const svg = d3.select('#sample')
 			.append('svg')
-			.attr('width', width + margin.left + margin.right)
-			.attr('height', height + margin.top + margin.bottom)
-			.attr('viewBox',
-				[-(width + margin.left + margin.right) / 2, -(height + margin.top + margin.bottom) / 2,
-					width + margin.left + margin.right, height + margin.top + margin.bottom]
-			)
-			.append('g')
-			.attr('transform', `translate(${margin.left}, ${margin.top})`);
+			.attr('width', width)
+			.attr('height', height)
+			.attr('viewBox', [-width / 2, -height / 2, width, height])
+			.attr('style', 'max-width: 100%; height: auto;')
+			.append('g');
+
+		svg.append('defs').append('marker')
+			.attr('id', 'arrow-end')
+			.attr('viewBox', '0 -5 10 10')
+			.attr('refX', 20)
+			.attr('refY', 0)
+			.attr('markerWidth', 4)
+			.attr('markerHeight', 4)
+			.attr('orient', 'auto')
+			.append('svg:path')
+			.attr('d', 'M0,-5L10,0L0,5');
+
+		svg.append('defs').append('marker')
+			.attr('id', 'arrow-start')
+			.attr('viewBox', '0 -5 10 10')
+			.attr('refX', 20)
+			.attr('refY', 0)
+			.attr('markerWidth', 4)
+			.attr('markerHeight', 4)
+			.attr('orient', 'auto-start-reverse')
+			.append('svg:path')
+			.attr('d', 'M0,-5L10,0L0,5');
 
-		// connection link style
 		const link = svg.selectAll('line')
 			.data(links)
 			.enter().append('line')
 			.style('stroke', '#aaa')
-			.attr('stroke-width', 3);
+			.attr('stroke-width', 3)
+			.attr('marker-end', 'url(#arrow-end)')
+			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');
 
-		// node style
 		const node = svg.selectAll('.node')
 			.data(nodes)
 			.enter().append('circle')
-			.attr('r', 12)
+			.attr('r', 16)
 			.style('fill', '#69b3a2');
 
-		// label style
+		node.call(d3.drag()
+			.on('start', dragstart)
+			.on('drag', dragged)
+			.on('end', dragend));
+
 		const label = svg.selectAll('.label')
 			.data(nodes)
 			.enter()
 			.append('text')
 			.text(function (d) { return d.name; })
 			.style('text-anchor', 'middle')
-			.style('fill', '#555')
+			.style('fill', '#000')
 			.style('font-family', 'Arial')
-			.style('font-size', 12);
+			.style('font-size', 14);
 
 		simulation.on('tick', () => {
 			link
@@ -136,9 +117,29 @@ export default function CreateVisualUnitMapModalComponent() {
 
 			label
 				.attr('x', function(d){ return d.x; })
-				.attr('y', function (d) {return d.y - 10; });
+				.attr('y', function (d) {return d.y + 15; });
 		});
 
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragstart(event: any) {
+			if (!event.active) simulation.alphaTarget(0.3).restart();
+			event.subject.fx = event.subject.x;
+			event.subject.fy = event.subject.y;
+		}
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragged(event: any) {
+			event.subject.fx = event.x;
+			event.subject.fy = event.y;
+		}
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragend(event: any) {
+			if (!event.active) simulation.alphaTarget(0);
+			event.subject.fx = null;
+			event.subject.fy = null;
+		}
+
 	}, []); // Empty dependency array to run the effect only once
 
 	return (
@@ -146,4 +147,5 @@ export default function CreateVisualUnitMapModalComponent() {
 			<div id="sample"></div>
 		</div>
 	);
+
 }
\ No newline at end of file

From 27b55bfd09364a10bc5e241f467be32f79b434c7 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 9 Aug 2024 18:20:54 +0000
Subject: [PATCH 011/128] Add comments

---
 .../CreateVisualUnitModalMapComponent.tsx     | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 6431c747a..09d150844 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -5,11 +5,17 @@ import { useAppSelector } from '../../redux/reduxHooks';
 import { selectAllUnits } from '../../redux/api/unitsApi';
 import { selectConversionsDetails } from '../../redux/api/conversionsApi';
 
+/**
+ * Visual unit-conversion graph component
+ * @returns D3 force graph visual
+ */
 export default function CreateVisualUnitMapModalComponent() {
 
+	/* Get unit and conversion data from redux */
 	const unitData = useAppSelector(selectAllUnits);
 	const conversionData = useAppSelector(selectConversionsDetails);
 
+	/* Create data container to pass to D3 force graph */
 	const data: { nodes: any[], links: any[] } = {
 		nodes: [],
 		links: []
@@ -23,24 +29,27 @@ export default function CreateVisualUnitMapModalComponent() {
 		data.links.push({
 			'source': value.sourceId,
 			'target': value.destinationId,
-			'bidirectional': value.bidirectional
+			'bidirectional': value.bidirectional		/* boolean value */
 		});
 	});
 
+	/* Visuals start here */
 	useEffect(() => {
+		/* View-box dimensions */
 		const width = window.innerWidth;
 		const height = 750;
 
+		/* Grab data */
 		const nodes = data.nodes.map(d => ({...d}));
 		const links = data.links.map(d => ({...d}));
 
 		const simulation = d3.forceSimulation(nodes)
 			.force('link', d3.forceLink(links)
-				.id((d: any) => d.id)
-				.distance(60)
+				.id((d: any) => d.id)					/* Set all link ids (from data.links) */
+				.distance(60)							/* This controls how long each link is */
 			)
-			.force('charge', d3.forceManyBody()
-				.strength(-500)
+			.force('charge', d3.forceManyBody()			/* Create new many-body force */
+				.strength(-500)							/* This controls the 'repelling' force on each node */
 			)
 			.force('x', d3.forceX())
 			.force('y', d3.forceY());
@@ -53,6 +62,7 @@ export default function CreateVisualUnitMapModalComponent() {
 			.attr('style', 'max-width: 100%; height: auto;')
 			.append('g');
 
+		/* End arrow head */
 		svg.append('defs').append('marker')
 			.attr('id', 'arrow-end')
 			.attr('viewBox', '0 -5 10 10')
@@ -60,10 +70,11 @@ export default function CreateVisualUnitMapModalComponent() {
 			.attr('refY', 0)
 			.attr('markerWidth', 4)
 			.attr('markerHeight', 4)
-			.attr('orient', 'auto')
+			.attr('orient', 'auto')			/* auto: point towards dest. node */
 			.append('svg:path')
 			.attr('d', 'M0,-5L10,0L0,5');
 
+		/* Start arrow head (for bidirectional edges) */
 		svg.append('defs').append('marker')
 			.attr('id', 'arrow-start')
 			.attr('viewBox', '0 -5 10 10')
@@ -71,29 +82,33 @@ export default function CreateVisualUnitMapModalComponent() {
 			.attr('refY', 0)
 			.attr('markerWidth', 4)
 			.attr('markerHeight', 4)
-			.attr('orient', 'auto-start-reverse')
+			.attr('orient', 'auto-start-reverse')		/* auto-start-reverse: point towards src. node */
 			.append('svg:path')
 			.attr('d', 'M0,-5L10,0L0,5');
 
+		/* Link style */
 		const link = svg.selectAll('line')
 			.data(links)
 			.enter().append('line')
 			.style('stroke', '#aaa')
 			.attr('stroke-width', 3)
 			.attr('marker-end', 'url(#arrow-end)')
-			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');
+			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');	/* Only draw start arrow head if bidirectional */
 
+		/* Node style */
 		const node = svg.selectAll('.node')
 			.data(nodes)
 			.enter().append('circle')
-			.attr('r', 16)
+			.attr('r', 16)					/* Node radius */
 			.style('fill', '#69b3a2');
 
+		/* Drag behavior */
 		node.call(d3.drag()
 			.on('start', dragstart)
 			.on('drag', dragged)
 			.on('end', dragend));
 
+		/* Node label style */
 		const label = svg.selectAll('.label')
 			.data(nodes)
 			.enter()
@@ -104,6 +119,7 @@ export default function CreateVisualUnitMapModalComponent() {
 			.style('font-family', 'Arial')
 			.style('font-size', 14);
 
+		/* Update element positions when moved */
 		simulation.on('tick', () => {
 			link
 				.attr('x1', d => d.source.x)

From 27d3200c580bda05b63bcad92d57c081d7111d9e Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 9 Aug 2024 18:23:24 +0000
Subject: [PATCH 012/128] Remove unused imports and code and finalize component

---
 .../visual-unit/VisualUnitDetailComponent.tsx | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 1b19f9cd5..5fc9c77ef 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -1,19 +1,10 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 import { FormattedMessage } from 'react-intl';
 import TooltipHelpComponent from '../TooltipHelpComponent';
-// import TooltipMarkerComponent from '../TooltipMarkerComponent';
 import * as React from 'react';
-// import { useDispatch, useSelector } from 'react-redux';
-// import { useEffect } from 'react';
-// import { State } from '../../types/redux/state';
-// import { fetchUnitsDetailsIfNeeded } from '../../actions/units';
-// import UnitViewComponent from './UnitViewComponent';
-// import CreateUnitModalComponent from './CreateUnitModalComponent';
-// import { UnitData } from 'types/redux/units';
-// import SpinnerComponent from '../../components/SpinnerComponent';
-// import { Dispatch } from 'types/redux/actions';
 import CreateVisualUnitMapModalComponent from './CreateVisualUnitModalMapComponent';
 
 /**
@@ -21,17 +12,6 @@ import CreateVisualUnitMapModalComponent from './CreateVisualUnitModalMapCompone
  * @returns Units page element
  */
 export default function VisualUnitDetailComponent() {
-	// The route stops you from getting to this page if not an admin.
-
-	// const dispatch: Dispatch = useDispatch();
-
-	// useEffect(() => {
-	// 	// Makes async call to units API for units details if one has not already been made somewhere else, stores unit ids in state
-	// 	dispatch(fetchUnitsDetailsIfNeeded());
-	// }, []);
-
-	//Units state
-	// const unitsState = useSelector((state: State) => state.units.units);
 
 	const titleStyle: React.CSSProperties = {
 		textAlign: 'center'

From e0322f3755e61e2841fc5394a924a80b5498047c Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 9 Aug 2024 19:07:14 +0000
Subject: [PATCH 013/128] Tweak nodes and link styles

---
 .../visual-unit/CreateVisualUnitModalMapComponent.tsx  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 09d150844..c9bac41ea 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -46,7 +46,7 @@ export default function CreateVisualUnitMapModalComponent() {
 		const simulation = d3.forceSimulation(nodes)
 			.force('link', d3.forceLink(links)
 				.id((d: any) => d.id)					/* Set all link ids (from data.links) */
-				.distance(60)							/* This controls how long each link is */
+				.distance(90)							/* This controls how long each link is */
 			)
 			.force('charge', d3.forceManyBody()			/* Create new many-body force */
 				.strength(-500)							/* This controls the 'repelling' force on each node */
@@ -66,7 +66,7 @@ export default function CreateVisualUnitMapModalComponent() {
 		svg.append('defs').append('marker')
 			.attr('id', 'arrow-end')
 			.attr('viewBox', '0 -5 10 10')
-			.attr('refX', 20)
+			.attr('refX', 25)
 			.attr('refY', 0)
 			.attr('markerWidth', 4)
 			.attr('markerHeight', 4)
@@ -78,7 +78,7 @@ export default function CreateVisualUnitMapModalComponent() {
 		svg.append('defs').append('marker')
 			.attr('id', 'arrow-start')
 			.attr('viewBox', '0 -5 10 10')
-			.attr('refX', 20)
+			.attr('refX', 25)
 			.attr('refY', 0)
 			.attr('markerWidth', 4)
 			.attr('markerHeight', 4)
@@ -99,7 +99,7 @@ export default function CreateVisualUnitMapModalComponent() {
 		const node = svg.selectAll('.node')
 			.data(nodes)
 			.enter().append('circle')
-			.attr('r', 16)					/* Node radius */
+			.attr('r', 20)					/* Node radius */
 			.style('fill', '#69b3a2');
 
 		/* Drag behavior */
@@ -133,7 +133,7 @@ export default function CreateVisualUnitMapModalComponent() {
 
 			label
 				.attr('x', function(d){ return d.x; })
-				.attr('y', function (d) {return d.y + 15; });
+				.attr('y', function (d) {return d.y - 25; });
 		});
 
 		// eslint-disable-next-line jsdoc/require-jsdoc

From 87fd6a5969e7732b391f8614d36f89656ad5f5a9 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 9 Aug 2024 20:00:11 +0000
Subject: [PATCH 014/128] Add license header

---
 .../visual-unit/CreateVisualUnitModalMapComponent.tsx         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index c9bac41ea..c4c7c2419 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 import * as React from 'react';
 import * as d3 from 'd3';
 import { useEffect } from 'react';

From c7a75c9ce8d2d0da9b8615eb019a4da7f977e0c9 Mon Sep 17 00:00:00 2001
From: Nicky Lin <nickylin.328@gmail.com>
Date: Fri, 9 Aug 2024 20:02:26 +0000
Subject: [PATCH 015/128] Import VisualUnitDetailComponent

---
 src/client/app/components/RouteComponent.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
index d5cc9b07b..838f71c34 100644
--- a/src/client/app/components/RouteComponent.tsx
+++ b/src/client/app/components/RouteComponent.tsx
@@ -25,6 +25,7 @@ import RoleOutlet from './router/RoleOutlet';
 import UnitsDetailComponent from './unit/UnitsDetailComponent';
 import ErrorComponent from './router/ErrorComponent';
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
+import VisualUnitDetailComponent from './visual-unit/VisualUnitDetailComponent';
 
 /**
  * @returns the router component Responsible for client side routing.

From 8d12b1ffe9323996adf330a6c4bd2dd94abc45f8 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Fri, 11 Oct 2024 17:08:35 -0700
Subject: [PATCH 016/128] added visual component for cik data under previous
 graph.

---
 .../CreateCikVisualModalMapComponent.tsx      | 181 ++++++++++++++++++
 .../visual-unit/VisualUnitDetailComponent.tsx |  14 ++
 src/client/app/translations/data.ts           |   1 +
 3 files changed, 196 insertions(+)
 create mode 100644 src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
new file mode 100644
index 000000000..f185b0885
--- /dev/null
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -0,0 +1,181 @@
+import * as React from 'react';
+import * as d3 from 'd3';
+import { useEffect } from 'react';
+import { selectCik } from '../../redux/api/conversionsApi';
+import { useAppSelector } from '../../redux/reduxHooks';
+import { selectUnitDataById } from '../../redux/api/unitsApi';
+
+/**
+ * Visual cik graph component
+ * @returns D3 force graph visual
+ */
+export default function CreateCikVisualMapComponent() {
+	/* Get unit and Cik data from redux */
+	const cikData = useAppSelector(selectCik);
+	const units = new Set<number>();
+	const unitDataById = useAppSelector(selectUnitDataById);
+
+	/* add all units being used in cik */
+	cikData.forEach(unit => (
+		units.add(unit.meterUnitId),
+		units.add(unit.nonMeterUnitId)
+	));
+
+	/* Create data container to pass to D3 force graph */
+	const data: { nodes: any[], links: any[] } = {
+		nodes: [],
+		links: []
+	};
+	units.forEach(function (value) {
+		const unit = unitDataById[value];
+		data.nodes.push({'name': unit.name,
+			'id': unit.id
+		});
+	});
+	cikData.map(function (value) {
+		data.links.push({
+			'source': value.meterUnitId,
+			'target': value.nonMeterUnitId,
+			'bidirectional': false
+		});
+	});
+
+	/* Visuals start here */
+	useEffect(() => {
+		/* View-box dimensions */
+		const width = window.innerWidth;
+		const height = 750;
+
+		/* Grab data */
+		const nodes = data.nodes.map(d => ({...d}));
+		const links = data.links.map(d => ({...d}));
+
+		const simulation = d3.forceSimulation(nodes)
+			.force('link', d3.forceLink(links)
+				/* Set all link ids (from data.links) */
+				.id((d: any) => d.id)
+				/* This controls how long each link is */
+				.distance(90)
+			)
+			/* Create new many-body force */
+			.force('charge', d3.forceManyBody()
+				/* This controls the 'repelling' force on each node */
+				.strength(-500)
+			)
+			.force('x', d3.forceX())
+			.force('y', d3.forceY());
+
+		const svg = d3.select('#sample-cik')
+			.append('svg')
+			.attr('width', width)
+			.attr('height', height)
+			.attr('viewBox', [-width / 2, -height / 2, width, height])
+			.attr('style', 'max-width: 100%; height: auto;')
+			.append('g');
+
+		/* End arrow head */
+		svg.append('defs').append('marker')
+			.attr('id', 'arrow-end')
+			.attr('viewBox', '0 -5 10 10')
+			.attr('refX', 25)
+			.attr('refY', 0)
+			.attr('markerWidth', 4)
+			.attr('markerHeight', 4)
+			/* auto: point towards dest. node */
+			.attr('orient', 'auto')
+			.append('svg:path')
+			.attr('d', 'M0,-5L10,0L0,5');
+
+		/* Start arrow head (for bidirectional edges) */
+		svg.append('defs').append('marker')
+			.attr('id', 'arrow-start')
+			.attr('viewBox', '0 -5 10 10')
+			.attr('refX', 25)
+			.attr('refY', 0)
+			.attr('markerWidth', 4)
+			.attr('markerHeight', 4)
+			/* auto-start-reverse: point towards src. node */
+			.attr('orient', 'auto-start-reverse')
+			.append('svg:path')
+			.attr('d', 'M0,-5L10,0L0,5');
+
+		/* Link style */
+		const link = svg.selectAll('line')
+			.data(links)
+			.enter().append('line')
+			.style('stroke', '#aaa')
+			.attr('stroke-width', 3)
+			.attr('marker-end', 'url(#arrow-end)')
+			/* Only draw start arrow head if bidirectional */
+			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');
+
+		/* Node style */
+		const node = svg.selectAll('.node')
+			.data(nodes)
+			.enter().append('circle')
+			/* Node radius */
+			.attr('r', 20)
+			.style('fill', '#69b3a2');
+
+		/* Drag behavior */
+		node.call(d3.drag()
+			.on('start', dragstart)
+			.on('drag', dragged)
+			.on('end', dragend));
+
+		/* Node label style */
+		const label = svg.selectAll('.label')
+			.data(nodes)
+			.enter()
+			.append('text')
+			.text(function (d) { return d.name; })
+			.style('text-anchor', 'middle')
+			.style('fill', '#000')
+			.style('font-family', 'Arial')
+			.style('font-size', 14);
+
+		/* Update element positions when moved */
+		simulation.on('tick', () => {
+			link
+				.attr('x1', d => d.source.x)
+				.attr('y1', d => d.source.y)
+				.attr('x2', d => d.target.x)
+				.attr('y2', d => d.target.y);
+
+			node
+				.attr('cx', d => d.x)
+				.attr('cy', d => d.y);
+
+			label
+				.attr('x', function(d){ return d.x; })
+				.attr('y', function (d) {return d.y - 25; });
+		});
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragstart(event: any) {
+			if (!event.active) simulation.alphaTarget(0.3).restart();
+			event.subject.fx = event.subject.x;
+			event.subject.fy = event.subject.y;
+		}
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragged(event: any) {
+			event.subject.fx = event.x;
+			event.subject.fy = event.y;
+		}
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragend(event: any) {
+			if (!event.active) simulation.alphaTarget(0);
+			event.subject.fx = null;
+			event.subject.fy = null;
+		}
+
+	}, []); // Empty dependency array to run the effect only once
+
+	return (
+		<div>
+			<div id="sample-cik"></div>
+		</div>
+	);
+}
\ No newline at end of file
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 5fc9c77ef..e81b275b3 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -6,6 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import TooltipHelpComponent from '../TooltipHelpComponent';
 import * as React from 'react';
 import CreateVisualUnitMapModalComponent from './CreateVisualUnitModalMapComponent';
+import CreateCikVisualMapComponent from './CreateCikVisualModalMapComponent';
 
 /**
  * Defines the units page card view
@@ -40,6 +41,19 @@ export default function VisualUnitDetailComponent() {
 			<div style={titleStyle}>
 				<CreateVisualUnitMapModalComponent/>
 			</div>
+
+			<div className='container-fluid'>
+				<h2 style={titleStyle}>
+					<FormattedMessage id='cik-visual-unit-temp' />
+					{/* <div style={tooltipStyle}>
+							<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
+						</div> */}
+				</h2>
+			</div>
+
+			<div style={titleStyle}>
+				<CreateCikVisualMapComponent />
+			</div>
 		</div>
 	);
 }
\ No newline at end of file
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 1476f89ba..cf2a64552 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -509,6 +509,7 @@ const LocaleTranslationData = {
 		"view.groups": "View Groups",
 		"visit": " or visit our ",
 		"visual-unit": "Visual Units Graph",
+		"cik-visual-unit-temp": "Cik Visual Units Graph(TEMP)",
 		"website": "website",
 		"week": "Week",
 		"yes": "yes",

From d0a4fc5fb11114b66f9ac60e052f829314245982 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Mon, 14 Oct 2024 18:52:33 -0400
Subject: [PATCH 017/128] create logmsg table in database

---
 src/server/models/database.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/models/database.js b/src/server/models/database.js
index 50ef1de89..8bb3f3ebc 100644
--- a/src/server/models/database.js
+++ b/src/server/models/database.js
@@ -79,6 +79,7 @@ async function createSchema(conn) {
 	const Configfile = require('./obvius/Configfile');
 	const Migration = require('./Migration');
 	const LogEmail = require('./LogEmail');
+	const LogMsg = require('./LogMsg');
 	const Baseline = require('./Baseline');
 	const { Map } = require('./Map');
 	const Unit = require('./Unit');
@@ -106,10 +107,12 @@ async function createSchema(conn) {
 	await Group.createTables(conn);
 	await Migration.createTable(conn);
 	await LogEmail.createTable(conn);
+	await LogMsg.createLogMsgTypeEnum(conn);
+	await LogMsg.createTable(conn);
 	await Reading.createReadingsMaterializedViews(conn);
 	await Reading.createCompareReadingsFunction(conn);
 	// For 3D reading
-	await Reading.create3DReadingsFunction(conn); 
+	await Reading.create3DReadingsFunction(conn);
 	await Baseline.createTable(conn);
 	await Map.createTable(conn);
 	await conn.none(sqlFile('baseline/create_function_get_average_reading.sql'));

From 3e08250ecc005e874e4c34f037a6a8c34e93de63 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 16 Oct 2024 17:07:44 -0700
Subject: [PATCH 018/128] removed unnecessary bidirectional arrow code, as well
 reformatted new graph to be more spread out.

---
 .../CreateCikVisualModalMapComponent.tsx      | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index f185b0885..79752aced 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -44,7 +44,7 @@ export default function CreateCikVisualMapComponent() {
 	useEffect(() => {
 		/* View-box dimensions */
 		const width = window.innerWidth;
-		const height = 750;
+		const height = 1000;
 
 		/* Grab data */
 		const nodes = data.nodes.map(d => ({...d}));
@@ -55,12 +55,12 @@ export default function CreateCikVisualMapComponent() {
 				/* Set all link ids (from data.links) */
 				.id((d: any) => d.id)
 				/* This controls how long each link is */
-				.distance(90)
+				.distance(120)
 			)
 			/* Create new many-body force */
 			.force('charge', d3.forceManyBody()
 				/* This controls the 'repelling' force on each node */
-				.strength(-500)
+				.strength(-800)
 			)
 			.force('x', d3.forceX())
 			.force('y', d3.forceY());
@@ -86,19 +86,6 @@ export default function CreateCikVisualMapComponent() {
 			.append('svg:path')
 			.attr('d', 'M0,-5L10,0L0,5');
 
-		/* Start arrow head (for bidirectional edges) */
-		svg.append('defs').append('marker')
-			.attr('id', 'arrow-start')
-			.attr('viewBox', '0 -5 10 10')
-			.attr('refX', 25)
-			.attr('refY', 0)
-			.attr('markerWidth', 4)
-			.attr('markerHeight', 4)
-			/* auto-start-reverse: point towards src. node */
-			.attr('orient', 'auto-start-reverse')
-			.append('svg:path')
-			.attr('d', 'M0,-5L10,0L0,5');
-
 		/* Link style */
 		const link = svg.selectAll('line')
 			.data(links)

From 7bee93d9a2f4fde816348fc2416442cfcc59d6ef Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:15:00 -0400
Subject: [PATCH 019/128] advance button works to show, but doesn't hide

---
 .../app/components/BarChartComponent.tsx      | 19 ++++++++++++++++++-
 .../app/components/RadarChartComponent.tsx    |  3 ++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index 8e80d6636..e5dd9a749 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -7,6 +7,7 @@ import { utc } from 'moment';
 import { PlotRelayoutEvent } from 'plotly.js';
 import * as React from 'react';
 import Plot from 'react-plotly.js';
+import * as Plotly from "plotly.js";
 import { TimeInterval } from '../../../common/TimeInterval';
 import { updateSliderRange } from '../redux/actions/extraActions';
 import { readingsApi, stableEmptyBarReadings } from '../redux/api/readingsApi';
@@ -52,6 +53,14 @@ export default function BarChartComponent() {
 	const raw = useAppSelector(selectIsRaw);
 	const unitLabel = useAppSelector(selectBarUnitLabel);
 
+	// Manage button states with useState
+  const [listOfButtons, setListOfButtons] = React.useState<Plotly.ModeBarDefaultButtons[]>([
+    'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'
+  ]);
+
+  const advancedButtons: Plotly.ModeBarDefaultButtons[] = [
+    'select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'
+  ];
 
 	// useQueryHooks for data fetching
 	const datasets: Partial<Plotly.PlotData>[] = meterReadings.concat(groupData);
@@ -101,7 +110,15 @@ export default function BarChartComponent() {
 				config={{
 					responsive: true,
 					displayModeBar: true,
-					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],
+					modeBarButtonsToRemove: listOfButtons,
+					modeBarButtonsToAdd: [{
+            name: 'more-options',
+            title: 'More Options',
+            icon: Plotly.Icons.pencil,
+            click: function () {
+              setListOfButtons(advancedButtons); // Update the state
+            }
+          }],
 					// Current Locale
 					locale,
 					// Available Locales
diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index b40deebc0..7fedeac8a 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -328,7 +328,8 @@ export default function RadarChartComponent() {
 				useResizeHandler={true}
 				config={{
 					displayModeBar: true,
-					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],					responsive: true,
+					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],					
+					responsive: true,
 					locales: Locales // makes locales available for use
 				}}
 				layout={layout}

From 0ad2d19060f45da102d94307e82bfcc9289fd943 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:17:57 -0400
Subject: [PATCH 020/128] working advanced buttons

---
 .../app/components/BarChartComponent.tsx      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index e5dd9a749..f82151a8f 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -7,7 +7,7 @@ import { utc } from 'moment';
 import { PlotRelayoutEvent } from 'plotly.js';
 import * as React from 'react';
 import Plot from 'react-plotly.js';
-import * as Plotly from "plotly.js";
+import { Icons } from 'plotly.js';
 import { TimeInterval } from '../../../common/TimeInterval';
 import { updateSliderRange } from '../redux/actions/extraActions';
 import { readingsApi, stableEmptyBarReadings } from '../redux/api/readingsApi';
@@ -53,15 +53,16 @@ export default function BarChartComponent() {
 	const raw = useAppSelector(selectIsRaw);
 	const unitLabel = useAppSelector(selectBarUnitLabel);
 
-	// Manage button states with useState
-  const [listOfButtons, setListOfButtons] = React.useState<Plotly.ModeBarDefaultButtons[]>([
-    'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'
-  ]);
-
-  const advancedButtons: Plotly.ModeBarDefaultButtons[] = [
+	// The number of items in defaultButtons and advancedButtons must differ as discussed below
+	const defaultButtons: Plotly.ModeBarDefaultButtons[] = [
+		'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'];
+	const advancedButtons: Plotly.ModeBarDefaultButtons[] = [
     'select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'
   ];
 
+	// Manage button states with useState
+	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
+	
 	// useQueryHooks for data fetching
 	const datasets: Partial<Plotly.PlotData>[] = meterReadings.concat(groupData);
 
@@ -114,9 +115,10 @@ export default function BarChartComponent() {
 					modeBarButtonsToAdd: [{
             name: 'more-options',
             title: 'More Options',
-            icon: Plotly.Icons.pencil,
+            icon: Icons.pencil,
             click: function () {
-              setListOfButtons(advancedButtons); // Update the state
+							// # of items must differ so the length can tell which list of buttons is being set
+              setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
             }
           }],
 					// Current Locale

From 1355633ac4c34bdc93997f66d6fb7f4e8dbf6e51 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Sat, 19 Oct 2024 00:05:51 +0000
Subject: [PATCH 021/128] custom button added to all graphics

---
 .../app/components/BarChartComponent.tsx      | 26 +++++++++----------
 .../app/components/LineChartComponent.tsx     | 20 +++++++++++++-
 .../app/components/RadarChartComponent.tsx    | 20 +++++++++++++-
 src/client/app/components/ThreeDComponent.tsx | 19 +++++++++++++-
 .../app/containers/CompareChartContainer.ts   | 21 ++++++++++++++-
 5 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index f82151a8f..2b9394b99 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -53,16 +53,14 @@ export default function BarChartComponent() {
 	const raw = useAppSelector(selectIsRaw);
 	const unitLabel = useAppSelector(selectBarUnitLabel);
 
+	// Display Plotly Buttons Feature
 	// The number of items in defaultButtons and advancedButtons must differ as discussed below
-	const defaultButtons: Plotly.ModeBarDefaultButtons[] = [
-		'zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'];
-	const advancedButtons: Plotly.ModeBarDefaultButtons[] = [
-    'select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'
-  ];
-
+	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d',
+		'resetScale2d'];
+	const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
 	// Manage button states with useState
 	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
-	
+
 	// useQueryHooks for data fetching
 	const datasets: Partial<Plotly.PlotData>[] = meterReadings.concat(groupData);
 
@@ -113,14 +111,14 @@ export default function BarChartComponent() {
 					displayModeBar: true,
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
-            name: 'more-options',
-            title: 'More Options',
-            icon: Icons.pencil,
-            click: function () {
+						name: 'more-options',
+						title: 'More Options',
+						icon: Icons.pencil,
+						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
-              setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
-            }
-          }],
+							setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
+						}
+					}],
 					// Current Locale
 					locale,
 					// Available Locales
diff --git a/src/client/app/components/LineChartComponent.tsx b/src/client/app/components/LineChartComponent.tsx
index 299aeb9d3..77eb8098e 100644
--- a/src/client/app/components/LineChartComponent.tsx
+++ b/src/client/app/components/LineChartComponent.tsx
@@ -7,6 +7,7 @@ import { utc } from 'moment';
 import { PlotRelayoutEvent } from 'plotly.js';
 import * as React from 'react';
 import Plot from 'react-plotly.js';
+import { Icons } from 'plotly.js';
 import { TimeInterval } from '../../../common/TimeInterval';
 import { updateSliderRange } from '../redux/actions/extraActions';
 import { readingsApi, stableEmptyLineReadings } from '../redux/api/readingsApi';
@@ -56,6 +57,14 @@ export default function LineChartComponent() {
 	// Use Query Data to derive plotly datasets memoized selector
 	const unitLabel = useAppSelector(selectLineUnitLabel);
 
+	// Display Plotly Buttons Feature
+	// The number of items in defaultButtons and advancedButtons must differ as discussed below
+	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d',
+		'zoomOut2d', 'autoScale2d','resetScale2d'];
+	const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d','autoScale2d','resetScale2d'];
+	// Manage button states with useState
+	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
+
 	const data: Partial<Plotly.PlotData>[] = React.useMemo(() => meterPlotlyData.concat(groupPlotlyData), [meterPlotlyData, groupPlotlyData]);
 
 
@@ -87,7 +96,16 @@ export default function LineChartComponent() {
 				config={{
 					responsive: true,
 					displayModeBar: true,
-					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],					// Current Locale
+					modeBarButtonsToRemove: listOfButtons,
+					modeBarButtonsToAdd: [{
+						name: 'more-options',
+						title: 'More Options',
+						icon: Icons.pencil,
+						click: function () {
+							// # of items must differ so the length can tell which list of buttons is being set
+							setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
+						}
+					}],
 					locale,
 					// Available Locales
 					locales: Locales
diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index 7fedeac8a..d700ab8da 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -7,6 +7,7 @@ import * as moment from 'moment';
 import { Layout } from 'plotly.js';
 import * as React from 'react';
 import Plot from 'react-plotly.js';
+import { Icons } from 'plotly.js';
 import { selectGroupDataById } from '../redux/api/groupsApi';
 import { selectMeterDataById } from '../redux/api/metersApi';
 import { readingsApi } from '../redux/api/readingsApi';
@@ -67,6 +68,14 @@ export default function RadarChartComponent() {
 	// The rate will be 1 if it is per hour (since state readings are per hour) or no rate scaling so no change.
 	const rateScaling = needsRateScaling ? currentSelectedRate.rate : 1;
 
+	// Display Plotly Buttons Feature
+	// The number of items in defaultButtons and advancedButtons must differ as discussed below
+	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d',
+		'resetScale2d'];
+	const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
+	// Manage button states with useState
+	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
+
 	// Add all valid data from existing meters to the radar plot
 	for (const meterID of selectedMeters) {
 		if (meterReadings) {
@@ -328,7 +337,16 @@ export default function RadarChartComponent() {
 				useResizeHandler={true}
 				config={{
 					displayModeBar: true,
-					modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],					
+					modeBarButtonsToRemove: listOfButtons,
+					modeBarButtonsToAdd: [{
+						name: 'more-options',
+						title: 'More Options',
+						icon: Icons.pencil,
+						click: function () {
+							// # of items must differ so the length can tell which list of buttons is being set
+							setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
+						}
+					}],
 					responsive: true,
 					locales: Locales // makes locales available for use
 				}}
diff --git a/src/client/app/components/ThreeDComponent.tsx b/src/client/app/components/ThreeDComponent.tsx
index d25d156b5..61253533c 100644
--- a/src/client/app/components/ThreeDComponent.tsx
+++ b/src/client/app/components/ThreeDComponent.tsx
@@ -24,6 +24,7 @@ import translate from '../utils/translate';
 import SpinnerComponent from './SpinnerComponent';
 import ThreeDPillComponent from './ThreeDPillComponent';
 import Plot from 'react-plotly.js';
+import { Icons } from 'plotly.js';
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
 import Locales from '../types/locales';
 
@@ -47,6 +48,13 @@ export default function ThreeDComponent() {
 	let layout = {};
 	let dataToRender = null;
 
+	// Display Plotly Buttons Feature
+	// The number of items in defaultButtons and advancedButtons must differ as discussed below
+	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d',
+		'resetScale2d'];
+	const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['resetCameraDefault3d'];
+	// Manage button states with useState
+	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
 
 	if (!meterOrGroupID) {
 		// No selected Meters
@@ -81,7 +89,16 @@ export default function ThreeDComponent() {
 					config={{
 						responsive: true,
 						displayModeBar: true,
-						modeBarButtonsToRemove: ['resetCameraDefault3d'],
+						modeBarButtonsToRemove: listOfButtons,
+						modeBarButtonsToAdd: [{
+							name: 'more-options',
+							title: 'More Options',
+							icon: Icons.pencil,
+							click: function () {
+								// # of items must differ so the length can tell which list of buttons is being set
+								setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
+							}
+						}],
 						// Current Locale
 						locale,
 						// Available Locales
diff --git a/src/client/app/containers/CompareChartContainer.ts b/src/client/app/containers/CompareChartContainer.ts
index 82599c8c8..e44b60d1e 100644
--- a/src/client/app/containers/CompareChartContainer.ts
+++ b/src/client/app/containers/CompareChartContainer.ts
@@ -7,7 +7,9 @@
 import { connect } from 'react-redux';
 import { getComparePeriodLabels, getCompareChangeSummary, calculateCompareShift } from '../utils/calculateCompare';
 import translate from '../utils/translate';
+import * as React from 'react';
 import Plot from 'react-plotly.js';
+import { Icons } from 'plotly.js';
 import Locales from '../types/locales';
 import * as moment from 'moment';
 import { UnitRepresentType } from '../types/redux/units';
@@ -84,6 +86,14 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		}
 	}
 
+	// Display Plotly Buttons Feature
+	// The number of items in defaultButtons and advancedButtons must differ as discussed below
+	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d',
+		'resetScale2d'];
+	const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
+	// Manage button states with useState
+	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
+
 	// Get the time shift for this comparison as a moment duration
 	const compareShift = calculateCompareShift(comparePeriod);
 	// The start and end of this time period. Need to create new moment objects since subtraction mutates the original.
@@ -231,7 +241,16 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		layout,
 		config: {
 			displayModeBar: true,
-			modeBarButtonsToRemove: ['select2d','lasso2d','autoScale2d','resetScale2d'],
+			modeBarButtonsToRemove: listOfButtons,
+			modeBarButtonsToAdd: [{
+				name: 'more-options',
+				title: 'More Options',
+				icon: Icons.pencil,
+				click: function () {
+					// # of items must differ so the length can tell which list of buttons is being set
+					setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
+				}
+			}],
 			locale,
 			locales: Locales // makes locales available for use
 		}

From 16483b36aec1709a7fb2c7d661d8ae98834e6d63 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Tue, 22 Oct 2024 16:48:15 -0700
Subject: [PATCH 022/128] both graph's nodes are colored based on what unit
 type they are.

---
 .../CreateCikVisualModalMapComponent.tsx         | 16 +++++++++++-----
 .../CreateVisualUnitModalMapComponent.tsx        |  8 ++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index 79752aced..a0638f415 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -29,7 +29,8 @@ export default function CreateCikVisualMapComponent() {
 	units.forEach(function (value) {
 		const unit = unitDataById[value];
 		data.nodes.push({'name': unit.name,
-			'id': unit.id
+			'id': unit.id,
+			'typeOfUnit': unit.typeOfUnit
 		});
 	});
 	cikData.map(function (value) {
@@ -50,18 +51,25 @@ export default function CreateCikVisualMapComponent() {
 		const nodes = data.nodes.map(d => ({...d}));
 		const links = data.links.map(d => ({...d}));
 
+		/* color for nodes (Up to 10 different colors) */
+		const color = d3.scaleOrdinal(d3.schemeCategory10);
+
 		const simulation = d3.forceSimulation(nodes)
 			.force('link', d3.forceLink(links)
 				/* Set all link ids (from data.links) */
 				.id((d: any) => d.id)
 				/* This controls how long each link is */
 				.distance(120)
+				/* This controls the link strength between nodes */
+				// .strength(0.2)
 			)
 			/* Create new many-body force */
 			.force('charge', d3.forceManyBody()
 				/* This controls the 'repelling' force on each node */
 				.strength(-800)
 			)
+			/* Create colliding force for nodes */
+			// .force('collide', d3.forceCollide().radius(70))
 			.force('x', d3.forceX())
 			.force('y', d3.forceY());
 
@@ -92,9 +100,7 @@ export default function CreateCikVisualMapComponent() {
 			.enter().append('line')
 			.style('stroke', '#aaa')
 			.attr('stroke-width', 3)
-			.attr('marker-end', 'url(#arrow-end)')
-			/* Only draw start arrow head if bidirectional */
-			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');
+			.attr('marker-end', 'url(#arrow-end)');
 
 		/* Node style */
 		const node = svg.selectAll('.node')
@@ -102,7 +108,7 @@ export default function CreateCikVisualMapComponent() {
 			.enter().append('circle')
 			/* Node radius */
 			.attr('r', 20)
-			.style('fill', '#69b3a2');
+			.style('fill', d => color(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index c4c7c2419..05b1fdb28 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -19,6 +19,9 @@ export default function CreateVisualUnitMapModalComponent() {
 	const unitData = useAppSelector(selectAllUnits);
 	const conversionData = useAppSelector(selectConversionsDetails);
 
+	/* color for nodes (Up to 10 different colors) */
+	const color = d3.scaleOrdinal(d3.schemeCategory10);
+
 	/* Create data container to pass to D3 force graph */
 	const data: { nodes: any[], links: any[] } = {
 		nodes: [],
@@ -26,7 +29,8 @@ export default function CreateVisualUnitMapModalComponent() {
 	};
 	unitData.map(function (value) {
 		data.nodes.push({'name': value.name,
-			'id': value.id
+			'id': value.id,
+			'typeOfUnit': value.typeOfUnit
 		});
 	});
 	conversionData.map(function (value) {
@@ -104,7 +108,7 @@ export default function CreateVisualUnitMapModalComponent() {
 			.data(nodes)
 			.enter().append('circle')
 			.attr('r', 20)					/* Node radius */
-			.style('fill', '#69b3a2');
+			.style('fill', d => color(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()

From 98a4232052c74783496950266b125f1fccfd5300 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Tue, 22 Oct 2024 17:07:27 -0700
Subject: [PATCH 023/128] color shema for  nodes match for both graphs.

---
 .../visual-unit/CreateCikVisualModalMapComponent.tsx     | 9 ++++++---
 .../visual-unit/CreateVisualUnitModalMapComponent.tsx    | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index a0638f415..bb496f373 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -51,8 +51,11 @@ export default function CreateCikVisualMapComponent() {
 		const nodes = data.nodes.map(d => ({...d}));
 		const links = data.links.map(d => ({...d}));
 
-		/* color for nodes (Up to 10 different colors) */
-		const color = d3.scaleOrdinal(d3.schemeCategory10);
+		/* creating color schema for nodes based on their unit type */
+		const colors = ['#1F77B4', '#2CA02C', '#fd7e14'];
+		const colorSchema = d3.scaleOrdinal<string, string>()
+			.domain(['meter', 'unit', 'suffix'])
+			.range(colors);
 
 		const simulation = d3.forceSimulation(nodes)
 			.force('link', d3.forceLink(links)
@@ -108,7 +111,7 @@ export default function CreateCikVisualMapComponent() {
 			.enter().append('circle')
 			/* Node radius */
 			.attr('r', 20)
-			.style('fill', d => color(d.typeOfUnit));
+			.attr('fill', d => colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 05b1fdb28..03de3642a 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -19,8 +19,11 @@ export default function CreateVisualUnitMapModalComponent() {
 	const unitData = useAppSelector(selectAllUnits);
 	const conversionData = useAppSelector(selectConversionsDetails);
 
-	/* color for nodes (Up to 10 different colors) */
-	const color = d3.scaleOrdinal(d3.schemeCategory10);
+	/* creating color schema for nodes based on their unit type */
+	const colors = ['#1F77B4', '#2CA02C', '#fd7e14'];
+	const colorSchema = d3.scaleOrdinal<string, string>()
+		.domain(['meter', 'unit', 'suffix'])
+		.range(colors);
 
 	/* Create data container to pass to D3 force graph */
 	const data: { nodes: any[], links: any[] } = {
@@ -108,7 +111,7 @@ export default function CreateVisualUnitMapModalComponent() {
 			.data(nodes)
 			.enter().append('circle')
 			.attr('r', 20)					/* Node radius */
-			.style('fill', d => color(d.typeOfUnit));
+			.attr('fill', d => colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()

From d4ce8de19a4004d5375981cdab4eee48923d9dc2 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Sat, 26 Oct 2024 23:31:50 -0400
Subject: [PATCH 024/128] requested changes

---
 .../app/components/BarChartComponent.tsx      |  4 +-
 .../app/components/LineChartComponent.tsx     |  4 +-
 .../app/components/RadarChartComponent.tsx    |  4 +-
 src/client/app/components/ThreeDComponent.tsx |  2 +-
 .../app/containers/CompareChartContainer.ts   | 37 +++++++++++--------
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index 2b9394b99..8b4b3d486 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -111,8 +111,8 @@ export default function BarChartComponent() {
 					displayModeBar: true,
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
-						name: 'more-options',
-						title: 'More Options',
+						name: 'toggle-options',
+						title: 'Toggle Options',
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/LineChartComponent.tsx b/src/client/app/components/LineChartComponent.tsx
index 77eb8098e..d27823c6b 100644
--- a/src/client/app/components/LineChartComponent.tsx
+++ b/src/client/app/components/LineChartComponent.tsx
@@ -98,8 +98,8 @@ export default function LineChartComponent() {
 					displayModeBar: true,
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
-						name: 'more-options',
-						title: 'More Options',
+						name: 'toggle-options',
+						title: 'Toggle Options',
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index d700ab8da..9a436f443 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -339,8 +339,8 @@ export default function RadarChartComponent() {
 					displayModeBar: true,
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
-						name: 'more-options',
-						title: 'More Options',
+						name: 'toggle-options',
+						title: 'Toggle Options',
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/ThreeDComponent.tsx b/src/client/app/components/ThreeDComponent.tsx
index 61253533c..9ddc8a36c 100644
--- a/src/client/app/components/ThreeDComponent.tsx
+++ b/src/client/app/components/ThreeDComponent.tsx
@@ -92,7 +92,7 @@ export default function ThreeDComponent() {
 						modeBarButtonsToRemove: listOfButtons,
 						modeBarButtonsToAdd: [{
 							name: 'more-options',
-							title: 'More Options',
+							title: 'Toggle Options',
 							icon: Icons.pencil,
 							click: function () {
 								// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/containers/CompareChartContainer.ts b/src/client/app/containers/CompareChartContainer.ts
index e44b60d1e..272039237 100644
--- a/src/client/app/containers/CompareChartContainer.ts
+++ b/src/client/app/containers/CompareChartContainer.ts
@@ -7,9 +7,10 @@
 import { connect } from 'react-redux';
 import { getComparePeriodLabels, getCompareChangeSummary, calculateCompareShift } from '../utils/calculateCompare';
 import translate from '../utils/translate';
-import * as React from 'react';
+// import * as React from 'react'; Convert from containers to components
+// import { useState } from 'react';
 import Plot from 'react-plotly.js';
-import { Icons } from 'plotly.js';
+// import { Icons } from 'plotly.js';
 import Locales from '../types/locales';
 import * as moment from 'moment';
 import { UnitRepresentType } from '../types/redux/units';
@@ -86,13 +87,17 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		}
 	}
 
-	// Display Plotly Buttons Feature
+	// To Do: When I click this icon it crashes OED. The error relates to using a Hook (useState, I think) 
+	// outside a component. This does not use a component as the other graphics do as it is 
+	// a container. It either needs a modified solution or the component needs to be converted.
+	// Only after the component has been converted uncomment the code below and in plotly config
+	// Display Plotly Buttons Feature:
 	// The number of items in defaultButtons and advancedButtons must differ as discussed below
 	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d',
 		'resetScale2d'];
-	const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
+	// const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
 	// Manage button states with useState
-	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
+	// const	[listOfButtons, setListOfButtons] = useState(defaultButtons);
 
 	// Get the time shift for this comparison as a moment duration
 	const compareShift = calculateCompareShift(comparePeriod);
@@ -241,16 +246,18 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		layout,
 		config: {
 			displayModeBar: true,
-			modeBarButtonsToRemove: listOfButtons,
-			modeBarButtonsToAdd: [{
-				name: 'more-options',
-				title: 'More Options',
-				icon: Icons.pencil,
-				click: function () {
-					// # of items must differ so the length can tell which list of buttons is being set
-					setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
-				}
-			}],
+			modeBarButtonsToRemove: defaultButtons,
+			// TO DO: Removes line above and uncomment betlow. Read above for more info
+			// modeBarButtonsToRemove: listOfButtons,
+			// modeBarButtonsToAdd: [{
+			// 	name: 'toggle-options',
+			// 	title: 'Toggle Options',
+			// 	icon: Icons.pencil,
+			// 	click: function () {
+			// 		// # of items must differ so the length can tell which list of buttons is being set
+			// 		setListOfButtons(listOfButtons.length === defaultButtons.length ? advancedButtons : defaultButtons); // Update the state
+			// 	}
+			// }],
 			locale,
 			locales: Locales // makes locales available for use
 		}

From c72148b3aa1749bd214a3be5dbdb9ccdbb2afb3f Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Wed, 30 Oct 2024 16:43:01 -0400
Subject: [PATCH 025/128] upload for fetching logs data from server question

---
 .../app/components/HeaderButtonsComponent.tsx |  11 +-
 src/client/app/components/RouteComponent.tsx  |   4 +-
 .../app/components/admin/LogMsgComponent.tsx  | 330 ++++++++++++++++++
 src/client/app/translations/data.ts           |   9 +-
 src/client/app/utils/api/LogsApi.ts           |   7 +-
 src/server/log.js                             |  25 +-
 src/server/routes/logs.js                     |  17 +
 7 files changed, 396 insertions(+), 7 deletions(-)
 create mode 100644 src/client/app/components/admin/LogMsgComponent.tsx

diff --git a/src/client/app/components/HeaderButtonsComponent.tsx b/src/client/app/components/HeaderButtonsComponent.tsx
index 39fda6430..b4955184c 100644
--- a/src/client/app/components/HeaderButtonsComponent.tsx
+++ b/src/client/app/components/HeaderButtonsComponent.tsx
@@ -61,6 +61,7 @@ export default function HeaderButtonsComponent() {
 		shouldCSVButtonDisabled: true,
 		shouldUnitsButtonDisabled: true,
 		shouldConversionsButtonDisabled: true,
+		shouldLogMsgButtonDisabled: true,
 		// Translated menu title that depend on whether logged in.
 		menuTitle: '',
 		// link to help page for page choices. Should not see default but use general help URL.
@@ -95,7 +96,8 @@ export default function HeaderButtonsComponent() {
 			shouldMapsButtonDisabled: pathname === '/maps',
 			shouldCSVButtonDisabled: pathname === '/csv',
 			shouldUnitsButtonDisabled: pathname === '/units',
-			shouldConversionsButtonDisabled: pathname === '/conversions'
+			shouldConversionsButtonDisabled: pathname === '/conversions',
+			shouldLogMsgButtonDisabled: pathname === '/logmsg'
 		}));
 	}, [pathname]);
 
@@ -213,6 +215,13 @@ export default function HeaderButtonsComponent() {
 								to="/admin">
 								<FormattedMessage id='admin.settings' />
 							</DropdownItem>
+							<DropdownItem
+								style={state.adminViewableLinkStyle}
+								disabled={state.shouldLogMsgButtonDisabled}
+								tag={Link}
+								to="/logmsg">
+								<FormattedMessage id='log.messages' />
+							</DropdownItem>
 							<DropdownItem
 								style={state.adminViewableLinkStyle}
 								disabled={state.shouldUsersButtonDisabled}
diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
index 5edad7795..91f29b96d 100644
--- a/src/client/app/components/RouteComponent.tsx
+++ b/src/client/app/components/RouteComponent.tsx
@@ -25,6 +25,7 @@ import RoleOutlet from './router/RoleOutlet';
 import UnitsDetailComponent from './unit/UnitsDetailComponent';
 import ErrorComponent from './router/ErrorComponent';
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
+import LogMsgComponent from './admin/LogMsgComponent';
 
 /**
  * @returns the router component Responsible for client side routing.
@@ -58,7 +59,8 @@ const router = createBrowserRouter([
 					{ path: 'maps', element: <MapsDetailContainer /> },
 					{ path: 'units', element: <UnitsDetailComponent /> },
 					{ path: 'conversions', element: <ConversionsDetailComponent /> },
-					{ path: 'users', element: <UsersDetailComponent /> }
+					{ path: 'users', element: <UsersDetailComponent /> },
+					{ path: 'logmsg', element: <LogMsgComponent /> }
 				]
 			},
 			{
diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
new file mode 100644
index 000000000..b01150426
--- /dev/null
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -0,0 +1,330 @@
+import * as React from 'react';
+import { Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle, FormGroup, Input, Label, Table } from 'reactstrap';
+import DateRangePicker from '@wojtekmaj/react-daterange-picker';
+import { useAppSelector } from '../../redux/reduxHooks';
+import { selectSelectedLanguage } from '../../redux/slices/appStateSlice';
+import { showWarnNotification } from '../../utils/notifications';
+import { logsApi } from '../../utils/api';
+// import translate from '../../utils/translate';
+
+const initialLogs = [
+	{
+		id: 1,
+		log_type: 'ERROR',
+		// eslint-disable-next-line max-len
+		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple (node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
+		log_time: '2024-09-11 16:58:51.303'
+	},
+	{
+		id: 2,
+		log_type: 'ERROR',
+		// eslint-disable-next-line max-len
+		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple(node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
+		log_time: '2024-09-11 16:59:12.524'
+	},
+	{
+		id: 3,
+		log_type: 'WARN',
+		log_message: 'Automatically set identifier of the unit "kg" to "kg"',
+		log_time: '2024-09-12 17:35:29.953'
+	},
+	{
+		id: 4,
+		log_type: 'WARN',
+		log_message: 'Automatically set identifier of the unit "liter" to "liter"',
+		log_time: '2024-09-12 17:35:29.954'
+	},
+	{
+		id: 5,
+		log_type: 'WARN',
+		log_message: 'Automatically set identifier of the unit "Fahrenheit" to "Fahrenheit"',
+		log_time: '2024-09-12 17:35:29.954'
+	},
+	{
+		id: 6,
+		log_type: 'INFO',
+		log_message: 'Schema created',
+		log_time: '2024-10-01 21:53:13.505'
+	},
+	{
+		id: 7,
+		log_type: 'INFO',
+		log_message: 'Listening on port 3000',
+		log_time: '2024-10-01 21:53:35.09'
+	},
+	{
+		id: 8,
+		log_type: 'INFO',
+		// eslint-disable-next-line max-len
+		log_message: 'The uploaded file /usr/src/app/src/server/tmp/uploads/csvPipeline/2024-10-01_22:49:55.358-29ac-3yrLeap.csv was created to upload readings csv data',
+		log_time: '2024-10-01 22:49:55.374'
+	},
+	{
+		id: 9,
+		log_type: 'ERROR',
+		// eslint-disable-next-line max-len
+		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple (node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
+		log_time: '2024-09-11T16:58:51.303-04:00'
+	},
+	{
+		id: 10,
+		log_type: 'ERROR',
+		// eslint-disable-next-line max-len
+		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple(node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
+		log_time: '2024-09-11T16:59:12.524-04:00'
+	},
+	{
+		id: 11,
+		log_type: 'WARN',
+		log_message: 'Automatically set identifier of the unit "kg" to "kg"',
+		log_time: '2024-09-12T17:35:29.953+00:00'
+	},
+	{
+		id: 12,
+		log_type: 'WARN',
+		log_message: 'Automatically set identifier of the unit "liter" to "liter"',
+		log_time: '2024-09-12T17:35:29.954+00:00'
+	},
+	{
+		id: 13,
+		log_type: 'WARN',
+		log_message: 'Automatically set identifier of the unit "Fahrenheit" to "Fahrenheit"',
+		log_time: '2024-09-12T17:35:29.954+00:00'
+	},
+	{
+		id: 14,
+		log_type: 'INFO',
+		log_message: 'Schema created',
+		log_time: '2024-10-01T21:53:13.505+00:00'
+	},
+	{
+		id: 15,
+		log_type: 'INFO',
+		log_message: 'Listening on port 3000',
+		log_time: '2024-10-01T21:53:35.090+00:00'
+	},
+	{
+		id: 16,
+		log_type: 'INFO',
+		// eslint-disable-next-line max-len
+		log_message: 'The uploaded file /usr/src/app/src/server/tmp/uploads/csvPipeline/2024-10-01_22:49:55.358-29ac-3yrLeap.csv was created to upload readings csv data',
+		log_time: '2024-10-01T22:49:55.374+00:00'
+	}
+];
+
+const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
+
+const LogMsgComponent = () => {
+	const locale = useAppSelector(selectSelectedLanguage);
+	const [logs, setLogs] = React.useState(initialLogs);
+
+	// Button state to handle showing the log table
+	const [showLogTable, setShowLogTable] = React.useState(false);
+
+	const [selectedLogTypes, setSelectedLogTypes] = React.useState<string[]>(logTypes);
+	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
+	const [logDateRange, setLogDateRange] = React.useState<[Date | null, Date | null]>([null, null]);
+	// Dropdown open state for log type in the header
+	const [dropdownOpen, setDropdownOpen] = React.useState(false);
+
+	// fetching logs data from server
+	React.useEffect(() => {
+		const fetchLogs = async () => {
+			try {
+				const data = await logsApi.getAllLogs();
+				console.log('data: ', data);
+
+			} catch (error) {
+				console.error('Failed to fetch logs:', error);
+			}
+		};
+		fetchLogs();
+		console.log('fetching logs: ', fetchLogs);
+	}, []);
+	// Handle checkbox change
+	const handleCheckboxChange = (logType: string) => {
+		if (selectedLogTypes.includes(logType)) {
+			// Remove log type if already selected
+			setSelectedLogTypes(selectedLogTypes.filter(type => type !== logType));
+		} else {
+			// Add log type if not selected
+			setSelectedLogTypes([...selectedLogTypes, logType]);
+		}
+	};
+
+	const handleDateSort = () => {
+		const newDateSortOrder = dateSortOrder === 'asc' ? 'desc' : 'asc';
+		const sortedLogs = [...logs].sort((a, b) => {
+			const dateA = new Date(a.log_time);
+			const dateB = new Date(b.log_time);
+			if (newDateSortOrder === 'asc') {
+				return dateA.getTime() - dateB.getTime();
+			} else {
+				return dateB.getTime() - dateA.getTime();
+			}
+		});
+		setDateSortOrder(newDateSortOrder);
+		setLogs(sortedLogs);
+	};
+
+	const handleDateRangeChange = (range: [Date | null, Date | null]) => {
+		setLogDateRange(range);
+	};
+
+	// Toggle dropdown in the header
+	const onToggleDropdown = () => {
+		setDropdownOpen(!dropdownOpen);
+	};
+
+	// Filter logs based on selected log types and date range
+	const filteredLogs = logs.filter(log => {
+		const logDate = new Date(log.log_time);
+
+		// Check if log is within the selected date range
+		const isWithinDateRange =
+			(!logDateRange || !logDateRange[0] || logDate >= logDateRange[0]) &&
+			(!logDateRange || !logDateRange[1] || logDate <= logDateRange[1]);
+
+		return selectedLogTypes.includes(log.log_type) && isWithinDateRange;
+	});
+
+	const handleShowLogTable = () => {
+		if (!logDateRange || !logDateRange[0] || !logDateRange[1]) {
+			// showWarnNotification(translate('shifted.data.crosses.leap.year.to.non.leap.year'));
+			showWarnNotification('You must select a date range');
+		} else {
+			setShowLogTable(true);
+		}
+	};
+
+	return (
+		showLogTable ?
+			<>
+				<h1 style={titleStyle}>Log Messages</h1>
+				<FormGroup check inline style={logFilterStyle}>
+					<p style={labelStyle}>Date Range:</p>
+					<DateRangePicker
+						value={logDateRange}
+						onChange={handleDateRangeChange}
+						minDate={new Date(1970, 0, 1)}
+						maxDate={new Date()}
+						locale={locale} // Formats Dates, and Calendar months base on locale
+						calendarIcon={null}
+						calendarProps={{ defaultView: 'year' }} />
+				</FormGroup>
+				<Table style={tableStyle} bordered hover responsive>
+					<thead style={headerStyle}>
+						<tr>
+							<th>
+								<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
+									<DropdownToggle caret>
+										Log Type
+									</DropdownToggle>
+									<DropdownMenu>
+										{logTypes.map(logType => (
+											<DropdownItem key={logType} toggle={false}>
+												<Label check>
+													<Input
+														type="checkbox"
+														checked={selectedLogTypes.includes(logType)}
+														onChange={() => handleCheckboxChange(logType)}
+													/> {logType}
+												</Label>
+											</DropdownItem>
+										))}
+									</DropdownMenu>
+								</Dropdown>
+							</th>
+							<th>Log Message</th>
+							<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>Log Time {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
+						</tr>
+					</thead>
+					<tbody style={bodyStyle}>
+						{filteredLogs.map(log => (
+							<tr key={log.id}>
+								<td>{log.log_type}</td>
+								<td>{log.log_message}</td>
+								<td>{new Date(log.log_time).toLocaleString()}</td>
+							</tr>
+						))}
+					</tbody>
+
+				</Table>
+			</>
+			:
+
+			<div className='container-fluid'>
+				<div className='d-inline-flex flex-column align-items-center justify-content-center w-100'>
+					<Alert style={{ textAlign: 'center' }}>Please choose log types and date range for log data</Alert>
+					<div className='col-12 col-lg-6 border border-4 rounded p-4 vw-50'>
+						<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'baseline' }}>
+							<Dropdown style={{ display: 'block' }} isOpen={dropdownOpen} toggle={onToggleDropdown}>
+								<DropdownToggle color='primary' caret>
+									Log Type
+								</DropdownToggle>
+								<DropdownMenu>
+									{logTypes.map(logType => (
+										<DropdownItem key={logType} toggle={false}>
+											<Label check>
+												<Input
+													type="checkbox"
+													checked={selectedLogTypes.includes(logType)}
+													onChange={() => handleCheckboxChange(logType)}
+												/> {logType}
+											</Label>
+										</DropdownItem>
+									))}
+								</DropdownMenu>
+							</Dropdown>
+							<FormGroup check style={{ display: 'flex', alignItems: 'baseline' }}>
+								<p style={{ fontWeight: 'bold' }}>Date Range:</p>
+								<DateRangePicker
+									value={logDateRange}
+									onChange={handleDateRangeChange}
+									minDate={new Date(1970, 0, 1)}
+									maxDate={new Date()}
+									locale={locale} // Formats Dates, and Calendar months base on locale
+									calendarIcon={null}
+									calendarProps={{ defaultView: 'year' }}
+									required />
+
+							</FormGroup>
+						</div>
+						<Button style={{ width: '70%' }} block color='primary' onClick={handleShowLogTable}>Show Log Messages</Button>
+
+
+
+					</div>
+				</div>
+			</div >
+	);
+};
+
+export default LogMsgComponent;
+
+const headerStyle: React.CSSProperties = {
+	textAlign: 'center'
+};
+const bodyStyle: React.CSSProperties = {
+	textAlign: 'left'
+};
+const titleStyle: React.CSSProperties = {
+	textAlign: 'center'
+};
+
+const tableStyle: React.CSSProperties = {
+	width: '90%',
+	margin: 'auto'
+};
+
+const logFilterStyle: React.CSSProperties = {
+	display: 'flex',
+	marginLeft: '9%',
+	gap: '3%'
+};
+
+const labelStyle: React.CSSProperties = {
+	fontWeight: 'bold',
+	marginRight: '-2.5%',
+	padding: 'none'
+};
\ No newline at end of file
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 1ffba4030..e656cb081 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -512,7 +512,8 @@ const LocaleTranslationData = {
 		"week": "Week",
 		"yes": "yes",
 		"yesterday": "Yesterday",
-		"you.cannot.create.a.cyclic.group": "You cannot create a cyclic group"
+		"you.cannot.create.a.cyclic.group": "You cannot create a cyclic group",
+		"log.messages": "Log Messages"
 	},
 	"fr": {
 		"3D": "3D",
@@ -1020,7 +1021,8 @@ const LocaleTranslationData = {
 		"week": "Semaine",
 		"yes": " yes\u{26A1}",
 		"yesterday": "Hier",
-		"you.cannot.create.a.cyclic.group": "Vous ne pouvez pas créer un groupe cyclique"
+		"you.cannot.create.a.cyclic.group": "Vous ne pouvez pas créer un groupe cyclique",
+		"log.messages": "Log Messages\u{26A1}"
 	},
 	"es": {
 		"3D": "3D",
@@ -1529,7 +1531,8 @@ const LocaleTranslationData = {
 		"week": "semana",
 		"yes": "sí",
 		"yesterday": "Ayer",
-		"you.cannot.create.a.cyclic.group": "No se puede crear un grupo cíclico"
+		"you.cannot.create.a.cyclic.group": "No se puede crear un grupo cíclico",
+		"log.messages": "Log Messages\u{26A1}"
 	}
 }
 
diff --git a/src/client/app/utils/api/LogsApi.ts b/src/client/app/utils/api/LogsApi.ts
index d1f2a4211..4f3444eb8 100644
--- a/src/client/app/utils/api/LogsApi.ts
+++ b/src/client/app/utils/api/LogsApi.ts
@@ -5,7 +5,7 @@
  */
 
 import ApiBackend from './ApiBackend';
-import {LogData} from '../../types/redux/logs';
+import { LogData } from '../../types/redux/logs';
 
 export default class LogsApi {
 	private readonly backend: ApiBackend;
@@ -25,4 +25,9 @@ export default class LogsApi {
 	public async error(log: LogData): Promise<void> {
 		return await this.backend.doPostRequest('/api/logs/error', log);
 	}
+
+	// fetch all logs
+	public async getAllLogs(): Promise<LogData[]> {
+		return await this.backend.doGetRequest('/api/logs/logsmsg');
+	}
 }
diff --git a/src/server/log.js b/src/server/log.js
index 2c1a24196..d4d5818fc 100644
--- a/src/server/log.js
+++ b/src/server/log.js
@@ -5,6 +5,7 @@
 const fs = require('fs');
 const logFile = require('./config').logFile;
 const LogEmail = require('./models/LogEmail');
+const LogMsg = require('./models/LogMsg');
 const { getConnection } = require('./db');
 const moment = require('moment');
 
@@ -71,13 +72,35 @@ class Logger {
 
 		// Always log to the logfile.
 		if (this.logToFile) {
-			fs.appendFile(logFile, messageToLog, err => {
+			fs.appendFile(logFile, messageToLog, async err => {
 				if (err) {
 					console.error(`Failed to write to log file: ${err} (${err.stack})`); // tslint:disable-line no-console
 				}
 			});
+
+			fs.readFile(logFile, 'utf8', async (err, data) => {
+				if (err) {
+					console.error(`Failed to read log file: ${err} (${err.stack})`); // tslint:disable-line no-console
+					return;
+				}
+
+				const logEntries = data.split('\n').filter(entry => entry.trim() !== '');
+				for (const entry of logEntries) {
+					const logParts = entry.match(/\[(.*?)@(.*?)\] (.*)/);
+					if (logParts) {
+						const [, logType, logTime, logMessage] = logParts;
+						const logMsg = new LogMsg(logType, logMessage, new Date(logTime));
+						try {
+							await logMsg.insert(conn);
+						} catch (err) {
+							console.error(`Failed to write log to database: ${err} (${err.stack})`); // tslint:disable-line no-console
+						}
+					}
+				}
+			})
 		}
 
+
 		// Only log elsewhere if given a high enough priority level.
 		if (level.priority <= this.level.priority && !skipMail) {
 			if (this.logToConsole) {
diff --git a/src/server/routes/logs.js b/src/server/routes/logs.js
index 7e74ad863..31a04ee70 100644
--- a/src/server/routes/logs.js
+++ b/src/server/routes/logs.js
@@ -8,6 +8,7 @@ const express = require('express');
 const { log } = require('../log');
 const validate = require('jsonschema').validate;
 const adminAuthenticator = require('./authenticator').adminAuthMiddleware;
+const LogMsg = require('../models/LogMsg');
 
 const router = express.Router();
 router.use(adminAuthenticator('log API'));
@@ -55,4 +56,20 @@ router.post('/error', async (req, res) => {
 	}
 });
 
+
+router.get('/logsmsg', async (req, res) => {
+	const conn = getConnection();
+	try {
+		const rows = await LogMsg.getAll(conn);
+		// console.log('can fetch');
+
+		res.json(rows);
+		// console.log(rows);
+
+	} catch (err) {
+		console.error(`Failed to fetch logs: ${err}`);
+		res.status(500).send('Failed to fetch logs');
+	}
+});
+
 module.exports = router;

From b78fb05149258b4e546e1a7cc8646eb30ed637b6 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 30 Oct 2024 14:44:43 -0700
Subject: [PATCH 026/128] added color legend to graphs and changed translated
 titles.

---
 .../CreateCikVisualModalMapComponent.tsx      | 24 +++++++++++++++++++
 .../CreateVisualUnitModalMapComponent.tsx     | 24 +++++++++++++++++++
 src/client/app/translations/data.ts           |  4 ++--
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index bb496f373..d4c91fc1d 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -167,6 +167,30 @@ export default function CreateCikVisualMapComponent() {
 			event.subject.fy = null;
 		}
 
+		/* Color Legend */
+		const legend = svg.append('g')
+			.attr('transform', `translate(${-width / 2 + 20}, ${-height / 2 + 20})`);
+
+		colorSchema.domain().forEach((item, i) => {
+			const legendEntry = legend.append('g')
+				.attr('transform', `translate(0, ${i * 25})`);
+
+			// Rectangle color box
+			legendEntry.append('rect')
+				.attr('width', 20)
+				.attr('height', 20)
+				.attr('fill', colorSchema(item));
+
+			// Text label
+			legendEntry.append('text')
+				.attr('x', 30)
+				.attr('y', 15)
+				.style('fill', '#000')
+				.style('font-size', '14px')
+				.style('alignment-middle', 'middle')
+				.text(item);
+		});
+
 	}, []); // Empty dependency array to run the effect only once
 
 	return (
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 03de3642a..163be0090 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -167,6 +167,30 @@ export default function CreateVisualUnitMapModalComponent() {
 			event.subject.fy = null;
 		}
 
+		/* Color Legend */
+		const legend = svg.append('g')
+			.attr('transform', `translate(${-width / 2 + 20}, ${-height / 2 + 20})`);
+
+		colorSchema.domain().forEach((item, i) => {
+			const legendEntry = legend.append('g')
+				.attr('transform', `translate(0, ${i * 25})`);
+
+			// Rectangle color box
+			legendEntry.append('rect')
+				.attr('width', 20)
+				.attr('height', 20)
+				.attr('fill', colorSchema(item));
+
+			// Text label
+			legendEntry.append('text')
+				.attr('x', 30)
+				.attr('y', 15)
+				.style('fill', '#000')
+				.style('font-size', '14px')
+				.style('alignment-middle', 'middle')
+				.text(item);
+		});
+
 	}, []); // Empty dependency array to run the effect only once
 
 	return (
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index cf2a64552..c1d0171ab 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -1018,7 +1018,7 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Visionner les groupes",
 		"visit": " ou visitez notre ",
-		"visual-unit": "Visual Units Graph.\u{26A1}",
+		"visual-unit": "Visual Units Graph\u{26A1}",
 		"website": "site web",
 		"week": "Semaine",
 		"yes": " yes\u{26A1}",
@@ -1528,7 +1528,7 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Ver grupos",
 		"visit": " o visite nuestro ",
-		"visual-unit": "Visual Units Graph.\u{26A1}",
+		"visual-unit": "Visual Units Graph\u{26A1}",
 		"website": "sitio web",
 		"week": "semana",
 		"yes": "sí",

From 83057894b268b33ee1abbcd69d324d6595b6fa1e Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 30 Oct 2024 15:33:33 -0700
Subject: [PATCH 027/128] internationalized both graph titles.

---
 .../visual-unit/VisualUnitDetailComponent.tsx          |  2 +-
 src/client/app/translations/data.ts                    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index e81b275b3..9888658ba 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -44,7 +44,7 @@ export default function VisualUnitDetailComponent() {
 
 			<div className='container-fluid'>
 				<h2 style={titleStyle}>
-					<FormattedMessage id='cik-visual-unit-temp' />
+					<FormattedMessage id='visual-unit-cik' />
 					{/* <div style={tooltipStyle}>
 							<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
 						</div> */}
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index c1d0171ab..6ff7ddd18 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -508,8 +508,8 @@ const LocaleTranslationData = {
 		"uses": "uses",
 		"view.groups": "View Groups",
 		"visit": " or visit our ",
-		"visual-unit": "Visual Units Graph",
-		"cik-visual-unit-temp": "Cik Visual Units Graph(TEMP)",
+		"visual-unit": "Visual Input Units Graphic",
+		"visual-unit-cik": "Visual Analyzed Units Graphic",
 		"website": "website",
 		"week": "Week",
 		"yes": "yes",
@@ -1018,7 +1018,8 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Visionner les groupes",
 		"visit": " ou visitez notre ",
-		"visual-unit": "Visual Units Graph\u{26A1}",
+		"visual-unit": "Visual Input Units Graphic\u{26A1}",
+		"visual-unit-cik": "Visual Analyzed Units Graphic\u{26A1}",
 		"website": "site web",
 		"week": "Semaine",
 		"yes": " yes\u{26A1}",
@@ -1528,7 +1529,8 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Ver grupos",
 		"visit": " o visite nuestro ",
-		"visual-unit": "Visual Units Graph\u{26A1}",
+		"visual-unit": "Visual Input Units Graphic\u{26A1}",
+		"visual-unit-cik": "Visual Analyzed Units Graphic\u{26A1}",
 		"website": "sitio web",
 		"week": "semana",
 		"yes": "sí",

From 25fbff2867edb9c4ebafe81efc7de9ff10317a8e Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 30 Oct 2024 15:47:11 -0700
Subject: [PATCH 028/128] shows all units in cik graphic.

---
 .../CreateCikVisualModalMapComponent.tsx      | 39 ++++++++++++-------
 .../CreateVisualUnitModalMapComponent.tsx     | 15 +++----
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index d4c91fc1d..f50c0b202 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -3,7 +3,7 @@ import * as d3 from 'd3';
 import { useEffect } from 'react';
 import { selectCik } from '../../redux/api/conversionsApi';
 import { useAppSelector } from '../../redux/reduxHooks';
-import { selectUnitDataById } from '../../redux/api/unitsApi';
+import { selectAllUnits } from '../../redux/api/unitsApi';
 
 /**
  * Visual cik graph component
@@ -11,28 +11,39 @@ import { selectUnitDataById } from '../../redux/api/unitsApi';
  */
 export default function CreateCikVisualMapComponent() {
 	/* Get unit and Cik data from redux */
+	const unitData = useAppSelector(selectAllUnits);
 	const cikData = useAppSelector(selectCik);
-	const units = new Set<number>();
-	const unitDataById = useAppSelector(selectUnitDataById);
+	// const units = new Set<number>();
+	// const unitDataById = useAppSelector(selectUnitDataById);
 
 	/* add all units being used in cik */
-	cikData.forEach(unit => (
-		units.add(unit.meterUnitId),
-		units.add(unit.nonMeterUnitId)
-	));
+	// cikData.forEach(unit => (
+	// 	units.add(unit.meterUnitId),
+	// 	units.add(unit.nonMeterUnitId)
+	// ));
 
 	/* Create data container to pass to D3 force graph */
 	const data: { nodes: any[], links: any[] } = {
 		nodes: [],
 		links: []
 	};
-	units.forEach(function (value) {
-		const unit = unitDataById[value];
-		data.nodes.push({'name': unit.name,
-			'id': unit.id,
-			'typeOfUnit': unit.typeOfUnit
-		});
-	});
+
+	// deletes nodes with no connections
+	// units.forEach(value => {
+	// 	const unit = unitDataById[value];
+	// 	data.nodes.push({'name': unit.name,
+	// 		'id': unit.id,
+	// 		'typeOfUnit': unit.typeOfUnit
+	// 	});
+	// });
+
+	unitData.map(value =>
+		data.nodes.push({'name': value.name,
+			'id': value.id,
+			'typeOfUnit': value.typeOfUnit
+		})
+	);
+
 	cikData.map(function (value) {
 		data.links.push({
 			'source': value.meterUnitId,
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 163be0090..2a0c9e172 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -30,19 +30,20 @@ export default function CreateVisualUnitMapModalComponent() {
 		nodes: [],
 		links: []
 	};
-	unitData.map(function (value) {
+	unitData.map(value =>
 		data.nodes.push({'name': value.name,
 			'id': value.id,
 			'typeOfUnit': value.typeOfUnit
-		});
-	});
-	conversionData.map(function (value) {
+		})
+	);
+	conversionData.map(value =>
 		data.links.push({
 			'source': value.sourceId,
 			'target': value.destinationId,
-			'bidirectional': value.bidirectional		/* boolean value */
-		});
-	});
+			/* boolean value */
+			'bidirectional': value.bidirectional
+		})
+	);
 
 	/* Visuals start here */
 	useEffect(() => {

From 91918634362267fb77cb5c0d010357e62cba9b6c Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 30 Oct 2024 15:52:24 -0700
Subject: [PATCH 029/128] updated comment position.

---
 .../CreateCikVisualModalMapComponent.tsx      |  9 ++++--
 .../CreateVisualUnitModalMapComponent.tsx     | 30 ++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index f50c0b202..96c2bf6f0 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -31,14 +31,16 @@ export default function CreateCikVisualMapComponent() {
 	// deletes nodes with no connections
 	// units.forEach(value => {
 	// 	const unit = unitDataById[value];
-	// 	data.nodes.push({'name': unit.name,
+	// 	data.nodes.push({
+	//		'name': unit.name,
 	// 		'id': unit.id,
 	// 		'typeOfUnit': unit.typeOfUnit
 	// 	});
 	// });
 
 	unitData.map(value =>
-		data.nodes.push({'name': value.name,
+		data.nodes.push({
+			'name': value.name,
 			'id': value.id,
 			'typeOfUnit': value.typeOfUnit
 		})
@@ -202,7 +204,8 @@ export default function CreateCikVisualMapComponent() {
 				.text(item);
 		});
 
-	}, []); // Empty dependency array to run the effect only once
+	// Empty dependency array to run the effect only once
+	}, []);
 
 	return (
 		<div>
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 2a0c9e172..0c92568c7 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -31,7 +31,8 @@ export default function CreateVisualUnitMapModalComponent() {
 		links: []
 	};
 	unitData.map(value =>
-		data.nodes.push({'name': value.name,
+		data.nodes.push({
+			'name': value.name,
 			'id': value.id,
 			'typeOfUnit': value.typeOfUnit
 		})
@@ -57,11 +58,15 @@ export default function CreateVisualUnitMapModalComponent() {
 
 		const simulation = d3.forceSimulation(nodes)
 			.force('link', d3.forceLink(links)
-				.id((d: any) => d.id)					/* Set all link ids (from data.links) */
-				.distance(90)							/* This controls how long each link is */
+				/* Set all link ids (from data.links) */
+				.id((d: any) => d.id)
+				/* This controls how long each link is */
+				.distance(90)
 			)
-			.force('charge', d3.forceManyBody()			/* Create new many-body force */
-				.strength(-500)							/* This controls the 'repelling' force on each node */
+			/* Create new many-body force */
+			.force('charge', d3.forceManyBody()
+				/* This controls the 'repelling' force on each node */
+				.strength(-500)
 			)
 			.force('x', d3.forceX())
 			.force('y', d3.forceY());
@@ -82,7 +87,8 @@ export default function CreateVisualUnitMapModalComponent() {
 			.attr('refY', 0)
 			.attr('markerWidth', 4)
 			.attr('markerHeight', 4)
-			.attr('orient', 'auto')			/* auto: point towards dest. node */
+			/* auto: point towards dest. node */
+			.attr('orient', 'auto')
 			.append('svg:path')
 			.attr('d', 'M0,-5L10,0L0,5');
 
@@ -94,7 +100,8 @@ export default function CreateVisualUnitMapModalComponent() {
 			.attr('refY', 0)
 			.attr('markerWidth', 4)
 			.attr('markerHeight', 4)
-			.attr('orient', 'auto-start-reverse')		/* auto-start-reverse: point towards src. node */
+			/* auto-start-reverse: point towards src. node */
+			.attr('orient', 'auto-start-reverse')
 			.append('svg:path')
 			.attr('d', 'M0,-5L10,0L0,5');
 
@@ -105,13 +112,15 @@ export default function CreateVisualUnitMapModalComponent() {
 			.style('stroke', '#aaa')
 			.attr('stroke-width', 3)
 			.attr('marker-end', 'url(#arrow-end)')
-			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');	/* Only draw start arrow head if bidirectional */
+			/* Only draw start arrow head if bidirectional */
+			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');
 
 		/* Node style */
 		const node = svg.selectAll('.node')
 			.data(nodes)
 			.enter().append('circle')
-			.attr('r', 20)					/* Node radius */
+			/* Node radius */
+			.attr('r', 20)
 			.attr('fill', d => colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
@@ -192,7 +201,8 @@ export default function CreateVisualUnitMapModalComponent() {
 				.text(item);
 		});
 
-	}, []); // Empty dependency array to run the effect only once
+	// Empty dependency array to run the effect only once
+	}, []);
 
 	return (
 		<div>

From 9a53aa06c172305bc8af20af8d1dda17e66ab605 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 30 Oct 2024 16:43:19 -0700
Subject: [PATCH 030/128] added new color for units with an inpu suffix.

---
 .../CreateCikVisualModalMapComponent.tsx      | 21 +++++++++++--------
 .../CreateVisualUnitModalMapComponent.tsx     | 13 +++++++-----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index 96c2bf6f0..b11e25935 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -16,6 +16,12 @@ export default function CreateCikVisualMapComponent() {
 	// const units = new Set<number>();
 	// const unitDataById = useAppSelector(selectUnitDataById);
 
+	/* creating color schema for nodes based on their unit type */
+	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
+	const colorSchema = d3.scaleOrdinal<string, string>()
+		.domain(['meter', 'unit', 'suffix', 'suffix input'])
+		.range(colors);
+
 	/* add all units being used in cik */
 	// cikData.forEach(unit => (
 	// 	units.add(unit.meterUnitId),
@@ -42,7 +48,8 @@ export default function CreateCikVisualMapComponent() {
 		data.nodes.push({
 			'name': value.name,
 			'id': value.id,
-			'typeOfUnit': value.typeOfUnit
+			'typeOfUnit': value.typeOfUnit,
+			'suffix' : value.suffix
 		})
 	);
 
@@ -64,12 +71,6 @@ export default function CreateCikVisualMapComponent() {
 		const nodes = data.nodes.map(d => ({...d}));
 		const links = data.links.map(d => ({...d}));
 
-		/* creating color schema for nodes based on their unit type */
-		const colors = ['#1F77B4', '#2CA02C', '#fd7e14'];
-		const colorSchema = d3.scaleOrdinal<string, string>()
-			.domain(['meter', 'unit', 'suffix'])
-			.range(colors);
-
 		const simulation = d3.forceSimulation(nodes)
 			.force('link', d3.forceLink(links)
 				/* Set all link ids (from data.links) */
@@ -124,7 +125,8 @@ export default function CreateCikVisualMapComponent() {
 			.enter().append('circle')
 			/* Node radius */
 			.attr('r', 20)
-			.attr('fill', d => colorSchema(d.typeOfUnit));
+			/* checks if unit has a non empty suffix to color differently */
+			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix input') : colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
@@ -201,7 +203,8 @@ export default function CreateCikVisualMapComponent() {
 				.style('fill', '#000')
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')
-				.text(item);
+				/* change suffix to suffix analyzed in the legend */
+				.text(item === 'suffix' ? 'suffix analyzed' : item);
 		});
 
 	// Empty dependency array to run the effect only once
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 0c92568c7..a1c548777 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -20,9 +20,9 @@ export default function CreateVisualUnitMapModalComponent() {
 	const conversionData = useAppSelector(selectConversionsDetails);
 
 	/* creating color schema for nodes based on their unit type */
-	const colors = ['#1F77B4', '#2CA02C', '#fd7e14'];
+	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
 	const colorSchema = d3.scaleOrdinal<string, string>()
-		.domain(['meter', 'unit', 'suffix'])
+		.domain(['meter', 'unit', 'suffix', 'suffix input'])
 		.range(colors);
 
 	/* Create data container to pass to D3 force graph */
@@ -34,7 +34,8 @@ export default function CreateVisualUnitMapModalComponent() {
 		data.nodes.push({
 			'name': value.name,
 			'id': value.id,
-			'typeOfUnit': value.typeOfUnit
+			'typeOfUnit': value.typeOfUnit,
+			'suffix': value.suffix
 		})
 	);
 	conversionData.map(value =>
@@ -121,7 +122,8 @@ export default function CreateVisualUnitMapModalComponent() {
 			.enter().append('circle')
 			/* Node radius */
 			.attr('r', 20)
-			.attr('fill', d => colorSchema(d.typeOfUnit));
+			/* checks if unit has a non empty suffix to color differently */
+			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix input') : colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
@@ -198,7 +200,8 @@ export default function CreateVisualUnitMapModalComponent() {
 				.style('fill', '#000')
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')
-				.text(item);
+				/* change suffix to suffix analyzed in the legend */
+				.text(item === 'suffix' ? 'suffix analyzed' : item);
 		});
 
 	// Empty dependency array to run the effect only once

From baa8f40fe820af451efe40dcc83b23177becca03 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 30 Oct 2024 17:57:46 -0700
Subject: [PATCH 031/128] internationalized color legend text of graphs.

---
 .../CreateCikVisualModalMapComponent.tsx      | 11 +++++---
 .../CreateVisualUnitModalMapComponent.tsx     | 10 ++++---
 .../visual-unit/VisualUnitDetailComponent.tsx |  4 +--
 src/client/app/translations/data.ts           | 27 ++++++++++++++-----
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index b11e25935..b4fc103fb 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import * as d3 from 'd3';
 import { useEffect } from 'react';
+import { useIntl } from 'react-intl';
 import { selectCik } from '../../redux/api/conversionsApi';
 import { useAppSelector } from '../../redux/reduxHooks';
 import { selectAllUnits } from '../../redux/api/unitsApi';
@@ -10,6 +11,8 @@ import { selectAllUnits } from '../../redux/api/unitsApi';
  * @returns D3 force graph visual
  */
 export default function CreateCikVisualMapComponent() {
+	const intl = useIntl();
+
 	/* Get unit and Cik data from redux */
 	const unitData = useAppSelector(selectAllUnits);
 	const cikData = useAppSelector(selectCik);
@@ -19,7 +22,7 @@ export default function CreateCikVisualMapComponent() {
 	/* creating color schema for nodes based on their unit type */
 	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
 	const colorSchema = d3.scaleOrdinal<string, string>()
-		.domain(['meter', 'unit', 'suffix', 'suffix input'])
+		.domain(['meter', 'unit', 'suffix', 'suffix-input'])
 		.range(colors);
 
 	/* add all units being used in cik */
@@ -126,7 +129,7 @@ export default function CreateCikVisualMapComponent() {
 			/* Node radius */
 			.attr('r', 20)
 			/* checks if unit has a non empty suffix to color differently */
-			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix input') : colorSchema(d.typeOfUnit));
+			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix-input') : colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
@@ -203,8 +206,8 @@ export default function CreateCikVisualMapComponent() {
 				.style('fill', '#000')
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')
-				/* change suffix to suffix analyzed in the legend */
-				.text(item === 'suffix' ? 'suffix analyzed' : item);
+				/* internationalizing color legend text */
+				.text(intl.formatMessage({id : `legend-graph-text-${item}`}));
 		});
 
 	// Empty dependency array to run the effect only once
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index a1c548777..6abaf4a56 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -5,6 +5,7 @@
 import * as React from 'react';
 import * as d3 from 'd3';
 import { useEffect } from 'react';
+import { useIntl } from 'react-intl';
 import { useAppSelector } from '../../redux/reduxHooks';
 import { selectAllUnits } from '../../redux/api/unitsApi';
 import { selectConversionsDetails } from '../../redux/api/conversionsApi';
@@ -14,6 +15,7 @@ import { selectConversionsDetails } from '../../redux/api/conversionsApi';
  * @returns D3 force graph visual
  */
 export default function CreateVisualUnitMapModalComponent() {
+	const intl = useIntl();
 
 	/* Get unit and conversion data from redux */
 	const unitData = useAppSelector(selectAllUnits);
@@ -22,7 +24,7 @@ export default function CreateVisualUnitMapModalComponent() {
 	/* creating color schema for nodes based on their unit type */
 	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
 	const colorSchema = d3.scaleOrdinal<string, string>()
-		.domain(['meter', 'unit', 'suffix', 'suffix input'])
+		.domain(['meter', 'unit', 'suffix', 'suffix-input'])
 		.range(colors);
 
 	/* Create data container to pass to D3 force graph */
@@ -123,7 +125,7 @@ export default function CreateVisualUnitMapModalComponent() {
 			/* Node radius */
 			.attr('r', 20)
 			/* checks if unit has a non empty suffix to color differently */
-			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix input') : colorSchema(d.typeOfUnit));
+			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix-input') : colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
@@ -200,8 +202,8 @@ export default function CreateVisualUnitMapModalComponent() {
 				.style('fill', '#000')
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')
-				/* change suffix to suffix analyzed in the legend */
-				.text(item === 'suffix' ? 'suffix analyzed' : item);
+				/* internationalizing color legend text */
+				.text(intl.formatMessage({id : `legend-graph-text-${item}`}));
 		});
 
 	// Empty dependency array to run the effect only once
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 9888658ba..d16059c46 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -31,7 +31,7 @@ export default function VisualUnitDetailComponent() {
 
 			<div className='container-fluid'>
 				<h2 style={titleStyle}>
-					<FormattedMessage id='visual-unit' />
+					<FormattedMessage id='visual-input-units-graphic' />
 					{/* <div style={tooltipStyle}>
 							<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
 						</div> */}
@@ -44,7 +44,7 @@ export default function VisualUnitDetailComponent() {
 
 			<div className='container-fluid'>
 				<h2 style={titleStyle}>
-					<FormattedMessage id='visual-unit-cik' />
+					<FormattedMessage id='visual-analyzed-units-graphic' />
 					{/* <div style={tooltipStyle}>
 							<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
 						</div> */}
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 6ff7ddd18..1ca994676 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -285,6 +285,10 @@ const LocaleTranslationData = {
 		"last.four.weeks": "Last four weeks",
 		"last.week": "Last week",
 		"leave": "Leave",
+		"legend-graph-text-meter": "Meter",
+		"legend-graph-text-suffix": "Suffix Analyzed",
+		"legend-graph-text-suffix-input": "Suffix Input",
+		"legend-graph-text-unit": "Unit",
 		"less.energy": "less energy",
 		"line": "Line",
 		"log.in": "Log in",
@@ -508,8 +512,9 @@ const LocaleTranslationData = {
 		"uses": "uses",
 		"view.groups": "View Groups",
 		"visit": " or visit our ",
-		"visual-unit": "Visual Input Units Graphic",
-		"visual-unit-cik": "Visual Analyzed Units Graphic",
+		"visual-unit": "Units Visual Graphics",
+		"visual-input-units-graphic": "Input Units Visual Graphic",
+		"visual-analyzed-units-graphic": "Analyzed Units Visual Graphic",
 		"website": "website",
 		"week": "Week",
 		"yes": "yes",
@@ -795,6 +800,10 @@ const LocaleTranslationData = {
 		"last.four.weeks": "Quatre dernières semaines",
 		"last.week": "La semaine dernière",
 		"leave": "Leave\u{26A1}",
+		"legend-graph-text-meter": "Meter\u{26A1}",
+		"legend-graph-text-suffix": "Suffix Analyzed\u{26A1}",
+		"legend-graph-text-suffix-input": "Suffix Input\u{26A1}",
+		"legend-graph-text-unit": "Unit\u{26A1}",
 		"less.energy": "moins d'énergie",
 		"line": "Ligne",
 		"log.in": "Se Connecter",
@@ -1018,8 +1027,9 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Visionner les groupes",
 		"visit": " ou visitez notre ",
-		"visual-unit": "Visual Input Units Graphic\u{26A1}",
-		"visual-unit-cik": "Visual Analyzed Units Graphic\u{26A1}",
+		"visual-unit": "Units Visual Graphics\u{26A1}",
+		"visual-input-units-graphic": "Graphique Visuel des Unités D'Entrée",
+		"visual-analyzed-units-graphic": "Graphique Visuel des Unités Analysées",
 		"website": "site web",
 		"week": "Semaine",
 		"yes": " yes\u{26A1}",
@@ -1306,6 +1316,10 @@ const LocaleTranslationData = {
 		"last.four.weeks": "Últimas cuatro semanas",
 		"last.week": "La semana pasada",
 		"leave": "Salir",
+		"legend-graph-text-meter": "Medidor",
+		"legend-graph-text-suffix": "Sufijo Analizado",
+		"legend-graph-text-suffix-input": "Suffix Entrado",
+		"legend-graph-text-unit": "Unidad",
 		"less.energy": "menos energía",
 		"line": "Línea",
 		"log.in": "Iniciar sesión",
@@ -1529,8 +1543,9 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Ver grupos",
 		"visit": " o visite nuestro ",
-		"visual-unit": "Visual Input Units Graphic\u{26A1}",
-		"visual-unit-cik": "Visual Analyzed Units Graphic\u{26A1}",
+		"visual-unit": "Units Visual Graphics\u{26A1}",
+		"visual-input-units-graphic": "Gráfico Visual de Unidades de Entrada",
+		"visual-analyzed-units-graphic": "Gráfico Visual de Unidades Analizadas",
 		"website": "sitio web",
 		"week": "semana",
 		"yes": "sí",

From e7e4d71bd7f8b893c97e7da4e8150e066ca3a18a Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 30 Oct 2024 18:59:05 -0700
Subject: [PATCH 032/128] removed unnecessary code and fixed spanish
 translation for color legend.

---
 .../CreateCikVisualModalMapComponent.tsx      | 22 -------------------
 src/client/app/translations/data.ts           |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index b4fc103fb..c70eba43f 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -16,8 +16,6 @@ export default function CreateCikVisualMapComponent() {
 	/* Get unit and Cik data from redux */
 	const unitData = useAppSelector(selectAllUnits);
 	const cikData = useAppSelector(selectCik);
-	// const units = new Set<number>();
-	// const unitDataById = useAppSelector(selectUnitDataById);
 
 	/* creating color schema for nodes based on their unit type */
 	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
@@ -25,28 +23,12 @@ export default function CreateCikVisualMapComponent() {
 		.domain(['meter', 'unit', 'suffix', 'suffix-input'])
 		.range(colors);
 
-	/* add all units being used in cik */
-	// cikData.forEach(unit => (
-	// 	units.add(unit.meterUnitId),
-	// 	units.add(unit.nonMeterUnitId)
-	// ));
-
 	/* Create data container to pass to D3 force graph */
 	const data: { nodes: any[], links: any[] } = {
 		nodes: [],
 		links: []
 	};
 
-	// deletes nodes with no connections
-	// units.forEach(value => {
-	// 	const unit = unitDataById[value];
-	// 	data.nodes.push({
-	//		'name': unit.name,
-	// 		'id': unit.id,
-	// 		'typeOfUnit': unit.typeOfUnit
-	// 	});
-	// });
-
 	unitData.map(value =>
 		data.nodes.push({
 			'name': value.name,
@@ -80,16 +62,12 @@ export default function CreateCikVisualMapComponent() {
 				.id((d: any) => d.id)
 				/* This controls how long each link is */
 				.distance(120)
-				/* This controls the link strength between nodes */
-				// .strength(0.2)
 			)
 			/* Create new many-body force */
 			.force('charge', d3.forceManyBody()
 				/* This controls the 'repelling' force on each node */
 				.strength(-800)
 			)
-			/* Create colliding force for nodes */
-			// .force('collide', d3.forceCollide().radius(70))
 			.force('x', d3.forceX())
 			.force('y', d3.forceY());
 
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 1ca994676..71672c8f0 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -1318,7 +1318,7 @@ const LocaleTranslationData = {
 		"leave": "Salir",
 		"legend-graph-text-meter": "Medidor",
 		"legend-graph-text-suffix": "Sufijo Analizado",
-		"legend-graph-text-suffix-input": "Suffix Entrado",
+		"legend-graph-text-suffix-input": "Sufijo Entrado",
 		"legend-graph-text-unit": "Unidad",
 		"less.energy": "menos energía",
 		"line": "Línea",

From b6bc76ebc3131292f178a8a20986d89f078b2bb2 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Fri, 1 Nov 2024 22:00:17 -0400
Subject: [PATCH 033/128] implementing request changes and translation

---
 .../app/components/BarChartComponent.tsx       |  2 +-
 .../app/components/LineChartComponent.tsx      |  2 +-
 .../app/components/RadarChartComponent.tsx     |  2 +-
 src/client/app/components/ThreeDComponent.tsx  |  2 +-
 .../app/containers/CompareChartContainer.ts    | 18 +++++++++---------
 src/client/app/translations/data.ts            |  3 +++
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index 8b4b3d486..0d0f391cb 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -112,7 +112,7 @@ export default function BarChartComponent() {
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
 						name: 'toggle-options',
-						title: 'Toggle Options',
+						title: translate('toggle option'),
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/LineChartComponent.tsx b/src/client/app/components/LineChartComponent.tsx
index d27823c6b..2385f80dc 100644
--- a/src/client/app/components/LineChartComponent.tsx
+++ b/src/client/app/components/LineChartComponent.tsx
@@ -99,7 +99,7 @@ export default function LineChartComponent() {
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
 						name: 'toggle-options',
-						title: 'Toggle Options',
+						title: translate('toggle option'),
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index 9a436f443..d01241a26 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -340,7 +340,7 @@ export default function RadarChartComponent() {
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
 						name: 'toggle-options',
-						title: 'Toggle Options',
+						title: translate('toggle option'),
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/ThreeDComponent.tsx b/src/client/app/components/ThreeDComponent.tsx
index 9ddc8a36c..b5f185640 100644
--- a/src/client/app/components/ThreeDComponent.tsx
+++ b/src/client/app/components/ThreeDComponent.tsx
@@ -92,7 +92,7 @@ export default function ThreeDComponent() {
 						modeBarButtonsToRemove: listOfButtons,
 						modeBarButtonsToAdd: [{
 							name: 'more-options',
-							title: 'Toggle Options',
+							title: translate('toggle option'),
 							icon: Icons.pencil,
 							click: function () {
 								// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/containers/CompareChartContainer.ts b/src/client/app/containers/CompareChartContainer.ts
index 272039237..197840c02 100644
--- a/src/client/app/containers/CompareChartContainer.ts
+++ b/src/client/app/containers/CompareChartContainer.ts
@@ -87,17 +87,17 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		}
 	}
 
-	// To Do: When I click this icon it crashes OED. The error relates to using a Hook (useState, I think) 
-	// outside a component. This does not use a component as the other graphics do as it is 
-	// a container. It either needs a modified solution or the component needs to be converted.
-	// Only after the component has been converted uncomment the code below and in plotly config
+  /* TODO When I click this icon it crashes OED. The error relates to using a Hook (useState, I think) 
+	outside a component. This does not use a component as the other graphics do as it is 
+	a container. It either needs a modified solution or the component needs to be converted.
+	Only after the component has been converted uncomment the code below and in plotly config
 	// Display Plotly Buttons Feature:
-	// The number of items in defaultButtons and advancedButtons must differ as discussed below
+	// The number of items in defaultButtons and advancedButtons must differ as discussed below */
 	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d',
 		'resetScale2d'];
-	// const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
+	/* const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
 	// Manage button states with useState
-	// const	[listOfButtons, setListOfButtons] = useState(defaultButtons);
+	const [listOfButtons, setListOfButtons] = useState(defaultButtons); */
 
 	// Get the time shift for this comparison as a moment duration
 	const compareShift = calculateCompareShift(comparePeriod);
@@ -247,11 +247,11 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		config: {
 			displayModeBar: true,
 			modeBarButtonsToRemove: defaultButtons,
-			// TO DO: Removes line above and uncomment betlow. Read above for more info
+			// TO DO: Removes line above and uncomment below. Read above for more info
 			// modeBarButtonsToRemove: listOfButtons,
 			// modeBarButtonsToAdd: [{
 			// 	name: 'toggle-options',
-			// 	title: 'Toggle Options',
+			// 	title: translate('Toggle Option'),
 			// 	icon: Icons.pencil,
 			// 	click: function () {
 			// 		// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 1ffba4030..1da3206cf 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -442,6 +442,7 @@ const LocaleTranslationData = {
 		"TimeSortTypes.meter": "meter value or default",
 		"today": "Today",
 		"toggle.link": "Toggle chart link",
+		"Toggle Option" : "Toggle Option",
 		"total": "total",
 		"true": "True",
 		"TrueFalseType.false": "no",
@@ -950,6 +951,7 @@ const LocaleTranslationData = {
 		"TimeSortTypes.meter": "valeur du compteur ou valeur par défaut",
 		"today": "Aujourd'hui",
 		"toggle.link": "Bascule du lien du diagramme",
+		"Toggle Option" : "Option de bascule",
 		"total": "total",
 		"true": "Vrai",
 		"TrueFalseType.false": "no\u{26A1}",
@@ -1459,6 +1461,7 @@ const LocaleTranslationData = {
 		"TimeSortTypes.meter": "valor del medidor o predeterminado",
 		"today": "Hoy",
 		"toggle.link": "Alternar enlace de gráfico",
+		"Toggle Option" : "Opción de alternar",
 		"total": "total",
 		"true": "Verdad",
 		"TrueFalseType.false": "no",

From f1cc007b14d30ac2a5c6f4882ac1361f58e2c3e2 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Sat, 2 Nov 2024 02:08:13 +0000
Subject: [PATCH 034/128] final changes to pass checks

---
 src/client/app/containers/CompareChartContainer.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/app/containers/CompareChartContainer.ts b/src/client/app/containers/CompareChartContainer.ts
index 197840c02..945c8206d 100644
--- a/src/client/app/containers/CompareChartContainer.ts
+++ b/src/client/app/containers/CompareChartContainer.ts
@@ -87,8 +87,8 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		}
 	}
 
-  /* TODO When I click this icon it crashes OED. The error relates to using a Hook (useState, I think) 
-	outside a component. This does not use a component as the other graphics do as it is 
+	/* TODO When I click this icon it crashes OED. The error relates to using a Hook (useState, I think)
+	outside a component. This does not use a component as the other graphics do as it is
 	a container. It either needs a modified solution or the component needs to be converted.
 	Only after the component has been converted uncomment the code below and in plotly config
 	// Display Plotly Buttons Feature:

From acc3e1a166f7a546ffe43b8346e3f9cebb06cff0 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Sun, 3 Nov 2024 19:27:08 -0500
Subject: [PATCH 035/128] Pre-review version for log message table now able to
 call log data from server

---
 .../app/components/admin/LogMsgComponent.tsx  | 178 +++++-------------
 src/client/app/utils/api/LogsApi.ts           |  11 ++
 src/server/models/LogMsg.js                   |  14 +-
 src/server/routes/logs.js                     |  63 +++++--
 src/server/sql/logmsg/get_logs_from_dates.sql |   3 +-
 src/server/sql/logmsg/get_logs_from_type.sql  |   2 +-
 6 files changed, 119 insertions(+), 152 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index b01150426..439cc6bb5 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -7,114 +7,22 @@ import { showWarnNotification } from '../../utils/notifications';
 import { logsApi } from '../../utils/api';
 // import translate from '../../utils/translate';
 
-const initialLogs = [
-	{
-		id: 1,
-		log_type: 'ERROR',
-		// eslint-disable-next-line max-len
-		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple (node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
-		log_time: '2024-09-11 16:58:51.303'
-	},
-	{
-		id: 2,
-		log_type: 'ERROR',
-		// eslint-disable-next-line max-len
-		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple(node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
-		log_time: '2024-09-11 16:59:12.524'
-	},
-	{
-		id: 3,
-		log_type: 'WARN',
-		log_message: 'Automatically set identifier of the unit "kg" to "kg"',
-		log_time: '2024-09-12 17:35:29.953'
-	},
-	{
-		id: 4,
-		log_type: 'WARN',
-		log_message: 'Automatically set identifier of the unit "liter" to "liter"',
-		log_time: '2024-09-12 17:35:29.954'
-	},
-	{
-		id: 5,
-		log_type: 'WARN',
-		log_message: 'Automatically set identifier of the unit "Fahrenheit" to "Fahrenheit"',
-		log_time: '2024-09-12 17:35:29.954'
-	},
-	{
-		id: 6,
-		log_type: 'INFO',
-		log_message: 'Schema created',
-		log_time: '2024-10-01 21:53:13.505'
-	},
-	{
-		id: 7,
-		log_type: 'INFO',
-		log_message: 'Listening on port 3000',
-		log_time: '2024-10-01 21:53:35.09'
-	},
-	{
-		id: 8,
-		log_type: 'INFO',
-		// eslint-disable-next-line max-len
-		log_message: 'The uploaded file /usr/src/app/src/server/tmp/uploads/csvPipeline/2024-10-01_22:49:55.358-29ac-3yrLeap.csv was created to upload readings csv data',
-		log_time: '2024-10-01 22:49:55.374'
-	},
-	{
-		id: 9,
-		log_type: 'ERROR',
-		// eslint-disable-next-line max-len
-		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple (node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
-		log_time: '2024-09-11T16:58:51.303-04:00'
-	},
-	{
-		id: 10,
-		log_type: 'ERROR',
-		// eslint-disable-next-line max-len
-		log_message: 'Unhandled Promise Rejection: AggregateError Stacktrace: AggregateError [ECONNREFUSED]: at internalConnectMultiple(node:net:1118:18) at afterConnectMultiple (node:net:1685:7)',
-		log_time: '2024-09-11T16:59:12.524-04:00'
-	},
-	{
-		id: 11,
-		log_type: 'WARN',
-		log_message: 'Automatically set identifier of the unit "kg" to "kg"',
-		log_time: '2024-09-12T17:35:29.953+00:00'
-	},
-	{
-		id: 12,
-		log_type: 'WARN',
-		log_message: 'Automatically set identifier of the unit "liter" to "liter"',
-		log_time: '2024-09-12T17:35:29.954+00:00'
-	},
-	{
-		id: 13,
-		log_type: 'WARN',
-		log_message: 'Automatically set identifier of the unit "Fahrenheit" to "Fahrenheit"',
-		log_time: '2024-09-12T17:35:29.954+00:00'
-	},
-	{
-		id: 14,
-		log_type: 'INFO',
-		log_message: 'Schema created',
-		log_time: '2024-10-01T21:53:13.505+00:00'
-	},
-	{
-		id: 15,
-		log_type: 'INFO',
-		log_message: 'Listening on port 3000',
-		log_time: '2024-10-01T21:53:35.090+00:00'
-	},
-	{
-		id: 16,
-		log_type: 'INFO',
-		// eslint-disable-next-line max-len
-		log_message: 'The uploaded file /usr/src/app/src/server/tmp/uploads/csvPipeline/2024-10-01_22:49:55.358-29ac-3yrLeap.csv was created to upload readings csv data',
-		log_time: '2024-10-01T22:49:55.374+00:00'
-	}
-];
+// interface LogMsgData {
+// 	logType: string;
+// 	logMessage: string;
+// 	logTime: string;
+// }
+
+const initialLogs: any[] = [];
+
 
 const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
 
-const LogMsgComponent = () => {
+/**
+ * React component that defines the log message page
+ * @returns LogMsgComponent element
+ */
+export default function LogMsgComponent() {
 	const locale = useAppSelector(selectSelectedLanguage);
 	const [logs, setLogs] = React.useState(initialLogs);
 
@@ -127,20 +35,8 @@ const LogMsgComponent = () => {
 	// Dropdown open state for log type in the header
 	const [dropdownOpen, setDropdownOpen] = React.useState(false);
 
-	// fetching logs data from server
-	React.useEffect(() => {
-		const fetchLogs = async () => {
-			try {
-				const data = await logsApi.getAllLogs();
-				console.log('data: ', data);
+	// const [selectAllOption, setSelectAllOption] = React.useState(true);
 
-			} catch (error) {
-				console.error('Failed to fetch logs:', error);
-			}
-		};
-		fetchLogs();
-		console.log('fetching logs: ', fetchLogs);
-	}, []);
 	// Handle checkbox change
 	const handleCheckboxChange = (logType: string) => {
 		if (selectedLogTypes.includes(logType)) {
@@ -157,6 +53,8 @@ const LogMsgComponent = () => {
 		const sortedLogs = [...logs].sort((a, b) => {
 			const dateA = new Date(a.log_time);
 			const dateB = new Date(b.log_time);
+			// const dateA = new Date(a.logTime);
+			// const dateB = new Date(b.logTime);
 			if (newDateSortOrder === 'asc') {
 				return dateA.getTime() - dateB.getTime();
 			} else {
@@ -178,24 +76,36 @@ const LogMsgComponent = () => {
 
 	// Filter logs based on selected log types and date range
 	const filteredLogs = logs.filter(log => {
-		const logDate = new Date(log.log_time);
+		// const logDate = new Date(log.log_time);
+		const logDate = new Date(log.logTime);
 
 		// Check if log is within the selected date range
 		const isWithinDateRange =
 			(!logDateRange || !logDateRange[0] || logDate >= logDateRange[0]) &&
 			(!logDateRange || !logDateRange[1] || logDate <= logDateRange[1]);
 
-		return selectedLogTypes.includes(log.log_type) && isWithinDateRange;
+		// return selectedLogTypes.includes(log.log_type) && isWithinDateRange;
+		return selectedLogTypes.includes(log.logType) && isWithinDateRange;
 	});
 
-	const handleShowLogTable = () => {
+	/**
+	 * Handle showing the log table
+	 */
+	async function handleShowLogTable() {
 		if (!logDateRange || !logDateRange[0] || !logDateRange[1]) {
-			// showWarnNotification(translate('shifted.data.crosses.leap.year.to.non.leap.year'));
 			showWarnNotification('You must select a date range');
 		} else {
+			try {
+				// get log by date and type
+				const data = await logsApi.getLogsByDateRangeAndType(logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedLogTypes);
+				setLogs(data);
+
+			} catch (error) {
+				console.error(error);
+			}
 			setShowLogTable(true);
 		}
-	};
+	}
 
 	return (
 		showLogTable ?
@@ -240,11 +150,19 @@ const LogMsgComponent = () => {
 						</tr>
 					</thead>
 					<tbody style={bodyStyle}>
-						{filteredLogs.map(log => (
-							<tr key={log.id}>
-								<td>{log.log_type}</td>
-								<td>{log.log_message}</td>
-								<td>{new Date(log.log_time).toLocaleString()}</td>
+						{filteredLogs.map((log, index) => (
+							<tr key={index + 1}>
+								<td>{log.logType}</td>
+								<td>{log.logMessage}</td>
+								<td>{new Date(log.logTime).toLocaleString('en-US', {
+									year: 'numeric',
+									month: '2-digit',
+									day: '2-digit',
+									hour: '2-digit',
+									minute: '2-digit',
+									second: '2-digit',
+									fractionalSecondDigits: 2
+								})}</td>
 							</tr>
 						))}
 					</tbody>
@@ -298,9 +216,7 @@ const LogMsgComponent = () => {
 				</div>
 			</div >
 	);
-};
-
-export default LogMsgComponent;
+}
 
 const headerStyle: React.CSSProperties = {
 	textAlign: 'center'
diff --git a/src/client/app/utils/api/LogsApi.ts b/src/client/app/utils/api/LogsApi.ts
index 4f3444eb8..96ed0e919 100644
--- a/src/client/app/utils/api/LogsApi.ts
+++ b/src/client/app/utils/api/LogsApi.ts
@@ -30,4 +30,15 @@ export default class LogsApi {
 	public async getAllLogs(): Promise<LogData[]> {
 		return await this.backend.doGetRequest('/api/logs/logsmsg');
 	}
+
+	public async getLogsByDateRangeAndType(startDate: string, endDate: string, types: string[]): Promise<LogData[]> {
+		const requests = types.map(
+			type => this.backend.doGetRequest('/api/logs/logsmsg/getLogsByDateRangeAndType',
+				{ startDate: startDate, endDate: endDate, logType: type })
+		);
+		const results = await Promise.all(requests);
+
+		return results.flat() as LogData[];
+	}
+
 }
diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
index b0f67007f..b8f23e6d7 100644
--- a/src/server/models/LogMsg.js
+++ b/src/server/models/LogMsg.js
@@ -30,7 +30,7 @@ class LogMsg {
 	 * @returns The new log object.
 	 */
 	static mapRow(row) {
-		return new LogMsg(row.logType, row.logMessage, row.logTime);
+		return new LogMsg(row.log_type, row.log_message, row.log_time);
 	}
 
 	/**
@@ -47,9 +47,9 @@ class LogMsg {
 	 * @param {*} conn The connection to use.
 	 * @returns {Promise.<>}
 	 */
-		static createLogMsgTypeEnum(conn) {
-			return conn.none(sqlFile('logmsg/create_log_types_enum.sql'));
-		}
+	static createLogMsgTypeEnum(conn) {
+		return conn.none(sqlFile('logmsg/create_log_types_enum.sql'));
+	}
 
 	/**
 	 * Returns a promise to insert this log into the database
@@ -97,8 +97,8 @@ class LogMsg {
 	 * @param conn is the connection to use.
 	 * @returns {Promise.<array.<LogMsg>>}
 	 */
-	static async getLogsByType(logType, conn){
-		const rows = await conn.any(sqlFile('logmsg/get_logs_from_type.sql'), {logType: logType});
+	static async getLogsByType(logType, conn) {
+		const rows = await conn.any(sqlFile('logmsg/get_logs_from_type.sql'), { logType: logType });
 
 		return rows.map(LogMsg.mapRow);
 	}
@@ -119,8 +119,8 @@ class LogMsg {
 			endDate: endDate,
 			logType: logType
 		});
-
 		return rows.map(LogMsg.mapRow);
+
 	}
 }
 module.exports = LogMsg;
\ No newline at end of file
diff --git a/src/server/routes/logs.js b/src/server/routes/logs.js
index 31a04ee70..50c49416d 100644
--- a/src/server/routes/logs.js
+++ b/src/server/routes/logs.js
@@ -9,6 +9,7 @@ const { log } = require('../log');
 const validate = require('jsonschema').validate;
 const adminAuthenticator = require('./authenticator').adminAuthMiddleware;
 const LogMsg = require('../models/LogMsg');
+const { getConnection } = require('../db');
 
 const router = express.Router();
 router.use(adminAuthenticator('log API'));
@@ -23,6 +24,34 @@ const validLog = {
 		}
 	}
 }
+
+const validLogMsg = {
+	type: 'object',
+	required: ['startDate', 'endDate', 'logType'],
+	properties: {
+		startDate: {
+			type: 'string',
+			format: 'date-time'
+		},
+		endDate: {
+			type: 'string',
+			format: 'date-time'
+		},
+		logType: {
+			type: 'string',
+			enum: ['INFO', 'WARN', 'ERROR', 'SILENT']
+		},
+
+		// use this if later database is changed to be able to deal with logType as a list
+		// logType: {
+		// 	type: 'array',
+		// 	items: {
+		// 		type: 'string',
+		// 		enum: ['INFO', 'WARN', 'ERROR', 'SILENT']
+		// 	}
+		// }
+	}
+}
 router.post('/info', async (req, res) => {
 	const validationResult = validate(req.body, validLog);
 	if (validationResult.valid) {
@@ -57,18 +86,30 @@ router.post('/error', async (req, res) => {
 });
 
 
-router.get('/logsmsg', async (req, res) => {
-	const conn = getConnection();
-	try {
-		const rows = await LogMsg.getAll(conn);
-		// console.log('can fetch');
-
-		res.json(rows);
-		// console.log(rows);
+// router.get('/logsmsg', async (req, res) => {
+// 	const conn = getConnection();
+// 	try {
+// 		const rows = await LogMsg.getAll(conn);
+// 		res.json(rows);
+// 	} catch (err) {
+// 		console.error(`Failed to fetch in getAll: ${err}`);
+// 		res.sendStatus(500);
+// 	}
+// });
 
-	} catch (err) {
-		console.error(`Failed to fetch logs: ${err}`);
-		res.status(500).send('Failed to fetch logs');
+router.get('/logsmsg/getLogsByDateRangeAndType', async (req, res) => {
+	const validationResult = validate(req.query, validLogMsg);
+	if (!validationResult.valid) {
+		res.sendStatus(400);
+	} else {
+		const conn = getConnection();
+		try {
+			const rows = await LogMsg.getLogsByDateRangeAndType(req.query.startDate, req.query.endDate, req.query.logType, conn);
+			res.json(rows);
+		} catch (err) {
+			console.error(`Failed to fetch logs filter by date range and type: ${err}`);
+			res.sendStatus(500);
+		}
 	}
 });
 
diff --git a/src/server/sql/logmsg/get_logs_from_dates.sql b/src/server/sql/logmsg/get_logs_from_dates.sql
index 7e20b1350..d2383fbcf 100644
--- a/src/server/sql/logmsg/get_logs_from_dates.sql
+++ b/src/server/sql/logmsg/get_logs_from_dates.sql
@@ -4,8 +4,7 @@
 
 -- Gets logs in table by date range. This is then ordered by time ascending.
 SELECT 
-	-- Short column names for smaller data.
-	log_type, log_message as log_msg, log_time
+	log_type, log_message, log_time
 FROM logmsg 
 WHERE log_time >= COALESCE(${startDate}, '-infinity'::TIMESTAMP)
 	AND log_time <= COALESCE(${endDate}, 'infinity'::TIMESTAMP)
diff --git a/src/server/sql/logmsg/get_logs_from_type.sql b/src/server/sql/logmsg/get_logs_from_type.sql
index 0e72fd0d1..174dbde8a 100644
--- a/src/server/sql/logmsg/get_logs_from_type.sql
+++ b/src/server/sql/logmsg/get_logs_from_type.sql
@@ -4,7 +4,7 @@
 
 -- Gets logs in table by date range. This is then ordered by time ascending.
 SELECT 
-	log_type, log_message as log_msg, log_time
+	log_type, log_message , log_time
 FROM logmsg 
 WHERE log_type = ${logType}
 ORDER BY log_time ASC;
\ No newline at end of file

From 02bc0d937fdba3a592d3244425f6792fe1986161 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Mon, 4 Nov 2024 14:02:39 -0500
Subject: [PATCH 036/128] fix writing the whole log file to database again to
 only write new log

---
 src/server/log.js | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/server/log.js b/src/server/log.js
index d4d5818fc..e55495479 100644
--- a/src/server/log.js
+++ b/src/server/log.js
@@ -78,29 +78,21 @@ class Logger {
 				}
 			});
 
-			fs.readFile(logFile, 'utf8', async (err, data) => {
-				if (err) {
-					console.error(`Failed to read log file: ${err} (${err.stack})`); // tslint:disable-line no-console
-					return;
-				}
-
-				const logEntries = data.split('\n').filter(entry => entry.trim() !== '');
-				for (const entry of logEntries) {
-					const logParts = entry.match(/\[(.*?)@(.*?)\] (.*)/);
-					if (logParts) {
-						const [, logType, logTime, logMessage] = logParts;
-						const logMsg = new LogMsg(logType, logMessage, new Date(logTime));
-						try {
-							await logMsg.insert(conn);
-						} catch (err) {
-							console.error(`Failed to write log to database: ${err} (${err.stack})`); // tslint:disable-line no-console
-						}
+			// Write the new log to the database
+			const logMsgPatern = messageToLog.match(/\[(.*?)@(.*?)\] (.*)/);
+			if (logMsgPatern) {
+				const [, logType, logTime, logMessage] = logMsgPatern;
+				const logMsg = new LogMsg(logType, logMessage, new Date(logTime));
+				(async () => {
+					try {
+						await logMsg.insert(conn);
+					} catch (err) {
+						console.error(`Failed to write log to database: ${err} (${err.stack})`);
 					}
-				}
-			})
+				})();
+			}
 		}
 
-
 		// Only log elsewhere if given a high enough priority level.
 		if (level.priority <= this.level.priority && !skipMail) {
 			if (this.logToConsole) {

From 18f37c0ec192c04af390e0b82df5757fd3bbbe59 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Mon, 4 Nov 2024 14:20:11 -0800
Subject: [PATCH 037/128] added title to page.

---
 .../visual-unit/VisualUnitDetailComponent.tsx | 32 ++++++++++++-------
 src/client/app/translations/data.ts           |  1 +
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index d16059c46..ce07d2409 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -7,6 +7,7 @@ import TooltipHelpComponent from '../TooltipHelpComponent';
 import * as React from 'react';
 import CreateVisualUnitMapModalComponent from './CreateVisualUnitModalMapComponent';
 import CreateCikVisualMapComponent from './CreateCikVisualModalMapComponent';
+import TooltipMarkerComponent from '../TooltipMarkerComponent';
 
 /**
  * Defines the units page card view
@@ -18,23 +19,32 @@ export default function VisualUnitDetailComponent() {
 		textAlign: 'center'
 	};
 
-	// const tooltipStyle = {
-	// 	display: 'inline-block',
-	// 	fontSize: '50%',
-	// 	// For now, only an admin can see the unit page.
-	// 	tooltipVisualUnitView: 'help.admin.unitview'
-	// };
+	const tooltipStyle = {
+		display: 'inline-block',
+		fontSize: '60%',
+		padding: '0.3rem',
+		// For now, only an admin can see the unit page.
+		tooltipVisualUnitView: 'help.admin.unitview'
+	};
 
 	return (
 		<div>
 			<TooltipHelpComponent page='visual-unit' />
 
 			<div className='container-fluid'>
+				<h1 style={titleStyle}>
+					<FormattedMessage id='units-conversion-page-title' />
+					<div style={tooltipStyle}>
+						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
+					</div>
+				</h1>
+				<br/>
+
 				<h2 style={titleStyle}>
 					<FormattedMessage id='visual-input-units-graphic' />
-					{/* <div style={tooltipStyle}>
-							<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
-						</div> */}
+					<div style={tooltipStyle}>
+						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
+					</div>
 				</h2>
 			</div>
 
@@ -46,8 +56,8 @@ export default function VisualUnitDetailComponent() {
 				<h2 style={titleStyle}>
 					<FormattedMessage id='visual-analyzed-units-graphic' />
 					{/* <div style={tooltipStyle}>
-							<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
-						</div> */}
+						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
+					</div> */}
 				</h2>
 			</div>
 
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 71672c8f0..14ac9cebf 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -481,6 +481,7 @@ const LocaleTranslationData = {
 		"unit.type.of.unit": "Type of Unit:",
 		"unit.type.of.unit.suffix": "Added suffix will set type of unit to suffix",
 		"units": "Units",
+		"units-conversion-page-title": "Units and Conversions Visual Graphics",
 		"unsaved.failure": "Changes failed to save",
 		"unsaved.success": "Changes saved",
 		"unsaved.warning": "You have unsaved change(s). Are you sure you want to leave?",

From 5c767b2ef185e5114af0468b16a20ed2b691ed28 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Mon, 4 Nov 2024 14:59:41 -0800
Subject: [PATCH 038/128] created tooltip for page and internationlized title
 and tooltip.

---
 src/client/app/components/TooltipHelpComponent.tsx  |  3 ++-
 .../visual-unit/VisualUnitDetailComponent.tsx       | 13 +++----------
 src/client/app/translations/data.ts                 |  7 ++++++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/client/app/components/TooltipHelpComponent.tsx b/src/client/app/components/TooltipHelpComponent.tsx
index 6f446a65e..97a0b59e0 100644
--- a/src/client/app/components/TooltipHelpComponent.tsx
+++ b/src/client/app/components/TooltipHelpComponent.tsx
@@ -70,7 +70,8 @@ export default function TooltipHelpComponent(props: TooltipHelpProps) {
 		'help.home.toggle.chart.link': { link: `${helpUrl}/chartLink/` },
 		'help.groups.groupdetails': { link: `${helpUrl}/groupViewing/#groupDetails` },
 		'help.groups.groupview': { link: `${helpUrl}/groupViewing/` },
-		'help.meters.meterview': { link: `${helpUrl}/meterViewing/` }
+		'help.meters.meterview': { link: `${helpUrl}/meterViewing/` },
+		'help.admin.unitconversionvisuals': { link: ''}
 	};
 
 	return (
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index ce07d2409..877c2600f 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -21,10 +21,9 @@ export default function VisualUnitDetailComponent() {
 
 	const tooltipStyle = {
 		display: 'inline-block',
-		fontSize: '60%',
-		padding: '0.3rem',
+		fontSize: '50%',
 		// For now, only an admin can see the unit page.
-		tooltipVisualUnitView: 'help.admin.unitview'
+		tooltipVisualUnitView: 'help.admin.unitconversionvisuals'
 	};
 
 	return (
@@ -33,7 +32,7 @@ export default function VisualUnitDetailComponent() {
 
 			<div className='container-fluid'>
 				<h1 style={titleStyle}>
-					<FormattedMessage id='units-conversion-page-title' />
+					<FormattedMessage id='units.conversion.page.title' />
 					<div style={tooltipStyle}>
 						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
 					</div>
@@ -42,9 +41,6 @@ export default function VisualUnitDetailComponent() {
 
 				<h2 style={titleStyle}>
 					<FormattedMessage id='visual-input-units-graphic' />
-					<div style={tooltipStyle}>
-						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
-					</div>
 				</h2>
 			</div>
 
@@ -55,9 +51,6 @@ export default function VisualUnitDetailComponent() {
 			<div className='container-fluid'>
 				<h2 style={titleStyle}>
 					<FormattedMessage id='visual-analyzed-units-graphic' />
-					{/* <div style={tooltipStyle}>
-						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
-					</div> */}
 				</h2>
 			</div>
 
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 14ac9cebf..76afa28e1 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -229,6 +229,7 @@ const LocaleTranslationData = {
 		"help.admin.metercreate": "This page allows admins to create meters. Please visit {link} for further details and information.",
 		"help.admin.meteredit": "This page allows admins to edit meters. Please visit {link} for further details and information.",
 		"help.admin.meterview": "This page allows admins to view and edit meters. Please visit {link} for further details and information.",
+		"help.admin.unitconversionvisuals": "The \"Input Units Visual Graphic\" visually shows the units and conversions made by admins. The \"Analyzed Units Visual Graphic\" visually shows the analysis OED does on the units and conversions entered by admins.",
 		"help.admin.unitcreate": "This page allows admins to create units. Please visit {link} for further details and information.",
 		"help.admin.unitedit": "This page allows admins to edit units. Please visit {link} for further details and information.",
 		"help.admin.unitview": "This page shows information on units. Please visit {link} for further details and information.",
@@ -481,7 +482,7 @@ const LocaleTranslationData = {
 		"unit.type.of.unit": "Type of Unit:",
 		"unit.type.of.unit.suffix": "Added suffix will set type of unit to suffix",
 		"units": "Units",
-		"units-conversion-page-title": "Units and Conversions Visual Graphics",
+		"units.conversion.page.title": "Units and Conversions Visual Graphics",
 		"unsaved.failure": "Changes failed to save",
 		"unsaved.success": "Changes saved",
 		"unsaved.warning": "You have unsaved change(s). Are you sure you want to leave?",
@@ -745,6 +746,7 @@ const LocaleTranslationData = {
 		"help.admin.metercreate": "This page allows admins to create meters. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.meteredit": "This page allows admins to edit meters. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.meterview": "This page allows admins to view and edit meters. Please visit {link} for further details and information.\u{26A1}",
+		"help.admin.unitconversionvisuals": "The \"Input Units Visual Graphic\" visually shows the units and conversions made by admins. The \"Analyzed Units Visual Graphic\" visually shows the analysis OED does on the units and conversions entered by admins.\u{26A1}",
 		"help.admin.unitcreate": "This page allows admins to create units. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.unitedit": "This page allows admins to edit units. Please visit {link} for further details and information.",
 		"help.admin.unitview": "This page shows information on units. Please visit {link} for further details and information.\u{26A1}",
@@ -997,6 +999,7 @@ const LocaleTranslationData = {
 		"unit.type.of.unit": "Type of Unit:\u{26A1}",
 		"unit.type.of.unit.suffix": "Added suffix will set type of unit to suffix\u{26A1}",
 		"units": "Units\u{26A1}",
+		"units.conversion.page.title": "Units and Conversions Visual Graphics\u{26A1}",
 		"unsaved.failure": "Changes failed to save\u{26A1}",
 		"unsaved.success": "Changes saved\u{26A1}",
 		"unsaved.warning": "You have unsaved change(s). Are you sure you want to leave?\u{26A1}",
@@ -1261,6 +1264,7 @@ const LocaleTranslationData = {
 		"help.admin.metercreate": "Esta página permite a los administradores crear medidores. Por favor, visite {link} para más detalles e información.",
 		"help.admin.meteredit": "Esta página permite a los administradores editar medidores. Por favor, visite {link} para más detalles e información.",
 		"help.admin.meterview": "Esta página permite a los administradores ver y editar mediores. Por favor, visite {link} para más detalles e información.",
+		"help.admin.unitconversionvisuals": "El \"Gráfico Visual de Unidades de Entrada\" muestra visualmente las unidades y las conversiones ingresadas por los administradores. El \"Gráfico Visual de Unidades Analizadas\" muestra visualmente el análisis que realiza el OED en las unidades y las conversiones ingresadas por los administradores.",
 		"help.admin.unitcreate": "Esta página permite a los administradores crear unidades. Por favor, visite {link} para más detalles e información.",
 		"help.admin.unitedit": "Esta página permite a los administradores editar unidades Por favor, visite {link} para más detalles e información.",
 		"help.admin.unitview": "Esta página muestra información sobre unidades. Por favor, visite {link} para más detalles e información.",
@@ -1513,6 +1517,7 @@ const LocaleTranslationData = {
 		"unit.type.of.unit": "Tipo de unidad:",
 		"unit.type.of.unit.suffix": "El sufijo agregado determina que el tipo de la unidad es sufijo",
 		"units": "Unidades",
+		"units.conversion.page.title": "Gráficos Visuales de Unidades y Conversiones",
 		"unsaved.failure": "No se pudieron guardar los cambios",
 		"unsaved.success": "Se guardaron los cambios",
 		"unsaved.warning": "Tienes cambios sin guardar. ¿Estás seguro que quieres salir?",

From c62a0bbe6769f79f403c5d0f3e40c86898b46257 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Thu, 7 Nov 2024 17:40:20 -0800
Subject: [PATCH 039/128] renamed data names.

---
 .../app/components/HeaderButtonsComponent.tsx |  2 +-
 .../CreateCikVisualModalMapComponent.tsx      |  6 +--
 .../CreateVisualUnitModalMapComponent.tsx     |  6 +--
 .../visual-unit/VisualUnitDetailComponent.tsx |  4 +-
 src/client/app/translations/data.ts           | 42 +++++++++----------
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/client/app/components/HeaderButtonsComponent.tsx b/src/client/app/components/HeaderButtonsComponent.tsx
index 5318fb16b..3950409b4 100644
--- a/src/client/app/components/HeaderButtonsComponent.tsx
+++ b/src/client/app/components/HeaderButtonsComponent.tsx
@@ -212,7 +212,7 @@ export default function HeaderButtonsComponent() {
 								disabled={state.shouldVisualUnitMapButtonDisabled}
 								tag={Link}
 								to="/visual-unit">
-								<FormattedMessage id='visual-unit' />
+								<FormattedMessage id='visual.unit' />
 							</DropdownItem>
 							<DropdownItem divider style={state.adminViewableLinkStyle} />
 							<DropdownItem
diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index c70eba43f..b3a945ddd 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -20,7 +20,7 @@ export default function CreateCikVisualMapComponent() {
 	/* creating color schema for nodes based on their unit type */
 	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
 	const colorSchema = d3.scaleOrdinal<string, string>()
-		.domain(['meter', 'unit', 'suffix', 'suffix-input'])
+		.domain(['meter', 'unit', 'suffix', 'suffix.input'])
 		.range(colors);
 
 	/* Create data container to pass to D3 force graph */
@@ -107,7 +107,7 @@ export default function CreateCikVisualMapComponent() {
 			/* Node radius */
 			.attr('r', 20)
 			/* checks if unit has a non empty suffix to color differently */
-			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix-input') : colorSchema(d.typeOfUnit));
+			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix.input') : colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
@@ -185,7 +185,7 @@ export default function CreateCikVisualMapComponent() {
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')
 				/* internationalizing color legend text */
-				.text(intl.formatMessage({id : `legend-graph-text-${item}`}));
+				.text(intl.formatMessage({id : `legend.graph.text.${item}`}));
 		});
 
 	// Empty dependency array to run the effect only once
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index 6abaf4a56..cc33a7f2f 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -24,7 +24,7 @@ export default function CreateVisualUnitMapModalComponent() {
 	/* creating color schema for nodes based on their unit type */
 	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
 	const colorSchema = d3.scaleOrdinal<string, string>()
-		.domain(['meter', 'unit', 'suffix', 'suffix-input'])
+		.domain(['meter', 'unit', 'suffix', 'suffix.input'])
 		.range(colors);
 
 	/* Create data container to pass to D3 force graph */
@@ -125,7 +125,7 @@ export default function CreateVisualUnitMapModalComponent() {
 			/* Node radius */
 			.attr('r', 20)
 			/* checks if unit has a non empty suffix to color differently */
-			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix-input') : colorSchema(d.typeOfUnit));
+			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix.input') : colorSchema(d.typeOfUnit));
 
 		/* Drag behavior */
 		node.call(d3.drag()
@@ -203,7 +203,7 @@ export default function CreateVisualUnitMapModalComponent() {
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')
 				/* internationalizing color legend text */
-				.text(intl.formatMessage({id : `legend-graph-text-${item}`}));
+				.text(intl.formatMessage({id : `legend.graph.text.${item}`}));
 		});
 
 	// Empty dependency array to run the effect only once
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 877c2600f..16439ac93 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -40,7 +40,7 @@ export default function VisualUnitDetailComponent() {
 				<br/>
 
 				<h2 style={titleStyle}>
-					<FormattedMessage id='visual-input-units-graphic' />
+					<FormattedMessage id='visual.input.units.graphic' />
 				</h2>
 			</div>
 
@@ -50,7 +50,7 @@ export default function VisualUnitDetailComponent() {
 
 			<div className='container-fluid'>
 				<h2 style={titleStyle}>
-					<FormattedMessage id='visual-analyzed-units-graphic' />
+					<FormattedMessage id='visual.analyzed.units.graphic' />
 				</h2>
 			</div>
 
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 76afa28e1..a6441a5d4 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -286,10 +286,10 @@ const LocaleTranslationData = {
 		"last.four.weeks": "Last four weeks",
 		"last.week": "Last week",
 		"leave": "Leave",
-		"legend-graph-text-meter": "Meter",
-		"legend-graph-text-suffix": "Suffix Analyzed",
-		"legend-graph-text-suffix-input": "Suffix Input",
-		"legend-graph-text-unit": "Unit",
+		"legend.graph.text.meter": "Meter",
+		"legend.graph.text.suffix": "Suffix Analyzed",
+		"legend.graph.text.suffix.input": "Suffix Input",
+		"legend.graph.text.unit": "Unit",
 		"less.energy": "less energy",
 		"line": "Line",
 		"log.in": "Log in",
@@ -514,9 +514,9 @@ const LocaleTranslationData = {
 		"uses": "uses",
 		"view.groups": "View Groups",
 		"visit": " or visit our ",
-		"visual-unit": "Units Visual Graphics",
-		"visual-input-units-graphic": "Input Units Visual Graphic",
-		"visual-analyzed-units-graphic": "Analyzed Units Visual Graphic",
+		"visual.unit": "Units Visual Graphics",
+		"visual.input.units.graphic": "Input Units Visual Graphic",
+		"visual.analyzed.units.graphic": "Analyzed Units Visual Graphic",
 		"website": "website",
 		"week": "Week",
 		"yes": "yes",
@@ -803,10 +803,10 @@ const LocaleTranslationData = {
 		"last.four.weeks": "Quatre dernières semaines",
 		"last.week": "La semaine dernière",
 		"leave": "Leave\u{26A1}",
-		"legend-graph-text-meter": "Meter\u{26A1}",
-		"legend-graph-text-suffix": "Suffix Analyzed\u{26A1}",
-		"legend-graph-text-suffix-input": "Suffix Input\u{26A1}",
-		"legend-graph-text-unit": "Unit\u{26A1}",
+		"legend.graph.text.meter": "Meter\u{26A1}",
+		"legend.graph.text.suffix": "Suffix Analyzed\u{26A1}",
+		"legend.graph.text.suffix.input": "Suffix Input\u{26A1}",
+		"legend.graph.text.unit": "Unit\u{26A1}",
 		"less.energy": "moins d'énergie",
 		"line": "Ligne",
 		"log.in": "Se Connecter",
@@ -1031,9 +1031,9 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Visionner les groupes",
 		"visit": " ou visitez notre ",
-		"visual-unit": "Units Visual Graphics\u{26A1}",
-		"visual-input-units-graphic": "Graphique Visuel des Unités D'Entrée",
-		"visual-analyzed-units-graphic": "Graphique Visuel des Unités Analysées",
+		"visual.unit": "Units Visual Graphics\u{26A1}",
+		"visual.input.units.graphic": "Graphique Visuel des Unités D'Entrée",
+		"visual.analyzed.units.graphic": "Graphique Visuel des Unités Analysées",
 		"website": "site web",
 		"week": "Semaine",
 		"yes": " yes\u{26A1}",
@@ -1321,10 +1321,10 @@ const LocaleTranslationData = {
 		"last.four.weeks": "Últimas cuatro semanas",
 		"last.week": "La semana pasada",
 		"leave": "Salir",
-		"legend-graph-text-meter": "Medidor",
-		"legend-graph-text-suffix": "Sufijo Analizado",
-		"legend-graph-text-suffix-input": "Sufijo Entrado",
-		"legend-graph-text-unit": "Unidad",
+		"legend.graph.text.meter": "Medidor",
+		"legend.graph.text.suffix": "Sufijo Analizado",
+		"legend.graph.text.suffix.input": "Sufijo Entrado",
+		"legend.graph.text.unit": "Unidad",
 		"less.energy": "menos energía",
 		"line": "Línea",
 		"log.in": "Iniciar sesión",
@@ -1549,9 +1549,9 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Ver grupos",
 		"visit": " o visite nuestro ",
-		"visual-unit": "Units Visual Graphics\u{26A1}",
-		"visual-input-units-graphic": "Gráfico Visual de Unidades de Entrada",
-		"visual-analyzed-units-graphic": "Gráfico Visual de Unidades Analizadas",
+		"visual.unit": "Units Visual Graphics\u{26A1}",
+		"visual.input.units.graphic": "Gráfico Visual de Unidades de Entrada",
+		"visual.analyzed.units.graphic": "Gráfico Visual de Unidades Analizadas",
 		"website": "sitio web",
 		"week": "semana",
 		"yes": "sí",

From a89bca319a63bd6e292eb7fd65c2128dac1bf464 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Thu, 7 Nov 2024 17:47:02 -0800
Subject: [PATCH 040/128] added comments to the components.

---
 .../visual-unit/CreateCikVisualModalMapComponent.tsx          | 4 +++-
 .../visual-unit/CreateVisualUnitModalMapComponent.tsx         | 3 ++-
 .../app/components/visual-unit/VisualUnitDetailComponent.tsx  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index b3a945ddd..424294b4e 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -7,7 +7,9 @@ import { useAppSelector } from '../../redux/reduxHooks';
 import { selectAllUnits } from '../../redux/api/unitsApi';
 
 /**
- * Visual cik graph component
+ * Visual graph component that shows the result of OED's analysis on the
+ * relationship between units and conversions entered by an admin. (Uses
+ * Cik data for the conversion links).
  * @returns D3 force graph visual
  */
 export default function CreateCikVisualMapComponent() {
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index cc33a7f2f..cf3a2227f 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -11,7 +11,8 @@ import { selectAllUnits } from '../../redux/api/unitsApi';
 import { selectConversionsDetails } from '../../redux/api/conversionsApi';
 
 /**
- * Visual unit-conversion graph component
+ * Visual graph component that shows the relationship between units and conversions
+ * entered by an admin. (Uses conversion data for conversion links).
  * @returns D3 force graph visual
  */
 export default function CreateVisualUnitMapModalComponent() {
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 16439ac93..00ac5e218 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -10,8 +10,8 @@ import CreateCikVisualMapComponent from './CreateCikVisualModalMapComponent';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
 
 /**
- * Defines the units page card view
- * @returns Units page element
+ * Defines the units and conversion graphics view.
+ * @returns Units visual graphics page element
  */
 export default function VisualUnitDetailComponent() {
 

From 844e28892dabf1faeb88dc12f216dfaa29f38edb Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Fri, 8 Nov 2024 12:30:02 -0800
Subject: [PATCH 041/128] added copyright header.

---
 .../visual-unit/CreateCikVisualModalMapComponent.tsx          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index 424294b4e..edeb698d1 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 import * as React from 'react';
 import * as d3 from 'd3';
 import { useEffect } from 'react';

From b18deaa94dcf61c6b0220502b06202030a9e51de Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Sat, 9 Nov 2024 01:30:34 -0500
Subject: [PATCH 042/128] improve UI by using pagination

---
 .../app/components/admin/LogMsgComponent.tsx  | 175 ++++++++++++------
 1 file changed, 115 insertions(+), 60 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index 439cc6bb5..a36868dea 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -13,6 +13,8 @@ import { logsApi } from '../../utils/api';
 // 	logTime: string;
 // }
 
+const PER_PAGE = 25;
+
 const initialLogs: any[] = [];
 
 
@@ -35,8 +37,12 @@ export default function LogMsgComponent() {
 	// Dropdown open state for log type in the header
 	const [dropdownOpen, setDropdownOpen] = React.useState(false);
 
+	// number of log messages to display
+	const [logLimit, setLogLimit] = React.useState(0);
 	// const [selectAllOption, setSelectAllOption] = React.useState(true);
 
+	const [currentPage, setCurrentPage] = React.useState(1);
+
 	// Handle checkbox change
 	const handleCheckboxChange = (logType: string) => {
 		if (selectedLogTypes.includes(logType)) {
@@ -51,10 +57,9 @@ export default function LogMsgComponent() {
 	const handleDateSort = () => {
 		const newDateSortOrder = dateSortOrder === 'asc' ? 'desc' : 'asc';
 		const sortedLogs = [...logs].sort((a, b) => {
-			const dateA = new Date(a.log_time);
-			const dateB = new Date(b.log_time);
-			// const dateA = new Date(a.logTime);
-			// const dateB = new Date(b.logTime);
+			const dateA = new Date(a.logTime);
+			const dateB = new Date(b.logTime);
+
 			if (newDateSortOrder === 'asc') {
 				return dateA.getTime() - dateB.getTime();
 			} else {
@@ -69,6 +74,10 @@ export default function LogMsgComponent() {
 		setLogDateRange(range);
 	};
 
+	const handlePageChange = (newPage: number) => {
+		setCurrentPage(newPage);
+	};
+
 	// Toggle dropdown in the header
 	const onToggleDropdown = () => {
 		setDropdownOpen(!dropdownOpen);
@@ -76,7 +85,6 @@ export default function LogMsgComponent() {
 
 	// Filter logs based on selected log types and date range
 	const filteredLogs = logs.filter(log => {
-		// const logDate = new Date(log.log_time);
 		const logDate = new Date(log.logTime);
 
 		// Check if log is within the selected date range
@@ -84,26 +92,31 @@ export default function LogMsgComponent() {
 			(!logDateRange || !logDateRange[0] || logDate >= logDateRange[0]) &&
 			(!logDateRange || !logDateRange[1] || logDate <= logDateRange[1]);
 
-		// return selectedLogTypes.includes(log.log_type) && isWithinDateRange;
 		return selectedLogTypes.includes(log.logType) && isWithinDateRange;
 	});
 
+	const paginatedLogs = filteredLogs.slice((currentPage - 1) * PER_PAGE, currentPage * PER_PAGE);
+	const totalPages = Math.ceil(filteredLogs.length / PER_PAGE);
+
 	/**
 	 * Handle showing the log table
 	 */
 	async function handleShowLogTable() {
 		if (!logDateRange || !logDateRange[0] || !logDateRange[1]) {
 			showWarnNotification('You must select a date range');
+		} else if (!logLimit || logLimit < 1 || logLimit > 1000) {
+			showWarnNotification('You must enter a valid number of logs to display');
 		} else {
 			try {
 				// get log by date and type
-				const data = await logsApi.getLogsByDateRangeAndType(logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedLogTypes);
+				const data = await logsApi.getLogsByDateRangeAndType(
+					logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedLogTypes, logLimit.toString());
 				setLogs(data);
-
+				setShowLogTable(true);
+				setCurrentPage(1);
 			} catch (error) {
 				console.error(error);
 			}
-			setShowLogTable(true);
 		}
 	}
 
@@ -112,62 +125,88 @@ export default function LogMsgComponent() {
 			<>
 				<h1 style={titleStyle}>Log Messages</h1>
 				<FormGroup check inline style={logFilterStyle}>
-					<p style={labelStyle}>Date Range:</p>
-					<DateRangePicker
-						value={logDateRange}
-						onChange={handleDateRangeChange}
-						minDate={new Date(1970, 0, 1)}
-						maxDate={new Date()}
-						locale={locale} // Formats Dates, and Calendar months base on locale
-						calendarIcon={null}
-						calendarProps={{ defaultView: 'year' }} />
+					<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
+						<DropdownToggle caret>Log Type</DropdownToggle>
+						<DropdownMenu>
+							{logTypes.map(logType => (
+								<DropdownItem key={logType} toggle={false}>
+									<Label check>
+										<Input
+											type="checkbox"
+											checked={selectedLogTypes.includes(logType)}
+											onChange={() => handleCheckboxChange(logType)}
+										/> {logType}
+									</Label>
+								</DropdownItem>
+							))}
+						</DropdownMenu>
+					</Dropdown>
+					<div style={{ display: 'flex', gap: '2.5%' }}>
+						<p style={labelStyle}>Date Range:</p>
+						<DateRangePicker
+							value={logDateRange}
+							onChange={handleDateRangeChange}
+							minDate={new Date(1970, 0, 1)}
+							maxDate={new Date()}
+							locale={locale} // Formats Dates, and Calendar months base on locale
+							calendarIcon={null}
+							calendarProps={{ defaultView: 'year' }} />
+					</div>
+					<FormGroup check>
+						<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
+							Number of logs:
+						</Label>
+						<Input
+							id="logLimit"
+							name="logLimit"
+							placeholder="(from 1 to 1000)"
+							type="number"
+							onChange={e => setLogLimit(e.target.valueAsNumber)}
+							invalid={logLimit < 1 || logLimit > 1000}
+						/>
+					</FormGroup>
+					<Button color='primary' onClick={handleShowLogTable}>Refresh</Button>
 				</FormGroup>
-				<Table style={tableStyle} bordered hover responsive>
+				<Table style={tableStyle} bordered hover>
 					<thead style={headerStyle}>
 						<tr>
-							<th>
-								<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
-									<DropdownToggle caret>
-										Log Type
-									</DropdownToggle>
-									<DropdownMenu>
-										{logTypes.map(logType => (
-											<DropdownItem key={logType} toggle={false}>
-												<Label check>
-													<Input
-														type="checkbox"
-														checked={selectedLogTypes.includes(logType)}
-														onChange={() => handleCheckboxChange(logType)}
-													/> {logType}
-												</Label>
-											</DropdownItem>
-										))}
-									</DropdownMenu>
-								</Dropdown>
-							</th>
+							<th>Log Type</th>
 							<th>Log Message</th>
 							<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>Log Time {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
 						</tr>
 					</thead>
 					<tbody style={bodyStyle}>
-						{filteredLogs.map((log, index) => (
+						{paginatedLogs.map((log, index) => (
 							<tr key={index + 1}>
 								<td>{log.logType}</td>
 								<td>{log.logMessage}</td>
-								<td>{new Date(log.logTime).toLocaleString('en-US', {
-									year: 'numeric',
-									month: '2-digit',
-									day: '2-digit',
-									hour: '2-digit',
-									minute: '2-digit',
-									second: '2-digit',
-									fractionalSecondDigits: 2
-								})}</td>
+								<td>
+									{new Date(log.logTime).toLocaleString('en-US', {
+										year: 'numeric',
+										month: '2-digit',
+										day: '2-digit',
+										hour: '2-digit',
+										minute: '2-digit',
+										second: '2-digit',
+										fractionalSecondDigits: 2
+									})}
+								</td>
 							</tr>
 						))}
 					</tbody>
-
 				</Table>
+				<div style={{ textAlign: 'center', margin: '-1% auto 1% auto' }}>
+					{Array.from({ length: totalPages }, (_, index) => (
+						<Button
+							key={index + 1}
+							color={currentPage === index + 1 ? 'primary' : 'secondary'}
+							onClick={() => handlePageChange(index + 1)}
+							style={{ margin: '0 2px' }}
+						>
+							{index + 1}
+						</Button>
+					))}
+				</div>
 			</>
 			:
 
@@ -175,8 +214,8 @@ export default function LogMsgComponent() {
 				<div className='d-inline-flex flex-column align-items-center justify-content-center w-100'>
 					<Alert style={{ textAlign: 'center' }}>Please choose log types and date range for log data</Alert>
 					<div className='col-12 col-lg-6 border border-4 rounded p-4 vw-50'>
-						<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'baseline' }}>
-							<Dropdown style={{ display: 'block' }} isOpen={dropdownOpen} toggle={onToggleDropdown}>
+						<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+							<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
 								<DropdownToggle color='primary' caret>
 									Log Type
 								</DropdownToggle>
@@ -194,9 +233,12 @@ export default function LogMsgComponent() {
 									))}
 								</DropdownMenu>
 							</Dropdown>
-							<FormGroup check style={{ display: 'flex', alignItems: 'baseline' }}>
-								<p style={{ fontWeight: 'bold' }}>Date Range:</p>
+							<FormGroup check>
+								<Label for='logDate' style={{ fontWeight: 'bold', margin: '0' }}>
+									Date Range:
+								</Label>
 								<DateRangePicker
+									id='logDate'
 									value={logDateRange}
 									onChange={handleDateRangeChange}
 									minDate={new Date(1970, 0, 1)}
@@ -207,11 +249,22 @@ export default function LogMsgComponent() {
 									required />
 
 							</FormGroup>
+							<FormGroup check>
+								<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
+									Number of logs to Display:
+								</Label>
+								<Input
+									id="logLimit"
+									name="logLimit"
+									placeholder="(from 1 to 1000)"
+									type="number"
+									onChange={e => setLogLimit(e.target.valueAsNumber)}
+									required
+									invalid={logLimit < 1 || logLimit > 1000}
+								/>
+							</FormGroup>
 						</div>
-						<Button style={{ width: '70%' }} block color='primary' onClick={handleShowLogTable}>Show Log Messages</Button>
-
-
-
+						<Button block color='primary' onClick={handleShowLogTable}>Show Log Messages</Button>
 					</div>
 				</div>
 			</div >
@@ -230,13 +283,15 @@ const titleStyle: React.CSSProperties = {
 
 const tableStyle: React.CSSProperties = {
 	width: '90%',
-	margin: 'auto'
+	margin: '2.5% auto'
 };
 
 const logFilterStyle: React.CSSProperties = {
 	display: 'flex',
 	marginLeft: '9%',
-	gap: '3%'
+	gap: '1%',
+	flexWrap: 'wrap',
+	alignItems: 'center'
 };
 
 const labelStyle: React.CSSProperties = {

From f1f951ea3541f862ddd640bee2b1b630346f8612 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Sat, 9 Nov 2024 02:00:25 -0500
Subject: [PATCH 043/128] update UI to show only first 80 characters for long
 log messages

---
 .../app/components/admin/LogMsgComponent.tsx  | 311 ++++++++++--------
 1 file changed, 166 insertions(+), 145 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index a36868dea..f47b67cb6 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import { Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle, FormGroup, Input, Label, Table } from 'reactstrap';
+import {
+	Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle,
+	FormGroup, Input, Label, Modal, ModalBody, ModalHeader, Table
+} from 'reactstrap';
 import DateRangePicker from '@wojtekmaj/react-daterange-picker';
 import { useAppSelector } from '../../redux/reduxHooks';
 import { selectSelectedLanguage } from '../../redux/slices/appStateSlice';
@@ -14,10 +17,7 @@ import { logsApi } from '../../utils/api';
 // }
 
 const PER_PAGE = 25;
-
 const initialLogs: any[] = [];
-
-
 const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
 
 /**
@@ -43,6 +43,15 @@ export default function LogMsgComponent() {
 
 	const [currentPage, setCurrentPage] = React.useState(1);
 
+	const [modalOpen, setModalOpen] = React.useState(false);
+	const [modalLogMessage, setModalLogMessage] = React.useState('');
+
+	// Open modal with the full log message
+	const handleLogMessageClick = (logMessage: string) => {
+		setModalLogMessage(logMessage);
+		setModalOpen(true);
+	};
+
 	// Handle checkbox change
 	const handleCheckboxChange = (logType: string) => {
 		if (selectedLogTypes.includes(logType)) {
@@ -121,153 +130,165 @@ export default function LogMsgComponent() {
 	}
 
 	return (
-		showLogTable ?
-			<>
-				<h1 style={titleStyle}>Log Messages</h1>
-				<FormGroup check inline style={logFilterStyle}>
-					<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
-						<DropdownToggle caret>Log Type</DropdownToggle>
-						<DropdownMenu>
-							{logTypes.map(logType => (
-								<DropdownItem key={logType} toggle={false}>
-									<Label check>
-										<Input
-											type="checkbox"
-											checked={selectedLogTypes.includes(logType)}
-											onChange={() => handleCheckboxChange(logType)}
-										/> {logType}
-									</Label>
-								</DropdownItem>
-							))}
-						</DropdownMenu>
-					</Dropdown>
-					<div style={{ display: 'flex', gap: '2.5%' }}>
-						<p style={labelStyle}>Date Range:</p>
-						<DateRangePicker
-							value={logDateRange}
-							onChange={handleDateRangeChange}
-							minDate={new Date(1970, 0, 1)}
-							maxDate={new Date()}
-							locale={locale} // Formats Dates, and Calendar months base on locale
-							calendarIcon={null}
-							calendarProps={{ defaultView: 'year' }} />
-					</div>
-					<FormGroup check>
-						<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
-							Number of logs:
-						</Label>
-						<Input
-							id="logLimit"
-							name="logLimit"
-							placeholder="(from 1 to 1000)"
-							type="number"
-							onChange={e => setLogLimit(e.target.valueAsNumber)}
-							invalid={logLimit < 1 || logLimit > 1000}
-						/>
+		<>
+			{showLogTable ?
+				(<>
+					<h1 style={titleStyle}>Log Messages</h1>
+					<FormGroup check inline style={logFilterStyle}>
+						<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
+							<DropdownToggle caret>Log Type</DropdownToggle>
+							<DropdownMenu>
+								{logTypes.map(logType => (
+									<DropdownItem key={logType} toggle={false}>
+										<Label check>
+											<Input
+												type="checkbox"
+												checked={selectedLogTypes.includes(logType)}
+												onChange={() => handleCheckboxChange(logType)}
+											/> {logType}
+										</Label>
+									</DropdownItem>
+								))}
+							</DropdownMenu>
+						</Dropdown>
+						<div style={{ display: 'flex', gap: '2.5%' }}>
+							<p style={labelStyle}>Date Range:</p>
+							<DateRangePicker
+								value={logDateRange}
+								onChange={handleDateRangeChange}
+								minDate={new Date(1970, 0, 1)}
+								maxDate={new Date()}
+								locale={locale} // Formats Dates, and Calendar months base on locale
+								calendarIcon={null}
+								calendarProps={{ defaultView: 'year' }} />
+						</div>
+						<FormGroup check>
+							<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
+								Number of logs:
+							</Label>
+							<Input
+								id="logLimit"
+								name="logLimit"
+								placeholder="(from 1 to 1000)"
+								type="number"
+								onChange={e => setLogLimit(e.target.valueAsNumber)}
+								invalid={logLimit < 1 || logLimit > 1000}
+							/>
+						</FormGroup>
+						<Button color='primary' onClick={handleShowLogTable}>Refresh</Button>
 					</FormGroup>
-					<Button color='primary' onClick={handleShowLogTable}>Refresh</Button>
-				</FormGroup>
-				<Table style={tableStyle} bordered hover>
-					<thead style={headerStyle}>
-						<tr>
-							<th>Log Type</th>
-							<th>Log Message</th>
-							<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>Log Time {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
-						</tr>
-					</thead>
-					<tbody style={bodyStyle}>
-						{paginatedLogs.map((log, index) => (
-							<tr key={index + 1}>
-								<td>{log.logType}</td>
-								<td>{log.logMessage}</td>
-								<td>
-									{new Date(log.logTime).toLocaleString('en-US', {
-										year: 'numeric',
-										month: '2-digit',
-										day: '2-digit',
-										hour: '2-digit',
-										minute: '2-digit',
-										second: '2-digit',
-										fractionalSecondDigits: 2
-									})}
-								</td>
+					<Table style={tableStyle} bordered hover>
+						<thead style={headerStyle}>
+							<tr>
+								<th>Log Type</th>
+								<th>Log Message</th>
+								<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>Log Time {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
 							</tr>
+						</thead>
+						<tbody style={bodyStyle}>
+							{paginatedLogs.map((log, index) => (
+								<tr key={index + 1}>
+									<td>{log.logType}</td>
+									<td
+										style={{ cursor: 'pointer' }}
+										onClick={() => handleLogMessageClick(log.logMessage)}
+									>{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}</td>
+									<td>
+										{new Date(log.logTime).toLocaleString('en-US', {
+											year: 'numeric',
+											month: '2-digit',
+											day: '2-digit',
+											hour: '2-digit',
+											minute: '2-digit',
+											second: '2-digit',
+											fractionalSecondDigits: 2
+										})}
+									</td>
+								</tr>
+							))}
+						</tbody>
+					</Table>
+					<div style={{ textAlign: 'center', margin: '-1% auto 1% auto' }}>
+						{Array.from({ length: totalPages }, (_, index) => (
+							<Button
+								key={index + 1}
+								color={currentPage === index + 1 ? 'primary' : 'secondary'}
+								onClick={() => handlePageChange(index + 1)}
+								style={{ margin: '0 2px' }}
+							>
+								{index + 1}
+							</Button>
 						))}
-					</tbody>
-				</Table>
-				<div style={{ textAlign: 'center', margin: '-1% auto 1% auto' }}>
-					{Array.from({ length: totalPages }, (_, index) => (
-						<Button
-							key={index + 1}
-							color={currentPage === index + 1 ? 'primary' : 'secondary'}
-							onClick={() => handlePageChange(index + 1)}
-							style={{ margin: '0 2px' }}
-						>
-							{index + 1}
-						</Button>
-					))}
-				</div>
-			</>
-			:
-
-			<div className='container-fluid'>
-				<div className='d-inline-flex flex-column align-items-center justify-content-center w-100'>
-					<Alert style={{ textAlign: 'center' }}>Please choose log types and date range for log data</Alert>
-					<div className='col-12 col-lg-6 border border-4 rounded p-4 vw-50'>
-						<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-							<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
-								<DropdownToggle color='primary' caret>
-									Log Type
-								</DropdownToggle>
-								<DropdownMenu>
-									{logTypes.map(logType => (
-										<DropdownItem key={logType} toggle={false}>
-											<Label check>
-												<Input
-													type="checkbox"
-													checked={selectedLogTypes.includes(logType)}
-													onChange={() => handleCheckboxChange(logType)}
-												/> {logType}
-											</Label>
-										</DropdownItem>
-									))}
-								</DropdownMenu>
-							</Dropdown>
-							<FormGroup check>
-								<Label for='logDate' style={{ fontWeight: 'bold', margin: '0' }}>
-									Date Range:
-								</Label>
-								<DateRangePicker
-									id='logDate'
-									value={logDateRange}
-									onChange={handleDateRangeChange}
-									minDate={new Date(1970, 0, 1)}
-									maxDate={new Date()}
-									locale={locale} // Formats Dates, and Calendar months base on locale
-									calendarIcon={null}
-									calendarProps={{ defaultView: 'year' }}
-									required />
+					</div>
+				</>)
+				:
+				(<div className='container-fluid'>
+					<div className='d-inline-flex flex-column align-items-center justify-content-center w-100'>
+						<Alert style={{ textAlign: 'center' }}>Please choose log types and date range for log data</Alert>
+						<div className='col-12 col-lg-6 border border-4 rounded p-4 vw-50'>
+							<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+								<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
+									<DropdownToggle color='primary' caret>
+										Log Type
+									</DropdownToggle>
+									<DropdownMenu>
+										{logTypes.map(logType => (
+											<DropdownItem key={logType} toggle={false}>
+												<Label check>
+													<Input
+														type="checkbox"
+														checked={selectedLogTypes.includes(logType)}
+														onChange={() => handleCheckboxChange(logType)}
+													/> {logType}
+												</Label>
+											</DropdownItem>
+										))}
+									</DropdownMenu>
+								</Dropdown>
+								<FormGroup check>
+									<Label for='logDate' style={{ fontWeight: 'bold', margin: '0' }}>
+										Date Range:
+									</Label>
+									<DateRangePicker
+										id='logDate'
+										value={logDateRange}
+										onChange={handleDateRangeChange}
+										minDate={new Date(1970, 0, 1)}
+										maxDate={new Date()}
+										locale={locale} // Formats Dates, and Calendar months base on locale
+										calendarIcon={null}
+										calendarProps={{ defaultView: 'year' }}
+										required />
 
-							</FormGroup>
-							<FormGroup check>
-								<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
-									Number of logs to Display:
-								</Label>
-								<Input
-									id="logLimit"
-									name="logLimit"
-									placeholder="(from 1 to 1000)"
-									type="number"
-									onChange={e => setLogLimit(e.target.valueAsNumber)}
-									required
-									invalid={logLimit < 1 || logLimit > 1000}
-								/>
-							</FormGroup>
+								</FormGroup>
+								<FormGroup check>
+									<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
+										Number of logs to Display:
+									</Label>
+									<Input
+										id="logLimit"
+										name="logLimit"
+										placeholder="(from 1 to 1000)"
+										type="number"
+										onChange={e => setLogLimit(e.target.valueAsNumber)}
+										required
+										invalid={logLimit < 1 || logLimit > 1000}
+									/>
+								</FormGroup>
+							</div>
+							<Button block color='primary' onClick={handleShowLogTable}>Show Log Messages</Button>
 						</div>
-						<Button block color='primary' onClick={handleShowLogTable}>Show Log Messages</Button>
 					</div>
-				</div>
-			</div >
+				</div >)
+			}
+
+			<Modal isOpen={modalOpen} toggle={() => setModalOpen(!modalOpen)} centered>
+				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>Log Message</ModalHeader>
+				<ModalBody>
+					{modalLogMessage}
+				</ModalBody>
+			</Modal >
+		</>
 	);
 }
 

From fcbd0a8a784286ab981a32eb8590b8c3c80e8832 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Sat, 9 Nov 2024 12:02:28 -0500
Subject: [PATCH 044/128] add select all log type option and apply translate
 function for all texts

---
 .../app/components/admin/LogMsgComponent.tsx  | 74 ++++++++++++-------
 src/client/app/translations/data.ts           | 33 ++++++++-
 2 files changed, 77 insertions(+), 30 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index f47b67cb6..d2fef0c60 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -8,15 +8,9 @@ import { useAppSelector } from '../../redux/reduxHooks';
 import { selectSelectedLanguage } from '../../redux/slices/appStateSlice';
 import { showWarnNotification } from '../../utils/notifications';
 import { logsApi } from '../../utils/api';
-// import translate from '../../utils/translate';
+import translate from '../../utils/translate';
 
-// interface LogMsgData {
-// 	logType: string;
-// 	logMessage: string;
-// 	logTime: string;
-// }
-
-const PER_PAGE = 25;
+const PER_PAGE = 20;
 const initialLogs: any[] = [];
 const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
 
@@ -39,7 +33,7 @@ export default function LogMsgComponent() {
 
 	// number of log messages to display
 	const [logLimit, setLogLimit] = React.useState(0);
-	// const [selectAllOption, setSelectAllOption] = React.useState(true);
+	const [selectAll, setSelectAll] = React.useState(true);
 
 	const [currentPage, setCurrentPage] = React.useState(1);
 
@@ -63,6 +57,16 @@ export default function LogMsgComponent() {
 		}
 	};
 
+	// Handle "Select All" checkbox change
+	const handleSelectAllChange = () => {
+		if (selectAll) {
+			setSelectedLogTypes([]);
+		} else {
+			setSelectedLogTypes(logTypes);
+		}
+		setSelectAll(!selectAll);
+	};
+
 	const handleDateSort = () => {
 		const newDateSortOrder = dateSortOrder === 'asc' ? 'desc' : 'asc';
 		const sortedLogs = [...logs].sort((a, b) => {
@@ -133,11 +137,20 @@ export default function LogMsgComponent() {
 		<>
 			{showLogTable ?
 				(<>
-					<h1 style={titleStyle}>Log Messages</h1>
+					<h1 style={titleStyle}>{translate('log.messages')}</h1>
 					<FormGroup check inline style={logFilterStyle}>
 						<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
-							<DropdownToggle caret>Log Type</DropdownToggle>
+							<DropdownToggle caret>{translate('log.type')}</DropdownToggle>
 							<DropdownMenu>
+								<DropdownItem key='selectAll' toggle={false}>
+									<Label check>
+										<Input
+											type="checkbox"
+											checked={selectAll}
+											onChange={handleSelectAllChange}
+										/> {translate('select.all')}
+									</Label>
+								</DropdownItem>
 								{logTypes.map(logType => (
 									<DropdownItem key={logType} toggle={false}>
 										<Label check>
@@ -152,7 +165,7 @@ export default function LogMsgComponent() {
 							</DropdownMenu>
 						</Dropdown>
 						<div style={{ display: 'flex', gap: '2.5%' }}>
-							<p style={labelStyle}>Date Range:</p>
+							<p style={labelStyle}>{translate('date.range')}</p>
 							<DateRangePicker
 								value={logDateRange}
 								onChange={handleDateRangeChange}
@@ -164,25 +177,25 @@ export default function LogMsgComponent() {
 						</div>
 						<FormGroup check>
 							<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
-								Number of logs:
+								{translate('num.logs.display')}
 							</Label>
 							<Input
 								id="logLimit"
 								name="logLimit"
-								placeholder="(from 1 to 1000)"
+								placeholder={translate('from.1.to.1000')}
 								type="number"
 								onChange={e => setLogLimit(e.target.valueAsNumber)}
 								invalid={logLimit < 1 || logLimit > 1000}
 							/>
 						</FormGroup>
-						<Button color='primary' onClick={handleShowLogTable}>Refresh</Button>
+						<Button color='primary' onClick={handleShowLogTable}>{translate('refresh')}</Button>
 					</FormGroup>
 					<Table style={tableStyle} bordered hover>
 						<thead style={headerStyle}>
 							<tr>
-								<th>Log Type</th>
-								<th>Log Message</th>
-								<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>Log Time {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
+								<th>{translate('log.type')}</th>
+								<th>{translate('log.message')}</th>
+								<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>{translate('log.time')} {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
 							</tr>
 						</thead>
 						<tbody style={bodyStyle}>
@@ -224,14 +237,21 @@ export default function LogMsgComponent() {
 				:
 				(<div className='container-fluid'>
 					<div className='d-inline-flex flex-column align-items-center justify-content-center w-100'>
-						<Alert style={{ textAlign: 'center' }}>Please choose log types and date range for log data</Alert>
+						<Alert style={{ textAlign: 'center' }}>{translate('please.choose.log.limit.date.range')}</Alert>
 						<div className='col-12 col-lg-6 border border-4 rounded p-4 vw-50'>
 							<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
 								<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
-									<DropdownToggle color='primary' caret>
-										Log Type
-									</DropdownToggle>
+									<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
 									<DropdownMenu>
+										<DropdownItem key='selectAll' toggle={false}>
+											<Label check>
+												<Input
+													type="checkbox"
+													checked={selectAll}
+													onChange={handleSelectAllChange}
+												/>{translate('select.all')}
+											</Label>
+										</DropdownItem>
 										{logTypes.map(logType => (
 											<DropdownItem key={logType} toggle={false}>
 												<Label check>
@@ -247,7 +267,7 @@ export default function LogMsgComponent() {
 								</Dropdown>
 								<FormGroup check>
 									<Label for='logDate' style={{ fontWeight: 'bold', margin: '0' }}>
-										Date Range:
+										{translate('date.range')}
 									</Label>
 									<DateRangePicker
 										id='logDate'
@@ -263,12 +283,12 @@ export default function LogMsgComponent() {
 								</FormGroup>
 								<FormGroup check>
 									<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
-										Number of logs to Display:
+										{translate('num.logs.display')}
 									</Label>
 									<Input
 										id="logLimit"
 										name="logLimit"
-										placeholder="(from 1 to 1000)"
+										placeholder={translate('from.1.to.1000')}
 										type="number"
 										onChange={e => setLogLimit(e.target.valueAsNumber)}
 										required
@@ -276,14 +296,14 @@ export default function LogMsgComponent() {
 									/>
 								</FormGroup>
 							</div>
-							<Button block color='primary' onClick={handleShowLogTable}>Show Log Messages</Button>
+							<Button block color='primary' onClick={handleShowLogTable}>{translate('show.logs')}</Button>
 						</div>
 					</div>
 				</div >)
 			}
 
 			<Modal isOpen={modalOpen} toggle={() => setModalOpen(!modalOpen)} centered>
-				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>Log Message</ModalHeader>
+				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>{translate('log.message')}</ModalHeader>
 				<ModalBody>
 					{modalLogMessage}
 				</ModalBody>
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index e656cb081..2fc94cdf3 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -513,7 +513,16 @@ const LocaleTranslationData = {
 		"yes": "yes",
 		"yesterday": "Yesterday",
 		"you.cannot.create.a.cyclic.group": "You cannot create a cyclic group",
-		"log.messages": "Log Messages"
+		"log.messages": "Log Messages",
+		"log.message": "Log Message",
+		"log.type": "Log Type",
+		"log.time": "Log Time",
+		"num.logs.display": "Number of logs to display",
+		"refresh": "Refresh",
+		"from.1.to.1000": "from 1 to 1000",
+		"show.logs": "Show Log Table",
+		"please.choose.log.limit.date.range": "Please choose log limit and date range",
+		"select.all": "Select All"
 	},
 	"fr": {
 		"3D": "3D",
@@ -1022,7 +1031,16 @@ const LocaleTranslationData = {
 		"yes": " yes\u{26A1}",
 		"yesterday": "Hier",
 		"you.cannot.create.a.cyclic.group": "Vous ne pouvez pas créer un groupe cyclique",
-		"log.messages": "Log Messages\u{26A1}"
+		"log.messages": "Log Messages\u{26A1}",
+		"log.message": "Log Message\u{26A1}",
+		"log.type": "Log Type\u{26A1}",
+		"log.time": "Log Time\u{26A1}",
+		"num.logs.display": "Number of logs to display\u{26A1}",
+		"refresh": "Refresh\u{26A1}",
+		"from.1.to.1000": "from 1 to 1000\u{26A1}",
+		"show.logs": "Show Log Table\u{26A1}",
+		"please.choose.log.limit.date.range": "Please choose log limit and date range\u{26A1}",
+		"select.all": "Select All\u{26A1}"
 	},
 	"es": {
 		"3D": "3D",
@@ -1532,7 +1550,16 @@ const LocaleTranslationData = {
 		"yes": "sí",
 		"yesterday": "Ayer",
 		"you.cannot.create.a.cyclic.group": "No se puede crear un grupo cíclico",
-		"log.messages": "Log Messages\u{26A1}"
+		"log.messages": "Log Messages\u{26A1}",
+		"log.message": "Log Message\u{26A1}",
+		"log.type": "Log Type\u{26A1}",
+		"log.time": "Log Time\u{26A1}",
+		"num.logs.display": "Number of logs to display\u{26A1}",
+		"refresh": "Refresh\u{26A1}",
+		"from.1.to.1000": "from 1 to 1000\u{26A1}",
+		"show.logs": "Show Log Table\u{26A1}",
+		"please.choose.log.limit.date.range": "Please choose log limit and date range\u{26A1}",
+		"select.all": "Select All\u{26A1}"
 	}
 }
 

From 38b5bbb83696226add732c8cd4bb1c7a65a47d7b Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Tue, 12 Nov 2024 00:06:41 -0500
Subject: [PATCH 045/128] update UI for log msg page including pagination, show
 all button, new refresh button, new picking log msg UI

---
 .../app/components/admin/LogMsgComponent.tsx  | 308 ++++++++----------
 src/client/app/translations/data.ts           |  15 +-
 2 files changed, 140 insertions(+), 183 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index d2fef0c60..f132c7b52 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {
 	Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle,
-	FormGroup, Input, Label, Modal, ModalBody, ModalHeader, Table
+	FormGroup, Input, Label, Modal, ModalBody, ModalHeader, Pagination, PaginationItem, PaginationLink, Table
 } from 'reactstrap';
 import DateRangePicker from '@wojtekmaj/react-daterange-picker';
 import { useAppSelector } from '../../redux/reduxHooks';
@@ -22,9 +22,6 @@ export default function LogMsgComponent() {
 	const locale = useAppSelector(selectSelectedLanguage);
 	const [logs, setLogs] = React.useState(initialLogs);
 
-	// Button state to handle showing the log table
-	const [showLogTable, setShowLogTable] = React.useState(false);
-
 	const [selectedLogTypes, setSelectedLogTypes] = React.useState<string[]>(logTypes);
 	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
 	const [logDateRange, setLogDateRange] = React.useState<[Date | null, Date | null]>([null, null]);
@@ -40,6 +37,8 @@ export default function LogMsgComponent() {
 	const [modalOpen, setModalOpen] = React.useState(false);
 	const [modalLogMessage, setModalLogMessage] = React.useState('');
 
+	const [showAllLogs, setShowAllLogs] = React.useState(false);
+
 	// Open modal with the full log message
 	const handleLogMessageClick = (logMessage: string) => {
 		setModalLogMessage(logMessage);
@@ -96,6 +95,10 @@ export default function LogMsgComponent() {
 		setDropdownOpen(!dropdownOpen);
 	};
 
+	const handleShowAllLogs = () => {
+		setShowAllLogs(!showAllLogs);
+	};
+
 	// Filter logs based on selected log types and date range
 	const filteredLogs = logs.filter(log => {
 		const logDate = new Date(log.logTime);
@@ -108,7 +111,7 @@ export default function LogMsgComponent() {
 		return selectedLogTypes.includes(log.logType) && isWithinDateRange;
 	});
 
-	const paginatedLogs = filteredLogs.slice((currentPage - 1) * PER_PAGE, currentPage * PER_PAGE);
+	const paginatedLogs = showAllLogs ? filteredLogs : filteredLogs.slice((currentPage - 1) * PER_PAGE, currentPage * PER_PAGE);
 	const totalPages = Math.ceil(filteredLogs.length / PER_PAGE);
 
 	/**
@@ -125,7 +128,7 @@ export default function LogMsgComponent() {
 				const data = await logsApi.getLogsByDateRangeAndType(
 					logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedLogTypes, logLimit.toString());
 				setLogs(data);
-				setShowLogTable(true);
+				// setShowLogTable(true);
 				setCurrentPage(1);
 			} catch (error) {
 				console.error(error);
@@ -135,172 +138,127 @@ export default function LogMsgComponent() {
 
 	return (
 		<>
-			{showLogTable ?
-				(<>
-					<h1 style={titleStyle}>{translate('log.messages')}</h1>
-					<FormGroup check inline style={logFilterStyle}>
-						<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
-							<DropdownToggle caret>{translate('log.type')}</DropdownToggle>
-							<DropdownMenu>
-								<DropdownItem key='selectAll' toggle={false}>
-									<Label check>
-										<Input
-											type="checkbox"
-											checked={selectAll}
-											onChange={handleSelectAllChange}
-										/> {translate('select.all')}
-									</Label>
-								</DropdownItem>
-								{logTypes.map(logType => (
-									<DropdownItem key={logType} toggle={false}>
-										<Label check>
-											<Input
-												type="checkbox"
-												checked={selectedLogTypes.includes(logType)}
-												onChange={() => handleCheckboxChange(logType)}
-											/> {logType}
-										</Label>
-									</DropdownItem>
-								))}
-							</DropdownMenu>
-						</Dropdown>
-						<div style={{ display: 'flex', gap: '2.5%' }}>
-							<p style={labelStyle}>{translate('date.range')}</p>
-							<DateRangePicker
-								value={logDateRange}
-								onChange={handleDateRangeChange}
-								minDate={new Date(1970, 0, 1)}
-								maxDate={new Date()}
-								locale={locale} // Formats Dates, and Calendar months base on locale
-								calendarIcon={null}
-								calendarProps={{ defaultView: 'year' }} />
-						</div>
-						<FormGroup check>
-							<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
-								{translate('num.logs.display')}
+			<h1 style={titleStyle}>{translate('log.messages')}</h1>
+			<div style={logFilterStyle}>
+				<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
+					<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
+					<DropdownMenu>
+						<DropdownItem key='selectAll' toggle={false}>
+							<Label check>
+								<Input
+									type="checkbox"
+									checked={selectAll}
+									onChange={handleSelectAllChange}
+								/> {translate('select.all')}
 							</Label>
-							<Input
-								id="logLimit"
-								name="logLimit"
-								placeholder={translate('from.1.to.1000')}
-								type="number"
-								onChange={e => setLogLimit(e.target.valueAsNumber)}
-								invalid={logLimit < 1 || logLimit > 1000}
-							/>
-						</FormGroup>
-						<Button color='primary' onClick={handleShowLogTable}>{translate('refresh')}</Button>
-					</FormGroup>
-					<Table style={tableStyle} bordered hover>
-						<thead style={headerStyle}>
-							<tr>
-								<th>{translate('log.type')}</th>
-								<th>{translate('log.message')}</th>
-								<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>{translate('log.time')} {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
+						</DropdownItem>
+						{logTypes.map(logType => (
+							<DropdownItem key={logType} toggle={false}>
+								<Label check>
+									<Input
+										type="checkbox"
+										checked={selectedLogTypes.includes(logType)}
+										onChange={() => handleCheckboxChange(logType)}
+									/> {logType}
+								</Label>
+							</DropdownItem>
+						))}
+					</DropdownMenu>
+				</Dropdown>
+				<FormGroup style={{ padding: 0 }} check>
+					<Label for="dateRange" style={{ fontWeight: 'bold', margin: '0' }}>
+						{translate('date.range')}
+					</Label>
+					<DateRangePicker
+						id="dateRange"
+						value={logDateRange}
+						onChange={handleDateRangeChange}
+						minDate={new Date(1970, 0, 1)}
+						maxDate={new Date()}
+						locale={locale} // Formats Dates, and Calendar months base on locale
+						calendarIcon={null}
+						calendarProps={{ defaultView: 'year' }} />
+				</FormGroup>
+				<FormGroup style={{ padding: 0 }} check>
+					<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
+						{translate('num.logs.display')}
+					</Label>
+					<Input
+						id="logLimit"
+						name="logLimit"
+						placeholder={translate('from.1.to.1000')}
+						type="number"
+						onChange={e => setLogLimit(e.target.valueAsNumber)}
+						invalid={logLimit < 1 || logLimit > 1000}
+						value={logLimit}
+					/>
+				</FormGroup>
+				<Button color='primary' onClick={handleShowLogTable}>{translate('log.msg.update')}</Button>
+			</div>
+
+			{logs.length > 0 ?
+				<Table style={tableStyle} bordered hover>
+					<thead style={headerStyle}>
+						<tr>
+							<th>{translate('log.type')}</th>
+							<th>{translate('log.message')}</th>
+							<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>{translate('log.time')} {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
+						</tr>
+					</thead>
+					<tbody style={bodyStyle}>
+						{paginatedLogs.map((log, index) => (
+							<tr key={index + 1}>
+								<td>{log.logType}</td>
+								<td
+									style={{ cursor: 'pointer' }}
+									onClick={() => handleLogMessageClick(log.logMessage)}
+								>{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}</td>
+								<td>
+									{new Date(log.logTime).toLocaleString('en-US', {
+										year: 'numeric',
+										month: '2-digit',
+										day: '2-digit',
+										hour: '2-digit',
+										minute: '2-digit',
+										second: '2-digit',
+										fractionalSecondDigits: 2
+									})}
+								</td>
 							</tr>
-						</thead>
-						<tbody style={bodyStyle}>
-							{paginatedLogs.map((log, index) => (
-								<tr key={index + 1}>
-									<td>{log.logType}</td>
-									<td
-										style={{ cursor: 'pointer' }}
-										onClick={() => handleLogMessageClick(log.logMessage)}
-									>{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}</td>
-									<td>
-										{new Date(log.logTime).toLocaleString('en-US', {
-											year: 'numeric',
-											month: '2-digit',
-											day: '2-digit',
-											hour: '2-digit',
-											minute: '2-digit',
-											second: '2-digit',
-											fractionalSecondDigits: 2
-										})}
-									</td>
-								</tr>
-							))}
-						</tbody>
-					</Table>
-					<div style={{ textAlign: 'center', margin: '-1% auto 1% auto' }}>
-						{Array.from({ length: totalPages }, (_, index) => (
-							<Button
-								key={index + 1}
-								color={currentPage === index + 1 ? 'primary' : 'secondary'}
-								onClick={() => handlePageChange(index + 1)}
-								style={{ margin: '0 2px' }}
-							>
-								{index + 1}
-							</Button>
 						))}
-					</div>
-				</>)
+					</tbody>
+				</Table>
 				:
-				(<div className='container-fluid'>
-					<div className='d-inline-flex flex-column align-items-center justify-content-center w-100'>
-						<Alert style={{ textAlign: 'center' }}>{translate('please.choose.log.limit.date.range')}</Alert>
-						<div className='col-12 col-lg-6 border border-4 rounded p-4 vw-50'>
-							<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-								<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
-									<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
-									<DropdownMenu>
-										<DropdownItem key='selectAll' toggle={false}>
-											<Label check>
-												<Input
-													type="checkbox"
-													checked={selectAll}
-													onChange={handleSelectAllChange}
-												/>{translate('select.all')}
-											</Label>
-										</DropdownItem>
-										{logTypes.map(logType => (
-											<DropdownItem key={logType} toggle={false}>
-												<Label check>
-													<Input
-														type="checkbox"
-														checked={selectedLogTypes.includes(logType)}
-														onChange={() => handleCheckboxChange(logType)}
-													/> {logType}
-												</Label>
-											</DropdownItem>
-										))}
-									</DropdownMenu>
-								</Dropdown>
-								<FormGroup check>
-									<Label for='logDate' style={{ fontWeight: 'bold', margin: '0' }}>
-										{translate('date.range')}
-									</Label>
-									<DateRangePicker
-										id='logDate'
-										value={logDateRange}
-										onChange={handleDateRangeChange}
-										minDate={new Date(1970, 0, 1)}
-										maxDate={new Date()}
-										locale={locale} // Formats Dates, and Calendar months base on locale
-										calendarIcon={null}
-										calendarProps={{ defaultView: 'year' }}
-										required />
+				<Alert style={{ textAlign: 'center', margin: '2% 25% 25%' }}>{translate('no.logs')}</Alert>}
 
-								</FormGroup>
-								<FormGroup check>
-									<Label for="logLimit" style={{ fontWeight: 'bold', margin: '0' }}>
-										{translate('num.logs.display')}
-									</Label>
-									<Input
-										id="logLimit"
-										name="logLimit"
-										placeholder={translate('from.1.to.1000')}
-										type="number"
-										onChange={e => setLogLimit(e.target.valueAsNumber)}
-										required
-										invalid={logLimit < 1 || logLimit > 1000}
-									/>
-								</FormGroup>
-							</div>
-							<Button block color='primary' onClick={handleShowLogTable}>{translate('show.logs')}</Button>
-						</div>
-					</div>
-				</div >)
-			}
+			{!showAllLogs && logs.length !== 0 && <Pagination aria-label="Log pagination" style={{ justifyContent: 'center', margin: '1% auto' }}>
+				<>
+					<PaginationItem disabled={currentPage === 1}>
+						<PaginationLink first onClick={() => handlePageChange(1)} />
+					</PaginationItem><PaginationItem disabled={currentPage === 1}>
+						<PaginationLink previous onClick={() => handlePageChange(currentPage - 1)} />
+					</PaginationItem>
+
+					{Array.from({ length: totalPages }, (_, index) => (
+						<PaginationItem key={index + 1} active={currentPage === index + 1}>
+							<PaginationLink onClick={() => handlePageChange(index + 1)}>
+								{index + 1}
+							</PaginationLink>
+						</PaginationItem>
+					))}
+
+					<PaginationItem disabled={currentPage === totalPages}>
+						<PaginationLink next onClick={() => handlePageChange(currentPage + 1)} />
+					</PaginationItem><PaginationItem disabled={currentPage === totalPages}>
+						<PaginationLink last onClick={() => handlePageChange(totalPages)} />
+					</PaginationItem>
+				</>
+			</Pagination >}
+
+			{logs.length > 0 && !showAllLogs &&
+				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={handleShowAllLogs}>Show All Logs ({filteredLogs.length})</Button>}
+			{logs.length > 0 && showAllLogs &&
+				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={handleShowAllLogs}>Show in pages</Button>}
 
 			<Modal isOpen={modalOpen} toggle={() => setModalOpen(!modalOpen)} centered>
 				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>{translate('log.message')}</ModalHeader>
@@ -324,19 +282,15 @@ const titleStyle: React.CSSProperties = {
 
 const tableStyle: React.CSSProperties = {
 	width: '90%',
-	margin: '2.5% auto'
+	margin: '1% auto'
 };
 
 const logFilterStyle: React.CSSProperties = {
 	display: 'flex',
-	marginLeft: '9%',
+	justifyContent: 'center',
 	gap: '1%',
-	flexWrap: 'wrap',
-	alignItems: 'center'
-};
-
-const labelStyle: React.CSSProperties = {
-	fontWeight: 'bold',
-	marginRight: '-2.5%',
-	padding: 'none'
+	alignItems: 'center',
+	margin: 'auto 25%',
+	padding: '20px',
+	border: '2px solid lightgrey'
 };
\ No newline at end of file
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 2fc94cdf3..459ee5494 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -518,11 +518,12 @@ const LocaleTranslationData = {
 		"log.type": "Log Type",
 		"log.time": "Log Time",
 		"num.logs.display": "Number of logs to display",
-		"refresh": "Refresh",
+		"log.msg.update": "Update",
 		"from.1.to.1000": "from 1 to 1000",
 		"show.logs": "Show Log Table",
 		"please.choose.log.limit.date.range": "Please choose log limit and date range",
-		"select.all": "Select All"
+		"select.all": "Select All",
+		"no.logs": "No logs to display. Please select another data range or log type"
 	},
 	"fr": {
 		"3D": "3D",
@@ -1036,11 +1037,12 @@ const LocaleTranslationData = {
 		"log.type": "Log Type\u{26A1}",
 		"log.time": "Log Time\u{26A1}",
 		"num.logs.display": "Number of logs to display\u{26A1}",
-		"refresh": "Refresh\u{26A1}",
+		"log.msg.update": "Update\u{26A1}",
 		"from.1.to.1000": "from 1 to 1000\u{26A1}",
 		"show.logs": "Show Log Table\u{26A1}",
 		"please.choose.log.limit.date.range": "Please choose log limit and date range\u{26A1}",
-		"select.all": "Select All\u{26A1}"
+		"select.all": "Select All\u{26A1}",
+		"no.logs": "No logs to display. Please select another data range or log type\u{26A1}"
 	},
 	"es": {
 		"3D": "3D",
@@ -1555,11 +1557,12 @@ const LocaleTranslationData = {
 		"log.type": "Log Type\u{26A1}",
 		"log.time": "Log Time\u{26A1}",
 		"num.logs.display": "Number of logs to display\u{26A1}",
-		"refresh": "Refresh\u{26A1}",
+		"log.msg.update": "Update\u{26A1}",
 		"from.1.to.1000": "from 1 to 1000\u{26A1}",
 		"show.logs": "Show Log Table\u{26A1}",
 		"please.choose.log.limit.date.range": "Please choose log limit and date range\u{26A1}",
-		"select.all": "Select All\u{26A1}"
+		"select.all": "Select All\u{26A1}",
+		"no.logs": "No logs to display. Please select another data range or log type\u{26A1}"
 	}
 }
 

From 5a15a0243d821c18218101e93b155ba6d31ce812 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Tue, 12 Nov 2024 00:56:18 -0500
Subject: [PATCH 046/128] bring back log type filter for table and update log
 type downdrop for fetching data

---
 .../app/components/admin/LogMsgComponent.tsx  | 93 ++++++++++++++-----
 1 file changed, 72 insertions(+), 21 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index f132c7b52..d31c890c8 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -22,11 +22,13 @@ export default function LogMsgComponent() {
 	const locale = useAppSelector(selectSelectedLanguage);
 	const [logs, setLogs] = React.useState(initialLogs);
 
-	const [selectedLogTypes, setSelectedLogTypes] = React.useState<string[]>(logTypes);
+	const [selectedTableLogTypes, setSelectedTableLogTypes] = React.useState<string[]>(logTypes);
+	const [selectedUpdateLogTypes, setSelectedUpdateLogTypes] = React.useState<string[]>(logTypes);
 	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
 	const [logDateRange, setLogDateRange] = React.useState<[Date | null, Date | null]>([null, null]);
 	// Dropdown open state for log type in the header
-	const [dropdownOpen, setDropdownOpen] = React.useState(false);
+	const [typeTableDropdown, setTypeTableDropdown] = React.useState(false);
+	const [updateLogDropdown, setUpdateLogDropdown] = React.useState(false);
 
 	// number of log messages to display
 	const [logLimit, setLogLimit] = React.useState(0);
@@ -46,22 +48,41 @@ export default function LogMsgComponent() {
 	};
 
 	// Handle checkbox change
-	const handleCheckboxChange = (logType: string) => {
-		if (selectedLogTypes.includes(logType)) {
+	const handleTableCheckboxChange = (logType: string) => {
+		if (selectedTableLogTypes.includes(logType)) {
 			// Remove log type if already selected
-			setSelectedLogTypes(selectedLogTypes.filter(type => type !== logType));
+			setSelectedTableLogTypes(selectedTableLogTypes.filter(type => type !== logType));
 		} else {
 			// Add log type if not selected
-			setSelectedLogTypes([...selectedLogTypes, logType]);
+			setSelectedTableLogTypes([...selectedTableLogTypes, logType]);
+		}
+	};
+
+	const handleUpdateCheckboxChange = (logType: string) => {
+		if (selectedUpdateLogTypes.includes(logType)) {
+			// Remove log type if already selected
+			setSelectedUpdateLogTypes(selectedUpdateLogTypes.filter(type => type !== logType));
+		} else {
+			// Add log type if not selected
+			setSelectedUpdateLogTypes([...selectedUpdateLogTypes, logType]);
 		}
 	};
 
 	// Handle "Select All" checkbox change
-	const handleSelectAllChange = () => {
+	const handleTableSelectAll = () => {
 		if (selectAll) {
-			setSelectedLogTypes([]);
+			setSelectedTableLogTypes([]);
 		} else {
-			setSelectedLogTypes(logTypes);
+			setSelectedTableLogTypes(logTypes);
+		}
+		setSelectAll(!selectAll);
+	};
+
+	const handleUpdateSelectAll = () => {
+		if (selectAll) {
+			setSelectedUpdateLogTypes([]);
+		} else {
+			setSelectedUpdateLogTypes(logTypes);
 		}
 		setSelectAll(!selectAll);
 	};
@@ -91,8 +112,12 @@ export default function LogMsgComponent() {
 	};
 
 	// Toggle dropdown in the header
-	const onToggleDropdown = () => {
-		setDropdownOpen(!dropdownOpen);
+	const toggleTypeTable = () => {
+		setTypeTableDropdown(!typeTableDropdown);
+	};
+
+	const toggleUpdateLog = () => {
+		setUpdateLogDropdown(!updateLogDropdown);
 	};
 
 	const handleShowAllLogs = () => {
@@ -108,7 +133,7 @@ export default function LogMsgComponent() {
 			(!logDateRange || !logDateRange[0] || logDate >= logDateRange[0]) &&
 			(!logDateRange || !logDateRange[1] || logDate <= logDateRange[1]);
 
-		return selectedLogTypes.includes(log.logType) && isWithinDateRange;
+		return selectedTableLogTypes.includes(log.logType) && isWithinDateRange;
 	});
 
 	const paginatedLogs = showAllLogs ? filteredLogs : filteredLogs.slice((currentPage - 1) * PER_PAGE, currentPage * PER_PAGE);
@@ -126,9 +151,8 @@ export default function LogMsgComponent() {
 			try {
 				// get log by date and type
 				const data = await logsApi.getLogsByDateRangeAndType(
-					logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedLogTypes, logLimit.toString());
+					logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedUpdateLogTypes, logLimit.toString());
 				setLogs(data);
-				// setShowLogTable(true);
 				setCurrentPage(1);
 			} catch (error) {
 				console.error(error);
@@ -140,7 +164,7 @@ export default function LogMsgComponent() {
 		<>
 			<h1 style={titleStyle}>{translate('log.messages')}</h1>
 			<div style={logFilterStyle}>
-				<Dropdown isOpen={dropdownOpen} toggle={onToggleDropdown}>
+				<Dropdown isOpen={updateLogDropdown} toggle={toggleUpdateLog}>
 					<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
 					<DropdownMenu>
 						<DropdownItem key='selectAll' toggle={false}>
@@ -148,7 +172,7 @@ export default function LogMsgComponent() {
 								<Input
 									type="checkbox"
 									checked={selectAll}
-									onChange={handleSelectAllChange}
+									onChange={handleUpdateSelectAll}
 								/> {translate('select.all')}
 							</Label>
 						</DropdownItem>
@@ -157,8 +181,8 @@ export default function LogMsgComponent() {
 								<Label check>
 									<Input
 										type="checkbox"
-										checked={selectedLogTypes.includes(logType)}
-										onChange={() => handleCheckboxChange(logType)}
+										checked={selectedUpdateLogTypes.includes(logType)}
+										onChange={() => handleUpdateCheckboxChange(logType)}
 									/> {logType}
 								</Label>
 							</DropdownItem>
@@ -200,7 +224,33 @@ export default function LogMsgComponent() {
 				<Table style={tableStyle} bordered hover>
 					<thead style={headerStyle}>
 						<tr>
-							<th>{translate('log.type')}</th>
+							<th>
+								<Dropdown isOpen={typeTableDropdown} toggle={toggleTypeTable}>
+									<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
+									<DropdownMenu>
+										<DropdownItem key='selectAll' toggle={false}>
+											<Label check>
+												<Input
+													type="checkbox"
+													checked={selectAll}
+													onChange={handleTableSelectAll}
+												/> {translate('select.all')}
+											</Label>
+										</DropdownItem>
+										{logTypes.map(logType => (
+											<DropdownItem key={logType} toggle={false}>
+												<Label check>
+													<Input
+														type="checkbox"
+														checked={selectedTableLogTypes.includes(logType)}
+														onChange={() => handleTableCheckboxChange(logType)}
+													/> {logType}
+												</Label>
+											</DropdownItem>
+										))}
+									</DropdownMenu>
+								</Dropdown>
+							</th>
 							<th>{translate('log.message')}</th>
 							<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>{translate('log.time')} {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
 						</tr>
@@ -229,7 +279,8 @@ export default function LogMsgComponent() {
 					</tbody>
 				</Table>
 				:
-				<Alert style={{ textAlign: 'center', margin: '2% 25% 25%' }}>{translate('no.logs')}</Alert>}
+				<Alert style={{ textAlign: 'center', margin: '2% 25% 25%' }}>{translate('no.logs')}</Alert>
+			}
 
 			{!showAllLogs && logs.length !== 0 && <Pagination aria-label="Log pagination" style={{ justifyContent: 'center', margin: '1% auto' }}>
 				<>
@@ -288,7 +339,7 @@ const tableStyle: React.CSSProperties = {
 const logFilterStyle: React.CSSProperties = {
 	display: 'flex',
 	justifyContent: 'center',
-	gap: '1%',
+	gap: '1.5%',
 	alignItems: 'center',
 	margin: 'auto 25%',
 	padding: '20px',

From cb8af66b6f571bf9a75c98fbe727d911f4c77870 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:40:30 -0500
Subject: [PATCH 047/128] dom package

---
 package-lock.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 29a99bf36..c39434628 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1633,14 +1633,6 @@
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
-		"node_modules/add-dom-event-listener": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
-			"integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
-			"dependencies": {
-				"object-assign": "4.x"
-			}
-		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",

From d3605ebb0867eb9aeaf052bb225f8b46ff7afe23 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Wed, 13 Nov 2024 14:34:35 -0500
Subject: [PATCH 048/128] updated toggle.options in data.ts and utilized
 useTranslate()

---
 src/client/app/components/BarChartComponent.tsx    |  6 ++++--
 src/client/app/components/ChartSelectComponent.tsx |  3 ++-
 src/client/app/components/LineChartComponent.tsx   |  6 ++++--
 src/client/app/components/RadarChartComponent.tsx  |  6 ++++--
 src/client/app/components/ThreeDComponent.tsx      | 10 ++++++----
 src/client/app/containers/CompareChartContainer.ts |  5 +++--
 src/client/app/translations/data.ts                |  6 +++---
 7 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index 0d0f391cb..22d323fae 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -18,8 +18,8 @@ import { selectBarUnitLabel, selectIsRaw } from '../redux/selectors/plotlyDataSe
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
 import { selectBarStacking } from '../redux/slices/graphSlice';
 import Locales from '../types/locales';
-import translate from '../utils/translate';
 import SpinnerComponent from './SpinnerComponent';
+import { useTranslate } from 'redux/componentHooks';
 
 /**
  * Passes the current redux state of the barchart, and turns it into props for the React
@@ -64,6 +64,8 @@ export default function BarChartComponent() {
 	// useQueryHooks for data fetching
 	const datasets: Partial<Plotly.PlotData>[] = meterReadings.concat(groupData);
 
+	const translate = useTranslate();
+
 	if (meterIsFetching || groupIsFetching) {
 		return <SpinnerComponent loading height={50} width={50} />;
 	}
@@ -112,7 +114,7 @@ export default function BarChartComponent() {
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
 						name: 'toggle-options',
-						title: translate('toggle option'),
+						title: translate('toggle.options'),
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/ChartSelectComponent.tsx b/src/client/app/components/ChartSelectComponent.tsx
index 9625734ae..de47867ca 100644
--- a/src/client/app/components/ChartSelectComponent.tsx
+++ b/src/client/app/components/ChartSelectComponent.tsx
@@ -13,7 +13,7 @@ import { graphSlice, selectChartToRender } from '../redux/slices/graphSlice';
 import { SelectOption } from '../types/items';
 import { ChartTypes } from '../types/redux/graph';
 import { State } from '../types/redux/state';
-import translate from '../utils/translate';
+import { useTranslate } from 'redux/componentHooks';
 import TooltipMarkerComponent from './TooltipMarkerComponent';
 
 /**
@@ -21,6 +21,7 @@ import TooltipMarkerComponent from './TooltipMarkerComponent';
  * @returns Chart select element
  */
 export default function ChartSelectComponent() {
+	const translate = useTranslate();
 	const currentChartToRender = useAppSelector(selectChartToRender);
 	const dispatch = useAppDispatch();
 	const [expand, setExpand] = useState(false);
diff --git a/src/client/app/components/LineChartComponent.tsx b/src/client/app/components/LineChartComponent.tsx
index 2385f80dc..2aeed6dd2 100644
--- a/src/client/app/components/LineChartComponent.tsx
+++ b/src/client/app/components/LineChartComponent.tsx
@@ -17,7 +17,7 @@ import { selectLineChartDeps, selectPlotlyGroupData, selectPlotlyMeterData } fro
 import { selectLineUnitLabel } from '../redux/selectors/plotlyDataSelectors';
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
 import Locales from '../types/locales';
-import translate from '../utils/translate';
+import { useTranslate } from 'redux/componentHooks';
 import SpinnerComponent from './SpinnerComponent';
 
 
@@ -57,6 +57,8 @@ export default function LineChartComponent() {
 	// Use Query Data to derive plotly datasets memoized selector
 	const unitLabel = useAppSelector(selectLineUnitLabel);
 
+	const translate = useTranslate();
+
 	// Display Plotly Buttons Feature
 	// The number of items in defaultButtons and advancedButtons must differ as discussed below
 	const defaultButtons: Plotly.ModeBarDefaultButtons[] = ['zoom2d', 'pan2d', 'select2d', 'lasso2d', 'zoomIn2d',
@@ -99,7 +101,7 @@ export default function LineChartComponent() {
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
 						name: 'toggle-options',
-						title: translate('toggle option'),
+						title: translate('toggle.options'),
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index d01241a26..9779ffa57 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -23,7 +23,7 @@ import Locales from '../types/locales';
 import { AreaUnitType, getAreaUnitConversion } from '../utils/getAreaUnitConversion';
 import getGraphColor from '../utils/getGraphColor';
 import { lineUnitLabel } from '../utils/graphics';
-import translate from '../utils/translate';
+import { useTranslate } from 'redux/componentHooks';
 import SpinnerComponent from './SpinnerComponent';
 
 /**
@@ -46,6 +46,8 @@ export default function RadarChartComponent() {
 	const selectedGroups = useAppSelector(selectSelectedGroups);
 	const meterDataById = useAppSelector(selectMeterDataById);
 	const groupDataById = useAppSelector(selectGroupDataById);
+	
+	const translate = useTranslate();
 
 	if (meterIsLoading || groupIsLoading) {
 		return <SpinnerComponent loading width={50} height={50} />;
@@ -340,7 +342,7 @@ export default function RadarChartComponent() {
 					modeBarButtonsToRemove: listOfButtons,
 					modeBarButtonsToAdd: [{
 						name: 'toggle-options',
-						title: translate('toggle option'),
+						title: translate('toggle.options'),
 						icon: Icons.pencil,
 						click: function () {
 							// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/components/ThreeDComponent.tsx b/src/client/app/components/ThreeDComponent.tsx
index b5f185640..358e34ade 100644
--- a/src/client/app/components/ThreeDComponent.tsx
+++ b/src/client/app/components/ThreeDComponent.tsx
@@ -20,7 +20,7 @@ import { UnitDataById } from '../types/redux/units';
 import { isValidThreeDInterval, roundTimeIntervalForFetch } from '../utils/dateRangeCompatibility';
 import { AreaUnitType, getAreaUnitConversion } from '../utils/getAreaUnitConversion';
 import { lineUnitLabel } from '../utils/graphics';
-import translate from '../utils/translate';
+import { useTranslate } from 'redux/componentHooks';
 import SpinnerComponent from './SpinnerComponent';
 import ThreeDPillComponent from './ThreeDPillComponent';
 import Plot from 'react-plotly.js';
@@ -41,8 +41,7 @@ export default function ThreeDComponent() {
 	const graphState = useAppSelector(selectGraphState);
 	const locale = useAppSelector(selectSelectedLanguage);
 	const { meterOrGroupID, meterOrGroupName, isAreaCompatible } = useAppSelector(selectThreeDComponentInfo);
-
-
+	const translate = useTranslate();
 	// Initialize Default values
 	const threeDData = data;
 	let layout = {};
@@ -92,7 +91,7 @@ export default function ThreeDComponent() {
 						modeBarButtonsToRemove: listOfButtons,
 						modeBarButtonsToAdd: [{
 							name: 'more-options',
-							title: translate('toggle option'),
+							title: translate('toggle.options'),
 							icon: Icons.pencil,
 							click: function () {
 								// # of items must differ so the length can tell which list of buttons is being set
@@ -128,6 +127,8 @@ function formatThreeDData(
 	graphState: GraphState,
 	unitDataById: UnitDataById
 ) {
+	const translate = useTranslate();
+
 	// Initialize Plotly Data
 	const xDataToRender: string[] = [];
 	const yDataToRender: string[] = [];
@@ -250,6 +251,7 @@ function setThreeDLayout(zLabelText: string = 'Resource Usage', yDataToRender: s
 	const dataMin = Math.min(...dateObjects.map(date => date.getTime()));
 	const dataMax = Math.max(...dateObjects.map(date => date.getTime()));
 	const dataRange = dataMax - dataMin;
+	const translate = useTranslate();
 
 	//Calculate nTicks for small num of days on y-axis; possibly a better way
 	let nTicks, dTick = 'd1';
diff --git a/src/client/app/containers/CompareChartContainer.ts b/src/client/app/containers/CompareChartContainer.ts
index 945c8206d..525fcbe65 100644
--- a/src/client/app/containers/CompareChartContainer.ts
+++ b/src/client/app/containers/CompareChartContainer.ts
@@ -6,7 +6,7 @@
 
 import { connect } from 'react-redux';
 import { getComparePeriodLabels, getCompareChangeSummary, calculateCompareShift } from '../utils/calculateCompare';
-import translate from '../utils/translate';
+import { useTranslate } from 'redux/componentHooks';
 // import * as React from 'react'; Convert from containers to components
 // import { useState } from 'react';
 import Plot from 'react-plotly.js';
@@ -63,6 +63,7 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 	const groupDataById = selectGroupDataById(state);
 	const selectUnitState = unitDataById[graphingUnit];
 	const locale = selectSelectedLanguage(state);
+	const translate = useTranslate();
 	let unitLabel: string = '';
 	// If graphingUnit is -99 then none selected and nothing to graph so label is empty.
 	// This will probably happen when the page is first loaded.
@@ -251,7 +252,7 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 			// modeBarButtonsToRemove: listOfButtons,
 			// modeBarButtonsToAdd: [{
 			// 	name: 'toggle-options',
-			// 	title: translate('Toggle Option'),
+			// 	title: translate('toggle.options'),
 			// 	icon: Icons.pencil,
 			// 	click: function () {
 			// 		// # of items must differ so the length can tell which list of buttons is being set
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 1da3206cf..75c9e7c09 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -442,7 +442,7 @@ const LocaleTranslationData = {
 		"TimeSortTypes.meter": "meter value or default",
 		"today": "Today",
 		"toggle.link": "Toggle chart link",
-		"Toggle Option" : "Toggle Option",
+		"toggle.options" : "Toggle options",
 		"total": "total",
 		"true": "True",
 		"TrueFalseType.false": "no",
@@ -951,7 +951,7 @@ const LocaleTranslationData = {
 		"TimeSortTypes.meter": "valeur du compteur ou valeur par défaut",
 		"today": "Aujourd'hui",
 		"toggle.link": "Bascule du lien du diagramme",
-		"Toggle Option" : "Option de bascule",
+		"toggle.options" : "Basculer les options",
 		"total": "total",
 		"true": "Vrai",
 		"TrueFalseType.false": "no\u{26A1}",
@@ -1461,7 +1461,7 @@ const LocaleTranslationData = {
 		"TimeSortTypes.meter": "valor del medidor o predeterminado",
 		"today": "Hoy",
 		"toggle.link": "Alternar enlace de gráfico",
-		"Toggle Option" : "Opción de alternar",
+		"toggle.options" : "Alternar opciones",
 		"total": "total",
 		"true": "Verdad",
 		"TrueFalseType.false": "no",

From 9929eda495d3713847add30314b338d30bb1514a Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Fri, 15 Nov 2024 00:27:50 -0500
Subject: [PATCH 049/128] update so that instead of making 4 requests for 4
 types, logTypes is now being sent as array for fetching, add logLimit for
 fetching, validation

---
 src/client/app/utils/api/LogsApi.ts           | 17 ++-----
 src/server/log.js                             | 51 ++++++++++++++-----
 src/server/models/LogMsg.js                   | 10 ++--
 src/server/routes/logs.js                     | 34 ++++---------
 .../logmsg/get_logs_from_dates_and_type.sql   |  5 +-
 5 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/client/app/utils/api/LogsApi.ts b/src/client/app/utils/api/LogsApi.ts
index 96ed0e919..48e64168e 100644
--- a/src/client/app/utils/api/LogsApi.ts
+++ b/src/client/app/utils/api/LogsApi.ts
@@ -26,19 +26,10 @@ export default class LogsApi {
 		return await this.backend.doPostRequest('/api/logs/error', log);
 	}
 
-	// fetch all logs
-	public async getAllLogs(): Promise<LogData[]> {
-		return await this.backend.doGetRequest('/api/logs/logsmsg');
-	}
-
-	public async getLogsByDateRangeAndType(startDate: string, endDate: string, types: string[]): Promise<LogData[]> {
-		const requests = types.map(
-			type => this.backend.doGetRequest('/api/logs/logsmsg/getLogsByDateRangeAndType',
-				{ startDate: startDate, endDate: endDate, logType: type })
-		);
-		const results = await Promise.all(requests);
-
-		return results.flat() as LogData[];
+	public async getLogsByDateRangeAndType(startDate: string, endDate: string, logTypes: string[], logLimit: string): Promise<LogData[]> {
+		const request = await this.backend.doGetRequest('/api/logs/logsmsg/getLogsByDateRangeAndType',
+			{ startDate: startDate, endDate: endDate, logTypes: logTypes.join('-'), logLimit: logLimit });
+		return request as LogData[];
 	}
 
 }
diff --git a/src/server/log.js b/src/server/log.js
index e55495479..9f41f1cb3 100644
--- a/src/server/log.js
+++ b/src/server/log.js
@@ -51,7 +51,8 @@ class Logger {
 	 * @param {boolean?} skipMail Don't e-mail this message even if we would normally emit an e-mail for this level.
 	 */
 	log(level, message, error = null, skipMail = false) {
-		let messageToLog = `[${level.name}@${moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ')}] ${message}\n`;
+		let logTime = moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+		let messageToLog = `[${level.name}@${logTime}] ${message}\n`;
 
 		const conn = getConnection();
 
@@ -78,19 +79,43 @@ class Logger {
 				}
 			});
 
+			// NOTE: for running the first time, uncomment the following code block to write all current logs to the database
+			// after that you can comment out it to write only new logs to the database
+			// TODO: This should be fix later to check whehter it should write new logs or all logs to the database when running
+			// fs.readFile(logFile, 'utf8', async (err, data) => {
+			// 	if (err) {
+			// 		console.error(`Failed to read log file: ${err} (${err.stack})`);
+			// 		return;
+			// 	}
+
+			// 	const logEntries = data.split('\n').filter(entry => entry.trim() !== '');
+			// 	for (const entry of logEntries) {
+			// 		const logParts = entry.match(/\[(.*?)@(.*?)\] (.*)/);
+			// 		if (logParts) {
+			// 			const [, logType, logTime, logMessage] = logParts;
+			// 			const logMsg = new LogMsg(logType, logMessage, new Date(logTime));
+			// 			try {
+			// 				await logMsg.insert(conn);
+			// 			} catch (err) {
+			// 				console.error(`Failed to write log to database: ${err} (${err.stack})`);
+			// 			}
+			// 		}
+			// 	}
+			// })
+
+
+			// Comment out the following code block when running the first time to write all logs to the database
+			// then uncomment it to write only new logs to the database later
 			// Write the new log to the database
-			const logMsgPatern = messageToLog.match(/\[(.*?)@(.*?)\] (.*)/);
-			if (logMsgPatern) {
-				const [, logType, logTime, logMessage] = logMsgPatern;
-				const logMsg = new LogMsg(logType, logMessage, new Date(logTime));
-				(async () => {
-					try {
-						await logMsg.insert(conn);
-					} catch (err) {
-						console.error(`Failed to write log to database: ${err} (${err.stack})`);
-					}
-				})();
-			}
+			const logMsg = new LogMsg(level.name, message, new Date(logTime));
+			(async () => {
+				try {
+					await logMsg.insert(conn);
+				} catch (err) {
+					console.error(`Failed to write log to database: ${err} (${err.stack})`);
+				}
+			})();
+
 		}
 
 		// Only log elsewhere if given a high enough priority level.
diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
index b8f23e6d7..9de056a51 100644
--- a/src/server/models/LogMsg.js
+++ b/src/server/models/LogMsg.js
@@ -109,18 +109,20 @@ class LogMsg {
 	 * If no endDate is specified, all logs after the startDate are returned.
 	 * @param {Date} startDate
 	 * @param {Date} endDate
-	 * @param logType
+	 * @param {Array<string>} logTypes
+	 * @param {Number} logLimit
 	 * @param conn is the connection to use.
 	 * @returns {Promise.<array.<LogMsg>>}
 	 */
-	static async getLogsByDateRangeAndType(startDate, endDate, logType, conn) {
+	static async getLogsByDateRangeAndType(startDate, endDate, logTypes, logLimit = 100, conn) {
 		const rows = await conn.any(sqlFile('logmsg/get_logs_from_dates_and_type.sql'), {
 			startDate: startDate,
 			endDate: endDate,
-			logType: logType
+			logTypes: logTypes,
+			logLimit: logLimit
 		});
-		return rows.map(LogMsg.mapRow);
 
+		return rows.map(LogMsg.mapRow);
 	}
 }
 module.exports = LogMsg;
\ No newline at end of file
diff --git a/src/server/routes/logs.js b/src/server/routes/logs.js
index 50c49416d..28e6a4a85 100644
--- a/src/server/routes/logs.js
+++ b/src/server/routes/logs.js
@@ -27,7 +27,7 @@ const validLog = {
 
 const validLogMsg = {
 	type: 'object',
-	required: ['startDate', 'endDate', 'logType'],
+	required: ['startDate', 'endDate', 'logTypes', 'logLimit'],
 	properties: {
 		startDate: {
 			type: 'string',
@@ -37,19 +37,15 @@ const validLogMsg = {
 			type: 'string',
 			format: 'date-time'
 		},
-		logType: {
+		logTypes: {
 			type: 'string',
-			enum: ['INFO', 'WARN', 'ERROR', 'SILENT']
+			pattern: '^(INFO|WARN|ERROR|SILENT)(-(INFO|WARN|ERROR|SILENT))*$'
+		},
+		logLimit: {
+			type: 'string',
+			// as logLimit is being sent as string, using pattern to validate it represents a number from 1 to 1000
+			pattern: '^(?:[1-9][0-9]{0,2}|1000)$'
 		},
-
-		// use this if later database is changed to be able to deal with logType as a list
-		// logType: {
-		// 	type: 'array',
-		// 	items: {
-		// 		type: 'string',
-		// 		enum: ['INFO', 'WARN', 'ERROR', 'SILENT']
-		// 	}
-		// }
 	}
 }
 router.post('/info', async (req, res) => {
@@ -86,17 +82,6 @@ router.post('/error', async (req, res) => {
 });
 
 
-// router.get('/logsmsg', async (req, res) => {
-// 	const conn = getConnection();
-// 	try {
-// 		const rows = await LogMsg.getAll(conn);
-// 		res.json(rows);
-// 	} catch (err) {
-// 		console.error(`Failed to fetch in getAll: ${err}`);
-// 		res.sendStatus(500);
-// 	}
-// });
-
 router.get('/logsmsg/getLogsByDateRangeAndType', async (req, res) => {
 	const validationResult = validate(req.query, validLogMsg);
 	if (!validationResult.valid) {
@@ -104,7 +89,8 @@ router.get('/logsmsg/getLogsByDateRangeAndType', async (req, res) => {
 	} else {
 		const conn = getConnection();
 		try {
-			const rows = await LogMsg.getLogsByDateRangeAndType(req.query.startDate, req.query.endDate, req.query.logType, conn);
+			const logLimit = parseInt(req.query.logLimit);
+			const rows = await LogMsg.getLogsByDateRangeAndType(req.query.startDate, req.query.endDate, req.query.logTypes.split('-'), logLimit, conn);
 			res.json(rows);
 		} catch (err) {
 			console.error(`Failed to fetch logs filter by date range and type: ${err}`);
diff --git a/src/server/sql/logmsg/get_logs_from_dates_and_type.sql b/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
index 48450804a..42f6806d3 100644
--- a/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
+++ b/src/server/sql/logmsg/get_logs_from_dates_and_type.sql
@@ -6,7 +6,8 @@
 SELECT 
 	log_type, log_message, log_time
 FROM logmsg 
-WHERE log_type = ${logType}
+WHERE log_type = ANY (${logTypes}::log_msg_type[])
 	AND log_time >= COALESCE(${startDate}, '-infinity'::TIMESTAMP)
 	AND log_time <= COALESCE(${endDate}, 'infinity'::TIMESTAMP)
-ORDER BY log_time ASC;
\ No newline at end of file
+ORDER BY log_time ASC
+LIMIT ${logLimit};
\ No newline at end of file

From 43b51fbe2a086382452ad54a8d1d367540d3e86f Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Fri, 15 Nov 2024 09:58:33 -0500
Subject: [PATCH 050/128] fix some comments from origin draft pull request

---
 src/server/models/LogMsg.js | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
index 9de056a51..67c1efca9 100644
--- a/src/server/models/LogMsg.js
+++ b/src/server/models/LogMsg.js
@@ -3,20 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const database = require('./database');
-const { mapToObject, threeDHoleAlgorithm } = require('../util');
-const determineMaxPoints = require('../util/determineMaxPoints');
-const log = require('../log');
-const { isReadonlyKeywordOrPlusOrMinusToken } = require('typescript');
-const LogEmail = require('./LogEmail');
-
 const sqlFile = database.sqlFile;
 
 class LogMsg {
 	/**
 	 * Creates a new log
-	 * @param logType
-	 * @param logMessage
-	 * @param {Moment} logTime
+	 * @param logType log type. Have to be INFO, WARN, ERROR, or SILENT
+	 * @param logMessage log information
+	 * @param {Moment} logTime the date and time of the log
 	 */
 	constructor(logType, logMessage, logTime) {
 		this.logType = logType;
@@ -105,12 +99,10 @@ class LogMsg {
 
 	/**
 	 * Returns a promise to get all of the logs in between two dates.
-	 * If no startDate is specified, all logs before the endDate are returned.
-	 * If no endDate is specified, all logs after the startDate are returned.
-	 * @param {Date} startDate
-	 * @param {Date} endDate
-	 * @param {Array<string>} logTypes
-	 * @param {Number} logLimit
+	 * @param {Date} startDate start date of the range to get logs
+	 * @param {Date} endDate end date of the range to get logs
+	 * @param {Array<string>} logTypes array of log types to get logs
+	 * @param {Number} logLimit the maximum number of logs to return
 	 * @param conn is the connection to use.
 	 * @returns {Promise.<array.<LogMsg>>}
 	 */

From a47e0bf03bb8ee8507989efbaa05253e172455fe Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Fri, 15 Nov 2024 10:03:13 -0500
Subject: [PATCH 051/128] add comments for LogMsgComponent

---
 .../app/components/admin/LogMsgComponent.tsx  | 98 ++++++++++---------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index d31c890c8..a77bc825b 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -1,3 +1,8 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 import * as React from 'react';
 import {
 	Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle,
@@ -10,8 +15,11 @@ import { showWarnNotification } from '../../utils/notifications';
 import { logsApi } from '../../utils/api';
 import translate from '../../utils/translate';
 
+// number of log messages to display per page
 const PER_PAGE = 20;
+// initialize log message array to hold log messages
 const initialLogs: any[] = [];
+// log types for filtering
 const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
 
 /**
@@ -20,25 +28,32 @@ const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
  */
 export default function LogMsgComponent() {
 	const locale = useAppSelector(selectSelectedLanguage);
-	const [logs, setLogs] = React.useState(initialLogs);
 
-	const [selectedTableLogTypes, setSelectedTableLogTypes] = React.useState<string[]>(logTypes);
+	// Log messages state
+	const [logs, setLogs] = React.useState(initialLogs);
+	// Selected log types for filtering in the update log
 	const [selectedUpdateLogTypes, setSelectedUpdateLogTypes] = React.useState<string[]>(logTypes);
-	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
-	const [logDateRange, setLogDateRange] = React.useState<[Date | null, Date | null]>([null, null]);
-	// Dropdown open state for log type in the header
+	// Dropdown open state for log type in the header for filtering
 	const [typeTableDropdown, setTypeTableDropdown] = React.useState(false);
+	// Selected log types for filtering in the table
+	const [selectedTableLogTypes, setSelectedTableLogTypes] = React.useState<string[]>(logTypes);
+	// Dropdown open state for log type in the table for filtering
 	const [updateLogDropdown, setUpdateLogDropdown] = React.useState(false);
-
-	// number of log messages to display
+	// Sort order for date column in the table
+	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
+	// Log messages date range state
+	const [logDateRange, setLogDateRange] = React.useState<[Date | null, Date | null]>([null, null]);
+	// Number of log messages to display
 	const [logLimit, setLogLimit] = React.useState(0);
+	// "Select All Logs" button state
 	const [selectAll, setSelectAll] = React.useState(true);
-
+	// Current page state for pagination
 	const [currentPage, setCurrentPage] = React.useState(1);
-
+	// Modal state for displaying full log message
 	const [modalOpen, setModalOpen] = React.useState(false);
+	// Full log message to display in the modal
 	const [modalLogMessage, setModalLogMessage] = React.useState('');
-
+	// Showing all logs instead of paginated
 	const [showAllLogs, setShowAllLogs] = React.useState(false);
 
 	// Open modal with the full log message
@@ -47,46 +62,34 @@ export default function LogMsgComponent() {
 		setModalOpen(true);
 	};
 
-	// Handle checkbox change
+	// Handle checkbox change for log type in the table
 	const handleTableCheckboxChange = (logType: string) => {
-		if (selectedTableLogTypes.includes(logType)) {
-			// Remove log type if already selected
+		if (selectedTableLogTypes.includes(logType)) { // Remove log type if already selected
 			setSelectedTableLogTypes(selectedTableLogTypes.filter(type => type !== logType));
-		} else {
-			// Add log type if not selected
+		} else { // Add log type if not selected
 			setSelectedTableLogTypes([...selectedTableLogTypes, logType]);
 		}
 	};
-
+	// Handle checkbox change for log type in the update log
 	const handleUpdateCheckboxChange = (logType: string) => {
-		if (selectedUpdateLogTypes.includes(logType)) {
-			// Remove log type if already selected
+		if (selectedUpdateLogTypes.includes(logType)) {  // Remove log type if already selected
 			setSelectedUpdateLogTypes(selectedUpdateLogTypes.filter(type => type !== logType));
-		} else {
-			// Add log type if not selected
+		} else { // Add log type if not selected
 			setSelectedUpdateLogTypes([...selectedUpdateLogTypes, logType]);
 		}
 	};
 
-	// Handle "Select All" checkbox change
+	// Handle "Select All" checkbox change in the table
 	const handleTableSelectAll = () => {
-		if (selectAll) {
-			setSelectedTableLogTypes([]);
-		} else {
-			setSelectedTableLogTypes(logTypes);
-		}
+		selectAll ? setSelectedTableLogTypes([]) : setSelectedTableLogTypes(logTypes);
 		setSelectAll(!selectAll);
 	};
-
+	// Handle "Select All" checkbox change in the update log
 	const handleUpdateSelectAll = () => {
-		if (selectAll) {
-			setSelectedUpdateLogTypes([]);
-		} else {
-			setSelectedUpdateLogTypes(logTypes);
-		}
+		selectAll ? setSelectedUpdateLogTypes([]) : setSelectedUpdateLogTypes(logTypes);
 		setSelectAll(!selectAll);
 	};
-
+	// Handle sorting of logs by date
 	const handleDateSort = () => {
 		const newDateSortOrder = dateSortOrder === 'asc' ? 'desc' : 'asc';
 		const sortedLogs = [...logs].sort((a, b) => {
@@ -102,24 +105,23 @@ export default function LogMsgComponent() {
 		setDateSortOrder(newDateSortOrder);
 		setLogs(sortedLogs);
 	};
-
+	// Handle date range change
 	const handleDateRangeChange = (range: [Date | null, Date | null]) => {
 		setLogDateRange(range);
 	};
-
+	// Handle page change for pagination
 	const handlePageChange = (newPage: number) => {
 		setCurrentPage(newPage);
 	};
-
-	// Toggle dropdown in the header
+	// Toggle dropdown for type in the table
 	const toggleTypeTable = () => {
 		setTypeTableDropdown(!typeTableDropdown);
 	};
-
+	// Toggle dropdown for type in the update log
 	const toggleUpdateLog = () => {
 		setUpdateLogDropdown(!updateLogDropdown);
 	};
-
+	// Handle showing all logs instead of paginated
 	const handleShowAllLogs = () => {
 		setShowAllLogs(!showAllLogs);
 	};
@@ -127,32 +129,34 @@ export default function LogMsgComponent() {
 	// Filter logs based on selected log types and date range
 	const filteredLogs = logs.filter(log => {
 		const logDate = new Date(log.logTime);
-
 		// Check if log is within the selected date range
 		const isWithinDateRange =
 			(!logDateRange || !logDateRange[0] || logDate >= logDateRange[0]) &&
 			(!logDateRange || !logDateRange[1] || logDate <= logDateRange[1]);
-
 		return selectedTableLogTypes.includes(log.logType) && isWithinDateRange;
 	});
 
+	// Paginate logs if not showing all logs
 	const paginatedLogs = showAllLogs ? filteredLogs : filteredLogs.slice((currentPage - 1) * PER_PAGE, currentPage * PER_PAGE);
 	const totalPages = Math.ceil(filteredLogs.length / PER_PAGE);
 
 	/**
-	 * Handle showing the log table
+	 * Handle showing the log table by fetching from the server
 	 */
 	async function handleShowLogTable() {
+		// date range must be selected
+		// TODO: accept not to choose a date range -> show all logs
 		if (!logDateRange || !logDateRange[0] || !logDateRange[1]) {
 			showWarnNotification('You must select a date range');
-		} else if (!logLimit || logLimit < 1 || logLimit > 1000) {
-			showWarnNotification('You must enter a valid number of logs to display');
+		} else if (!logLimit || logLimit < 1 || logLimit > 1000) { // number of logs being fetched must be between 1 and 1000
+			showWarnNotification(translate('log.limit.required'));
 		} else {
 			try {
 				// get log by date and type
 				const data = await logsApi.getLogsByDateRangeAndType(
 					logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedUpdateLogTypes, logLimit.toString());
 				setLogs(data);
+				// reset pagination to first page after fetching new logs
 				setCurrentPage(1);
 			} catch (error) {
 				console.error(error);
@@ -163,6 +167,8 @@ export default function LogMsgComponent() {
 	return (
 		<>
 			<h1 style={titleStyle}>{translate('log.messages')}</h1>
+
+			{/* Filter log messages by type, date range, and number of logs for fetching */}
 			<div style={logFilterStyle}>
 				<Dropdown isOpen={updateLogDropdown} toggle={toggleUpdateLog}>
 					<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
@@ -220,6 +226,7 @@ export default function LogMsgComponent() {
 				<Button color='primary' onClick={handleShowLogTable}>{translate('log.msg.update')}</Button>
 			</div>
 
+			{/* Display log messages table */}
 			{logs.length > 0 ?
 				<Table style={tableStyle} bordered hover>
 					<thead style={headerStyle}>
@@ -282,6 +289,7 @@ export default function LogMsgComponent() {
 				<Alert style={{ textAlign: 'center', margin: '2% 25% 25%' }}>{translate('no.logs')}</Alert>
 			}
 
+			{/* pagination */}
 			{!showAllLogs && logs.length !== 0 && <Pagination aria-label="Log pagination" style={{ justifyContent: 'center', margin: '1% auto' }}>
 				<>
 					<PaginationItem disabled={currentPage === 1}>
@@ -306,11 +314,13 @@ export default function LogMsgComponent() {
 				</>
 			</Pagination >}
 
+			{/* Show all logs or in pages button */}
 			{logs.length > 0 && !showAllLogs &&
 				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={handleShowAllLogs}>Show All Logs ({filteredLogs.length})</Button>}
 			{logs.length > 0 && showAllLogs &&
 				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={handleShowAllLogs}>Show in pages</Button>}
 
+			{/* Modal for displaying full log message */}
 			<Modal isOpen={modalOpen} toggle={() => setModalOpen(!modalOpen)} centered>
 				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>{translate('log.message')}</ModalHeader>
 				<ModalBody>

From 60d103c7152d5f3532daf6020461d187215604d1 Mon Sep 17 00:00:00 2001
From: Eboyd3443 <ETBoyd@proton.me>
Date: Sat, 16 Nov 2024 13:10:44 -0800
Subject: [PATCH 052/128] Add sql file to retrieve meter_type enum. Add
 preliminary code to parse meter_type enum to future test file.

---
 src/server/sql/meter/get_meter_enum.sql |  1 +
 src/server/test/db/enumTests.js         | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 src/server/sql/meter/get_meter_enum.sql
 create mode 100644 src/server/test/db/enumTests.js

diff --git a/src/server/sql/meter/get_meter_enum.sql b/src/server/sql/meter/get_meter_enum.sql
new file mode 100644
index 000000000..ae63a284f
--- /dev/null
+++ b/src/server/sql/meter/get_meter_enum.sql
@@ -0,0 +1 @@
+SELECT unnest(enum_range(NULL::meter_type));
\ No newline at end of file
diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
new file mode 100644
index 000000000..0cc8dc833
--- /dev/null
+++ b/src/server/test/db/enumTests.js
@@ -0,0 +1,20 @@
+const Meter = require('../../models/Meter');
+const Database = require('../../models/database');
+const DB = require('../../db');
+
+try {
+    const conn = DB.getConnection();
+    conn.result(Database.sqlFile('meter/get_meter_enum.sql')).then(data => {
+        let resultArray = data.rows;
+        resultArray.forEach((item) =>{
+            console.log(item.unnest);
+        });
+        //console.log(resultArray.length);
+    }).catch(err => {
+            console.log(err);
+        }
+    );
+}
+catch(err) {
+    console.log.error(`Error while performing database test ${err}`, err);
+}
\ No newline at end of file

From 080579de610300393ed810aefbeefdad0770fd8e Mon Sep 17 00:00:00 2001
From: Eboyd3443 <ETBoyd@proton.me>
Date: Sat, 16 Nov 2024 15:53:18 -0800
Subject: [PATCH 053/128] Add Mozilla Public License to new files.

---
 src/server/sql/meter/get_meter_enum.sql | 4 ++++
 src/server/test/db/enumTests.js         | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/server/sql/meter/get_meter_enum.sql b/src/server/sql/meter/get_meter_enum.sql
index ae63a284f..95b3c37f9 100644
--- a/src/server/sql/meter/get_meter_enum.sql
+++ b/src/server/sql/meter/get_meter_enum.sql
@@ -1 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
 SELECT unnest(enum_range(NULL::meter_type));
\ No newline at end of file
diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index 0cc8dc833..4a7422e28 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
 const Meter = require('../../models/Meter');
 const Database = require('../../models/database');
 const DB = require('../../db');

From 31da7f15ba4d02f40ca7e6d2262a04adb370a2b7 Mon Sep 17 00:00:00 2001
From: Eboyd3443 <ETBoyd@proton.me>
Date: Mon, 18 Nov 2024 13:46:06 -0800
Subject: [PATCH 054/128] Add first mocha test case for Meter.type

---
 src/server/test/db/enumTests.js | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index 4a7422e28..1ac7f1264 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -1,24 +1,33 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
+
 const Meter = require('../../models/Meter');
 const Database = require('../../models/database');
 const DB = require('../../db');
+const { expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
+const { mocha, expect } = require('../common');
 
-try {
-    const conn = DB.getConnection();
-    conn.result(Database.sqlFile('meter/get_meter_enum.sql')).then(data => {
-        let resultArray = data.rows;
-        resultArray.forEach((item) =>{
-            console.log(item.unnest);
-        });
-        //console.log(resultArray.length);
-    }).catch(err => {
-            console.log(err);
-        }
-    );
-}
-catch(err) {
-    console.log.error(`Error while performing database test ${err}`, err);
-}
\ No newline at end of file
+mocha.describe('Enums JS to DB', () => {
+	mocha.it('can equate Meter.type to SQL enum', async () => {
+        const conn = DB.getConnection();
+        let serverEnum = [];
+        let jsObject = [];
+        conn.result(Database.sqlFile('meter/get_meter_enum.sql')).then(data => {
+            let resultArray = data.rows;
+            resultArray.forEach((item) =>{
+                serverEnum.push(item.unnest);
+            });
+            for(let key in Meter.type) {
+                if (Meter.type.hasOwnProperty(key)) {
+                    let value = Meter.type[key];
+                    jsObject.push(value);
+                }
+            }
+            serverEnum.sort();
+            jsObject.sort();
+            expect(serverEnum.toString()).to.equal(jsObject.toString());
+            expect(serverEnum.length).to.equal(jsObject.length);
+        })
+    })
+})

From 2bf262f710b428bcf417a0795713e020e015903b Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Tue, 19 Nov 2024 14:52:31 -0800
Subject: [PATCH 055/128] added link to tooltip and changed color legend colors
 to circles.

---
 src/client/app/components/TooltipHelpComponent.tsx  |  2 +-
 .../CreateCikVisualModalMapComponent.tsx            | 13 +++++++------
 .../CreateVisualUnitModalMapComponent.tsx           | 13 +++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/client/app/components/TooltipHelpComponent.tsx b/src/client/app/components/TooltipHelpComponent.tsx
index b15aac4b7..f48de775e 100644
--- a/src/client/app/components/TooltipHelpComponent.tsx
+++ b/src/client/app/components/TooltipHelpComponent.tsx
@@ -71,7 +71,7 @@ export default function TooltipHelpComponent(props: TooltipHelpProps) {
 		'help.groups.groupdetails': { link: `${helpUrl}/groupViewing/#groupDetails` },
 		'help.groups.groupview': { link: `${helpUrl}/groupViewing/` },
 		'help.meters.meterview': { link: `${helpUrl}/meterViewing/` },
-		'help.admin.unitconversionvisuals': { link: ''}
+		'help.admin.unitconversionvisuals': { link: `${helpUrl}/adminUnitVisual/` }
 	};
 
 	return (
diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
index edeb698d1..84c570901 100644
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
@@ -175,18 +175,19 @@ export default function CreateCikVisualMapComponent() {
 
 		colorSchema.domain().forEach((item, i) => {
 			const legendEntry = legend.append('g')
-				.attr('transform', `translate(0, ${i * 25})`);
+				.attr('transform', `translate(0, ${i * 30})`);
 
 			// Rectangle color box
-			legendEntry.append('rect')
-				.attr('width', 20)
-				.attr('height', 20)
+			legendEntry.append('circle')
+				.attr('r', 15)
+				.attr('cx', 15) // Center the circle horizontally
+				.attr('cy', 15) // Center the circle vertically
 				.attr('fill', colorSchema(item));
 
 			// Text label
 			legendEntry.append('text')
-				.attr('x', 30)
-				.attr('y', 15)
+				.attr('x', 40) // Position the text to the right of the circle
+				.attr('y', 20) // Align the text vertically with the circle
 				.style('fill', '#000')
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
index cf3a2227f..09f41fd8a 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
@@ -188,18 +188,19 @@ export default function CreateVisualUnitMapModalComponent() {
 
 		colorSchema.domain().forEach((item, i) => {
 			const legendEntry = legend.append('g')
-				.attr('transform', `translate(0, ${i * 25})`);
+				.attr('transform', `translate(0, ${i * 30})`);
 
 			// Rectangle color box
-			legendEntry.append('rect')
-				.attr('width', 20)
-				.attr('height', 20)
+			legendEntry.append('circle')
+				.attr('r', 15)
+				.attr('cx', 15) // Center the circle horizontally
+				.attr('cy', 15) // Center the circle vertically
 				.attr('fill', colorSchema(item));
 
 			// Text label
 			legendEntry.append('text')
-				.attr('x', 30)
-				.attr('y', 15)
+				.attr('x', 40) // Position the text to the right of the circle
+				.attr('y', 20) // Align the text vertically with the circle
 				.style('fill', '#000')
 				.style('font-size', '14px')
 				.style('alignment-middle', 'middle')

From c35a34a6c2f05c7852e16fea02b6dc6f844885e7 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Tue, 19 Nov 2024 16:45:27 -0800
Subject: [PATCH 056/128] moved the visual components into one.

---
 .../visual-unit/CreateVisualUnitComponent.tsx | 241 ++++++++++++++++++
 .../visual-unit/VisualUnitDetailComponent.tsx |  17 +-
 2 files changed, 254 insertions(+), 4 deletions(-)
 create mode 100644 src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
new file mode 100644
index 000000000..6c7a4184a
--- /dev/null
+++ b/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
@@ -0,0 +1,241 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import * as React from 'react';
+import * as d3 from 'd3';
+import { useEffect } from 'react';
+import { useIntl } from 'react-intl';
+// import { useAppSelector } from '../../redux/reduxHooks';
+import { UnitData } from 'types/redux/units';
+import { ConversionData } from 'types/redux/conversions';
+import { CikData } from 'types/redux/ciks';
+// import { selectAllUnits } from '../../redux/api/unitsApi';
+
+/**
+ * Visual graph component that shows the relationship between units and conversions
+ * entered by an admin.
+ * @returns D3 force graph visual
+ */
+interface CreateVisualUnitProps {
+	units: UnitData[];
+	conversions: ConversionData[] | CikData[];
+	isCik?: boolean;
+}
+
+export const CreateVisualUnitComponent: React.FC<CreateVisualUnitProps> = ({
+	units,
+	conversions,
+	isCik = false
+}) => {
+	const intl = useIntl();
+
+	/* creating color schema for nodes based on their unit type */
+	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
+	const colorSchema = d3.scaleOrdinal<string, string>()
+		.domain(['meter', 'unit', 'suffix', 'suffix.input'])
+		.range(colors);
+
+	/* Create data container to pass to D3 force graph */
+	const data: { nodes: any[], links: any[] } = {
+		nodes: [],
+		links: []
+	};
+
+	units.map(value =>
+		data.nodes.push({
+			'name': value.name,
+			'id': value.id,
+			'typeOfUnit': value.typeOfUnit,
+			'suffix': value.suffix
+		})
+	);
+
+	conversions.map(value => {
+		if (isCik) {
+			const cikValue = value as CikData;
+			data.links.push({
+				'source': cikValue.meterUnitId,
+				'target': cikValue.nonMeterUnitId,
+				'bidirectional': false
+			});
+		} else {
+			const conversionValue = value as ConversionData;
+			data.links.push({
+				'source': conversionValue.sourceId,
+				'target': conversionValue.destinationId,
+				/* boolean value */
+				'bidirectional': conversionValue.bidirectional
+			});
+		}
+	});
+
+	/* Visuals start here */
+	useEffect(() => {
+		/* View-box dimensions */
+		const width = window.innerWidth;
+		const height = isCik ? 1000 : 750;
+
+		/* Grab data */
+		const nodes = data.nodes.map(d => ({...d}));
+		const links = data.links.map(d => ({...d}));
+
+		const simulation = d3.forceSimulation(nodes)
+			.force('link', d3.forceLink(links)
+				/* Set all link ids (from data.links) */
+				.id((d: any) => d.id)
+				/* This controls how long each link is */
+				.distance(isCik ? 120 : 90)
+			)
+			/* Create new many-body force */
+			.force('charge', d3.forceManyBody()
+				/* This controls the 'repelling' force on each node */
+				.strength(isCik ? -800 : -500)
+			)
+			.force('x', d3.forceX())
+			.force('y', d3.forceY());
+
+		const svg = d3.select(isCik ? '#sample-cik' : '#sample')
+			.append('svg')
+			.attr('width', width)
+			.attr('height', height)
+			.attr('viewBox', [-width / 2, -height / 2, width, height])
+			.attr('style', 'max-width: 100%; height: auto;')
+			.append('g');
+
+		/* End arrow head */
+		svg.append('defs').append('marker')
+			.attr('id', 'arrow-end')
+			.attr('viewBox', '0 -5 10 10')
+			.attr('refX', 25)
+			.attr('refY', 0)
+			.attr('markerWidth', 4)
+			.attr('markerHeight', 4)
+			/* auto: point towards dest. node */
+			.attr('orient', 'auto')
+			.append('svg:path')
+			.attr('d', 'M0,-5L10,0L0,5');
+
+		if (!isCik) {
+			/* Start arrow head (for bidirectional edges) */
+			svg.append('defs').append('marker')
+				.attr('id', 'arrow-start')
+				.attr('viewBox', '0 -5 10 10')
+				.attr('refX', 25)
+				.attr('refY', 0)
+				.attr('markerWidth', 4)
+				.attr('markerHeight', 4)
+				/* auto-start-reverse: point towards src. node */
+				.attr('orient', 'auto-start-reverse')
+				.append('svg:path')
+				.attr('d', 'M0,-5L10,0L0,5');
+		}
+
+		/* Link style */
+		const link = svg.selectAll('line')
+			.data(links)
+			.enter().append('line')
+			.style('stroke', '#aaa')
+			.attr('stroke-width', 3)
+			.attr('marker-end', 'url(#arrow-end)')
+			/* Only draw start arrow head if bidirectional */
+			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');
+
+		/* Node style */
+		const node = svg.selectAll('.node')
+			.data(nodes)
+			.enter().append('circle')
+			/* Node radius */
+			.attr('r', 20)
+			/* checks if unit has a non empty suffix to color differently */
+			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix.input') : colorSchema(d.typeOfUnit));
+
+		/* Drag behavior */
+		node.call(d3.drag()
+			.on('start', dragstart)
+			.on('drag', dragged)
+			.on('end', dragend));
+
+		/* Node label style */
+		const label = svg.selectAll('.label')
+			.data(nodes)
+			.enter()
+			.append('text')
+			.text(function (d) { return d.name; })
+			.style('text-anchor', 'middle')
+			.style('fill', '#000')
+			.style('font-family', 'Arial')
+			.style('font-size', 14);
+
+		/* Update element positions when moved */
+		simulation.on('tick', () => {
+			link
+				.attr('x1', d => d.source.x)
+				.attr('y1', d => d.source.y)
+				.attr('x2', d => d.target.x)
+				.attr('y2', d => d.target.y);
+
+			node
+				.attr('cx', d => d.x)
+				.attr('cy', d => d.y);
+
+			label
+				.attr('x', function(d){ return d.x; })
+				.attr('y', function (d) {return d.y - 25; });
+		});
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragstart(event: any) {
+			if (!event.active) simulation.alphaTarget(0.3).restart();
+			event.subject.fx = event.subject.x;
+			event.subject.fy = event.subject.y;
+		}
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragged(event: any) {
+			event.subject.fx = event.x;
+			event.subject.fy = event.y;
+		}
+
+		// eslint-disable-next-line jsdoc/require-jsdoc
+		function dragend(event: any) {
+			if (!event.active) simulation.alphaTarget(0);
+			event.subject.fx = null;
+			event.subject.fy = null;
+		}
+
+		/* Color Legend */
+		const legend = svg.append('g')
+			.attr('transform', `translate(${-width / 2 + 20}, ${-height / 2 + 20})`);
+
+		colorSchema.domain().forEach((item, i) => {
+			const legendEntry = legend.append('g')
+				.attr('transform', `translate(0, ${i * 30})`);
+
+			// Rectangle color box
+			legendEntry.append('circle')
+				.attr('r', 15)
+				.attr('cx', 15) // Center the circle horizontally
+				.attr('cy', 15) // Center the circle vertically
+				.attr('fill', colorSchema(item));
+
+			// Text label
+			legendEntry.append('text')
+				.attr('x', 40) // Position the text to the right of the circle
+				.attr('y', 20) // Align the text vertically with the circle
+				.style('fill', '#000')
+				.style('font-size', '14px')
+				.style('alignment-middle', 'middle')
+				/* internationalizing color legend text */
+				.text(intl.formatMessage({id : `legend.graph.text.${item}`}));
+		});
+
+	// Empty dependency array to run the effect only once
+	}, []);
+
+	return(
+		<div>
+			<div id={isCik ? 'sample-cik' : 'sample'}></div>
+		</div>
+	);
+};
\ No newline at end of file
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 00ac5e218..1cd69ce71 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -5,15 +5,24 @@
 import { FormattedMessage } from 'react-intl';
 import TooltipHelpComponent from '../TooltipHelpComponent';
 import * as React from 'react';
-import CreateVisualUnitMapModalComponent from './CreateVisualUnitModalMapComponent';
-import CreateCikVisualMapComponent from './CreateCikVisualModalMapComponent';
+import { CreateVisualUnitComponent } from './CreateVisualUnitComponent';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
+import { selectCik } from '../../redux/api/conversionsApi';
+import { selectConversionsDetails } from '../../redux/api/conversionsApi';
+import { useAppSelector } from '../../redux/reduxHooks';
+import { selectAllUnits } from '../../redux/api/unitsApi';
 
 /**
  * Defines the units and conversion graphics view.
  * @returns Units visual graphics page element
  */
 export default function VisualUnitDetailComponent() {
+	/* Get unit and conversion data from redux */
+	const unitData = useAppSelector(selectAllUnits);
+	const conversionData = useAppSelector(selectConversionsDetails);
+	const cikData = useAppSelector(selectCik);
+
+
 
 	const titleStyle: React.CSSProperties = {
 		textAlign: 'center'
@@ -45,7 +54,7 @@ export default function VisualUnitDetailComponent() {
 			</div>
 
 			<div style={titleStyle}>
-				<CreateVisualUnitMapModalComponent/>
+				<CreateVisualUnitComponent units={unitData} conversions={conversionData}/>
 			</div>
 
 			<div className='container-fluid'>
@@ -55,7 +64,7 @@ export default function VisualUnitDetailComponent() {
 			</div>
 
 			<div style={titleStyle}>
-				<CreateCikVisualMapComponent />
+				<CreateVisualUnitComponent units={unitData} conversions={cikData} isCik/>
 			</div>
 		</div>
 	);

From 7b151a1966fe58013404d465be990bcf98486911 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Tue, 19 Nov 2024 16:50:06 -0800
Subject: [PATCH 057/128] added link to tooltip.

---
 src/client/app/translations/data.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 8cc689083..8a5815cb4 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -225,7 +225,7 @@ const LocaleTranslationData = {
 		"help.admin.metercreate": "This page allows admins to create meters. Please visit {link} for further details and information.",
 		"help.admin.meteredit": "This page allows admins to edit meters. Please visit {link} for further details and information.",
 		"help.admin.meterview": "This page allows admins to view and edit meters. Please visit {link} for further details and information.",
-		"help.admin.unitconversionvisuals": "The \"Input Units Visual Graphic\" visually shows the units and conversions made by admins. The \"Analyzed Units Visual Graphic\" visually shows the analysis OED does on the units and conversions entered by admins.",
+		"help.admin.unitconversionvisuals": "The \"Input Units Visual Graphic\" visually shows the units and conversions made by admins. The \"Analyzed Units Visual Graphic\" visually shows the analysis OED does on the units and conversions entered by admins. Please visit {link} for further details and information.",
 		"help.admin.unitcreate": "This page allows admins to create units. Please visit {link} for further details and information.",
 		"help.admin.unitedit": "This page allows admins to edit units. Please visit {link} for further details and information.",
 		"help.admin.unitview": "This page shows information on units. Please visit {link} for further details and information.",
@@ -740,7 +740,7 @@ const LocaleTranslationData = {
 		"help.admin.metercreate": "This page allows admins to create meters. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.meteredit": "This page allows admins to edit meters. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.meterview": "This page allows admins to view and edit meters. Please visit {link} for further details and information.\u{26A1}",
-		"help.admin.unitconversionvisuals": "The \"Input Units Visual Graphic\" visually shows the units and conversions made by admins. The \"Analyzed Units Visual Graphic\" visually shows the analysis OED does on the units and conversions entered by admins.\u{26A1}",
+		"help.admin.unitconversionvisuals": "The \"Input Units Visual Graphic\" visually shows the units and conversions made by admins. The \"Analyzed Units Visual Graphic\" visually shows the analysis OED does on the units and conversions entered by admins. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.unitcreate": "This page allows admins to create units. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.unitedit": "This page allows admins to edit units. Please visit {link} for further details and information.",
 		"help.admin.unitview": "This page shows information on units. Please visit {link} for further details and information.\u{26A1}",
@@ -1256,7 +1256,7 @@ const LocaleTranslationData = {
 		"help.admin.metercreate": "Esta página permite a los administradores crear medidores. Por favor, visite {link} para más detalles e información.",
 		"help.admin.meteredit": "Esta página permite a los administradores editar medidores. Por favor, visite {link} para más detalles e información.",
 		"help.admin.meterview": "Esta página permite a los administradores ver y editar mediores. Por favor, visite {link} para más detalles e información.",
-		"help.admin.unitconversionvisuals": "El \"Gráfico Visual de Unidades de Entrada\" muestra visualmente las unidades y las conversiones ingresadas por los administradores. El \"Gráfico Visual de Unidades Analizadas\" muestra visualmente el análisis que realiza el OED en las unidades y las conversiones ingresadas por los administradores.",
+		"help.admin.unitconversionvisuals": "El \"Gráfico Visual de Unidades de Entrada\" muestra visualmente las unidades y las conversiones ingresadas por los administradores. El \"Gráfico Visual de Unidades Analizadas\" muestra visualmente el análisis que realiza el OED en las unidades y las conversiones ingresadas por los administradores. Por favor, visite {link} para más detalles e información.",
 		"help.admin.unitcreate": "Esta página permite a los administradores crear unidades. Por favor, visite {link} para más detalles e información.",
 		"help.admin.unitedit": "Esta página permite a los administradores editar unidades Por favor, visite {link} para más detalles e información.",
 		"help.admin.unitview": "Esta página muestra información sobre unidades. Por favor, visite {link} para más detalles e información.",

From 2819142a9ed6e8366da0031bc175458783475a0b Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Wed, 20 Nov 2024 00:24:27 -0500
Subject: [PATCH 058/128] update using time interval instead of date for log
 date range

---
 .../app/components/admin/LogMsgComponent.tsx  | 29 ++++++++++---------
 src/client/app/translations/data.ts           | 12 ++++----
 src/client/app/utils/api/LogsApi.ts           |  5 ++--
 src/server/models/LogMsg.js                   |  6 ++--
 src/server/routes/logs.js                     | 16 +++++-----
 5 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index a77bc825b..886056b9b 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 import * as React from 'react';
+import * as moment from 'moment';
 import {
 	Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle,
 	FormGroup, Input, Label, Modal, ModalBody, ModalHeader, Pagination, PaginationItem, PaginationLink, Table
@@ -14,6 +15,10 @@ import { selectSelectedLanguage } from '../../redux/slices/appStateSlice';
 import { showWarnNotification } from '../../utils/notifications';
 import { logsApi } from '../../utils/api';
 import translate from '../../utils/translate';
+import { TimeInterval } from '../../../../common/TimeInterval';
+import { dateRangeToTimeInterval, timeIntervalToDateRange } from '../../utils/dateRangeCompatibility';
+import { Value } from '@wojtekmaj/react-daterange-picker/dist/cjs/shared/types';
+
 
 // number of log messages to display per page
 const PER_PAGE = 20;
@@ -42,7 +47,7 @@ export default function LogMsgComponent() {
 	// Sort order for date column in the table
 	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
 	// Log messages date range state
-	const [logDateRange, setLogDateRange] = React.useState<[Date | null, Date | null]>([null, null]);
+	const [logDateRange, setLogDateRange] = React.useState<TimeInterval>(TimeInterval.unbounded());
 	// Number of log messages to display
 	const [logLimit, setLogLimit] = React.useState(0);
 	// "Select All Logs" button state
@@ -106,8 +111,8 @@ export default function LogMsgComponent() {
 		setLogs(sortedLogs);
 	};
 	// Handle date range change
-	const handleDateRangeChange = (range: [Date | null, Date | null]) => {
-		setLogDateRange(range);
+	const handleDateRangeChange = (range: Value) => {
+		setLogDateRange(dateRangeToTimeInterval(range));
 	};
 	// Handle page change for pagination
 	const handlePageChange = (newPage: number) => {
@@ -128,11 +133,11 @@ export default function LogMsgComponent() {
 
 	// Filter logs based on selected log types and date range
 	const filteredLogs = logs.filter(log => {
-		const logDate = new Date(log.logTime);
+		const logDate = moment(log.logTime);
 		// Check if log is within the selected date range
 		const isWithinDateRange =
-			(!logDateRange || !logDateRange[0] || logDate >= logDateRange[0]) &&
-			(!logDateRange || !logDateRange[1] || logDate <= logDateRange[1]);
+			(!logDateRange || !logDateRange.getIsBounded() || logDate >= logDateRange.getStartTimestamp()) &&
+			(!logDateRange || !logDateRange.getIsBounded() || logDate <= logDateRange.getEndTimestamp());
 		return selectedTableLogTypes.includes(log.logType) && isWithinDateRange;
 	});
 
@@ -144,17 +149,13 @@ export default function LogMsgComponent() {
 	 * Handle showing the log table by fetching from the server
 	 */
 	async function handleShowLogTable() {
-		// date range must be selected
-		// TODO: accept not to choose a date range -> show all logs
-		if (!logDateRange || !logDateRange[0] || !logDateRange[1]) {
-			showWarnNotification('You must select a date range');
-		} else if (!logLimit || logLimit < 1 || logLimit > 1000) { // number of logs being fetched must be between 1 and 1000
+		// Number of logs being fetched must be between 1 and 1000
+		if (!logLimit || logLimit < 1 || logLimit > 1000) {
 			showWarnNotification(translate('log.limit.required'));
 		} else {
 			try {
 				// get log by date and type
-				const data = await logsApi.getLogsByDateRangeAndType(
-					logDateRange[0].toISOString(), logDateRange[1].toISOString(), selectedUpdateLogTypes, logLimit.toString());
+				const data = await logsApi.getLogsByDateRangeAndType(logDateRange, selectedUpdateLogTypes, logLimit.toString());
 				setLogs(data);
 				// reset pagination to first page after fetching new logs
 				setCurrentPage(1);
@@ -201,7 +202,7 @@ export default function LogMsgComponent() {
 					</Label>
 					<DateRangePicker
 						id="dateRange"
-						value={logDateRange}
+						value={timeIntervalToDateRange(logDateRange)}
 						onChange={handleDateRangeChange}
 						minDate={new Date(1970, 0, 1)}
 						maxDate={new Date()}
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 459ee5494..60c5b595c 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -521,9 +521,9 @@ const LocaleTranslationData = {
 		"log.msg.update": "Update",
 		"from.1.to.1000": "from 1 to 1000",
 		"show.logs": "Show Log Table",
-		"please.choose.log.limit.date.range": "Please choose log limit and date range",
 		"select.all": "Select All",
-		"no.logs": "No logs to display. Please select another data range or log type"
+		"no.logs": "No logs to display. Please select another log type or data range",
+		"log.limit.required": "You must enter a valid number of logs to display"
 	},
 	"fr": {
 		"3D": "3D",
@@ -1040,9 +1040,9 @@ const LocaleTranslationData = {
 		"log.msg.update": "Update\u{26A1}",
 		"from.1.to.1000": "from 1 to 1000\u{26A1}",
 		"show.logs": "Show Log Table\u{26A1}",
-		"please.choose.log.limit.date.range": "Please choose log limit and date range\u{26A1}",
 		"select.all": "Select All\u{26A1}",
-		"no.logs": "No logs to display. Please select another data range or log type\u{26A1}"
+		"no.logs": "No logs to display. Please select another log type or date range\u{26A1}",
+		"log.limit.required": "You must enter a valid number of logs to display\u{26A1}"
 	},
 	"es": {
 		"3D": "3D",
@@ -1560,9 +1560,9 @@ const LocaleTranslationData = {
 		"log.msg.update": "Update\u{26A1}",
 		"from.1.to.1000": "from 1 to 1000\u{26A1}",
 		"show.logs": "Show Log Table\u{26A1}",
-		"please.choose.log.limit.date.range": "Please choose log limit and date range\u{26A1}",
 		"select.all": "Select All\u{26A1}",
-		"no.logs": "No logs to display. Please select another data range or log type\u{26A1}"
+		"no.logs": "No logs to display. Please select another log type or data range\u{26A1}",
+		"log.limit.required": "You must enter a valid number of logs to display\u{26A1}"
 	}
 }
 
diff --git a/src/client/app/utils/api/LogsApi.ts b/src/client/app/utils/api/LogsApi.ts
index 48e64168e..c53611e61 100644
--- a/src/client/app/utils/api/LogsApi.ts
+++ b/src/client/app/utils/api/LogsApi.ts
@@ -6,6 +6,7 @@
 
 import ApiBackend from './ApiBackend';
 import { LogData } from '../../types/redux/logs';
+import { TimeInterval } from '../../../../common/TimeInterval';
 
 export default class LogsApi {
 	private readonly backend: ApiBackend;
@@ -26,9 +27,9 @@ export default class LogsApi {
 		return await this.backend.doPostRequest('/api/logs/error', log);
 	}
 
-	public async getLogsByDateRangeAndType(startDate: string, endDate: string, logTypes: string[], logLimit: string): Promise<LogData[]> {
+	public async getLogsByDateRangeAndType(timeInterval: TimeInterval, logTypes: string[], logLimit: string): Promise<LogData[]> {
 		const request = await this.backend.doGetRequest('/api/logs/logsmsg/getLogsByDateRangeAndType',
-			{ startDate: startDate, endDate: endDate, logTypes: logTypes.join('-'), logLimit: logLimit });
+			{ timeInterval: timeInterval.toString(), logTypes: logTypes.join('-'), logLimit: logLimit });
 		return request as LogData[];
 	}
 
diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
index 67c1efca9..1735f7c58 100644
--- a/src/server/models/LogMsg.js
+++ b/src/server/models/LogMsg.js
@@ -106,10 +106,10 @@ class LogMsg {
 	 * @param conn is the connection to use.
 	 * @returns {Promise.<array.<LogMsg>>}
 	 */
-	static async getLogsByDateRangeAndType(startDate, endDate, logTypes, logLimit = 100, conn) {
+	static async getLogsByDateRangeAndType(startDate = null, endDate = null, logTypes, logLimit = 100, conn) {
 		const rows = await conn.any(sqlFile('logmsg/get_logs_from_dates_and_type.sql'), {
-			startDate: startDate,
-			endDate: endDate,
+			startDate: startDate || '-infinity',
+			endDate: endDate || 'infinity',
 			logTypes: logTypes,
 			logLimit: logLimit
 		});
diff --git a/src/server/routes/logs.js b/src/server/routes/logs.js
index 28e6a4a85..eef40ae18 100644
--- a/src/server/routes/logs.js
+++ b/src/server/routes/logs.js
@@ -10,6 +10,7 @@ const validate = require('jsonschema').validate;
 const adminAuthenticator = require('./authenticator').adminAuthMiddleware;
 const LogMsg = require('../models/LogMsg');
 const { getConnection } = require('../db');
+const { TimeInterval } = require('../../common/TimeInterval');
 
 const router = express.Router();
 router.use(adminAuthenticator('log API'));
@@ -27,15 +28,12 @@ const validLog = {
 
 const validLogMsg = {
 	type: 'object',
-	required: ['startDate', 'endDate', 'logTypes', 'logLimit'],
+	required: ['timeInterval', 'logTypes', 'logLimit'],
 	properties: {
-		startDate: {
+		timeInterval: {
+			// it should check for format: 'date-time' but this won't work for case where time is not provided
+			// when time is not provided, timeInterval value will be 'all' so just check type is string for now
 			type: 'string',
-			format: 'date-time'
-		},
-		endDate: {
-			type: 'string',
-			format: 'date-time'
 		},
 		logTypes: {
 			type: 'string',
@@ -90,7 +88,9 @@ router.get('/logsmsg/getLogsByDateRangeAndType', async (req, res) => {
 		const conn = getConnection();
 		try {
 			const logLimit = parseInt(req.query.logLimit);
-			const rows = await LogMsg.getLogsByDateRangeAndType(req.query.startDate, req.query.endDate, req.query.logTypes.split('-'), logLimit, conn);
+			const timeInterval = TimeInterval.fromString(req.query.timeInterval);
+			const rows = await LogMsg.getLogsByDateRangeAndType(
+				timeInterval.startTimestamp, timeInterval.endTimestamp, req.query.logTypes.split('-'), logLimit, conn);
 			res.json(rows);
 		} catch (err) {
 			console.error(`Failed to fetch logs filter by date range and type: ${err}`);

From 5c3865e6f8fe5d7fba8648582ea1696f28ff7c15 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Wed, 20 Nov 2024 14:24:25 -0500
Subject: [PATCH 059/128] update 'Select All' button action

---
 .../app/components/admin/LogMsgComponent.tsx  | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index 886056b9b..58760d95c 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -50,8 +50,10 @@ export default function LogMsgComponent() {
 	const [logDateRange, setLogDateRange] = React.useState<TimeInterval>(TimeInterval.unbounded());
 	// Number of log messages to display
 	const [logLimit, setLogLimit] = React.useState(0);
-	// "Select All Logs" button state
-	const [selectAll, setSelectAll] = React.useState(true);
+	// "Select All Logs" button state for update log
+	const [selectAllUpdate, setSelectAllUpdate] = React.useState(true);
+	// "Select All Logs" button state for table log
+	const [selectAllTable, setSelectAllTable] = React.useState(true);
 	// Current page state for pagination
 	const [currentPage, setCurrentPage] = React.useState(1);
 	// Modal state for displaying full log message
@@ -60,6 +62,13 @@ export default function LogMsgComponent() {
 	const [modalLogMessage, setModalLogMessage] = React.useState('');
 	// Showing all logs instead of paginated
 	const [showAllLogs, setShowAllLogs] = React.useState(false);
+	// Update button state
+	const [buttonAvailable, setButtonAvailable] = React.useState(false);
+
+	// Update the availability of the update button each time the selected log types, log limit, or date range changes
+	React.useEffect(() => {
+		setButtonAvailable(false);
+	}, [selectedUpdateLogTypes, logLimit, logDateRange]);
 
 	// Open modal with the full log message
 	const handleLogMessageClick = (logMessage: string) => {
@@ -75,6 +84,7 @@ export default function LogMsgComponent() {
 			setSelectedTableLogTypes([...selectedTableLogTypes, logType]);
 		}
 	};
+
 	// Handle checkbox change for log type in the update log
 	const handleUpdateCheckboxChange = (logType: string) => {
 		if (selectedUpdateLogTypes.includes(logType)) {  // Remove log type if already selected
@@ -84,15 +94,21 @@ export default function LogMsgComponent() {
 		}
 	};
 
+	// React effect to keep track of the "Select All" checkbox state
+	React.useEffect(() => {
+		selectedUpdateLogTypes.length === logTypes.length ? setSelectAllUpdate(true) : setSelectAllUpdate(false);
+		selectedTableLogTypes.length === logTypes.length ? setSelectAllTable(true) : setSelectAllTable(false);
+	}, [selectedUpdateLogTypes, selectedTableLogTypes]);
+
 	// Handle "Select All" checkbox change in the table
 	const handleTableSelectAll = () => {
-		selectAll ? setSelectedTableLogTypes([]) : setSelectedTableLogTypes(logTypes);
-		setSelectAll(!selectAll);
+		selectAllTable ? setSelectedTableLogTypes([]) : setSelectedTableLogTypes(logTypes);
+		setSelectAllTable(!selectAllTable);
 	};
 	// Handle "Select All" checkbox change in the update log
 	const handleUpdateSelectAll = () => {
-		selectAll ? setSelectedUpdateLogTypes([]) : setSelectedUpdateLogTypes(logTypes);
-		setSelectAll(!selectAll);
+		selectAllUpdate ? setSelectedUpdateLogTypes([]) : setSelectedUpdateLogTypes(logTypes);
+		setSelectAllUpdate(!selectAllUpdate);
 	};
 	// Handle sorting of logs by date
 	const handleDateSort = () => {
@@ -159,6 +175,7 @@ export default function LogMsgComponent() {
 				setLogs(data);
 				// reset pagination to first page after fetching new logs
 				setCurrentPage(1);
+				setButtonAvailable(true);
 			} catch (error) {
 				console.error(error);
 			}
@@ -178,7 +195,7 @@ export default function LogMsgComponent() {
 							<Label check>
 								<Input
 									type="checkbox"
-									checked={selectAll}
+									checked={selectAllUpdate}
 									onChange={handleUpdateSelectAll}
 								/> {translate('select.all')}
 							</Label>
@@ -224,7 +241,7 @@ export default function LogMsgComponent() {
 						value={logLimit}
 					/>
 				</FormGroup>
-				<Button color='primary' onClick={handleShowLogTable}>{translate('log.msg.update')}</Button>
+				<Button color='primary' disabled={buttonAvailable} onClick={handleShowLogTable}>{translate('log.msg.update')}</Button>
 			</div>
 
 			{/* Display log messages table */}
@@ -240,7 +257,7 @@ export default function LogMsgComponent() {
 											<Label check>
 												<Input
 													type="checkbox"
-													checked={selectAll}
+													checked={selectAllTable}
 													onChange={handleTableSelectAll}
 												/> {translate('select.all')}
 											</Label>

From 964d2fb4ca752da570f9e12cbb9d226e728aa849 Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Wed, 20 Nov 2024 15:49:10 -0800
Subject: [PATCH 060/128] rollback

---
 src/server/test/web/obviusTest.js | 128 ++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 4b21d698c..00747dcae 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -7,6 +7,7 @@
 
 const { chai, mocha, expect, app, testDB, testUser } = require('../common');
 const User = require('../../models/User');
+const Configfile = require('../../models/obvius/Configfile');
 const bcrypt = require('bcryptjs');
 
 mocha.describe('Obvius API', () => {
@@ -58,5 +59,132 @@ mocha.describe('Obvius API', () => {
 				}
 			}
 		});
+		mocha.describe('obvius request modes', async () => {
+			mocha.it('should reject requests without a mode', async () => {
+				const conn = testDB.getConnection();
+				const password = 'password';
+				const hashedPassword = await bcrypt.hash(password, 10);
+				const obviusUser = new User(undefined, 'obivus@example.com', hashedPassword, User.role.OBVIUS);
+				await obviusUser.insert(conn);
+				obviusUser.password = password;
+				const res = await chai.request(app).post('/api/obvius').send({ username: obviusUser.username, password: obviusUser.password });
+				//should respond with 406, not acceptable
+				expect(res).to.have.status(406);
+				//should also return expected message
+				expect(res.text).equals(`<pre>\nRequest must include mode parameter.\n</pre>\n`); 
+			});
+			mocha.it('should accept status requests', async function ()  {
+				const conn = testDB.getConnection();
+				const password = 'password';
+				const hashedPassword = await bcrypt.hash(password, 10);
+				const obviusUser = new User(undefined, 'obivus@example.com', hashedPassword, User.role.OBVIUS);
+				await obviusUser.insert(conn);
+				obviusUser.password = password;
+				const requestMode = 'STATUS';
+				const res = await chai.request(app).post('/api/obvius').send({ username: obviusUser.username, password: obviusUser.password, mode: requestMode });
+				//should respond with 200, success
+				expect(res).to.have.status(200);
+				//should also return expected message
+				expect(res.text).equals("<pre>\nSUCCESS\n</pre>\n"); 
+			});
+			mocha.it('should accept valid logfile uploads', async function () {
+				this.timeout(30000);
+		
+				const conn = testDB.getConnection();
+				const password = 'password';
+				const hashedPassword = await bcrypt.hash(password, 10);
+				const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
+				await obviusUser.insert(conn);
+				obviusUser.password = password;
+				const requestMode = 'LOGFILEUPLOAD';
+		
+				// Adapted from ../obvius/README.md
+				const logfilePath = 'src/server/test/web/obvius/mb-001.log.gz';
+				
+				const res = await chai.request(app)
+						.post('/api/obvius')
+						.field('username', obviusUser.username)
+						.field('password', obviusUser.password)
+						.field('mode', requestMode)
+						.field('serialnumber', 'mb-001')
+						.attach('files', logfilePath);
+		
+				//should respond with 200, success
+				expect(res).to.have.status(200);
+				//should also return expected message
+				expect(res.text).equals("<pre>\nSUCCESS\nLogfile Upload IS PROVISIONAL</pre>\n"); 
+				});
+				mocha.it('should accept valid config file uploads', async function () {
+					this.timeout(30000);
+			
+					const conn = testDB.getConnection();
+					const password = 'password';
+					const hashedPassword = await bcrypt.hash(password, 10);
+					const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
+					await obviusUser.insert(conn);
+					obviusUser.password = password;
+					const requestMode = 'CONFIGFILEUPLOAD';
+			
+					// Adapted from ../obvius/README.md
+					const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
+					
+					const res = await chai.request(app)
+							.post('/api/obvius')
+							.field('username', obviusUser.username)
+							.field('password', obviusUser.password)
+							.field('mode', requestMode)
+							.field('serialnumber', 'mb-001')
+							.field('modbusdevice', '1234')
+							.attach('files', configFilePath);
+
+					//should respond with 200, success
+					expect(res).to.have.status(200);
+					//should also return expected message
+					expect(res.text).equals("<pre>\nSUCCESS\nAcquired config log with (pseudo)filename mb-001-mb-1234.ini.</pre>\n"); 
+					});
+				mocha.it('should return accurate config file manifests', async function () {
+					this.timeout(30000);
+			
+					const conn = testDB.getConnection();
+					const password = 'password';
+					const hashedPassword = await bcrypt.hash(password, 10);
+					const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
+					await obviusUser.insert(conn);
+					obviusUser.password = password;
+					const uploadRequestMode = 'CONFIGFILEUPLOAD';
+					const manifestRequestMode = 'CONFIGFILEMANIFEST';
+			
+					// Adapted from ../obvius/README.md
+					const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
+					
+					const upload = await chai.request(app)
+							.post('/api/obvius')
+							.field('username', obviusUser.username)
+							.field('password', obviusUser.password)
+							.field('mode', uploadRequestMode)
+							.field('serialnumber', 'mb-001')
+							.field('modbusdevice', '1234')
+							.attach('files', configFilePath);
+			
+					const res = await chai.request(app)
+							.post('/api/obvius')
+							.field('username', obviusUser.username)
+							.field('password', obviusUser.password)
+							.field('mode', manifestRequestMode);
+
+					//should respond with 200, success
+					expect(res).to.have.status(200);
+
+					//get "all" config files to compare to response
+					const allConfigfiles = await Configfile.getAll(conn);
+					let response = '';
+					for (f of allConfigfiles) {
+						response += `CONFIGFILE,${f.makeFilename()},${f.hash},${f.created.format('YYYY-MM-DD hh:mm:ss')}`;
+					}
+
+					//the third line of the response should be the config file
+					expect(res.text.split("\n")[2]).equals(response);
+					});
+		});
 	});
 });

From c940d0599e8ed38b39064658a93424e2381f14a0 Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Wed, 20 Nov 2024 18:25:06 -0800
Subject: [PATCH 061/128] further investigation - no results yet

---
 src/server/test/web/obviusTest.js | 180 +++++++++++++++---------------
 1 file changed, 91 insertions(+), 89 deletions(-)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 00747dcae..68cb47a10 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -71,9 +71,9 @@ mocha.describe('Obvius API', () => {
 				//should respond with 406, not acceptable
 				expect(res).to.have.status(406);
 				//should also return expected message
-				expect(res.text).equals(`<pre>\nRequest must include mode parameter.\n</pre>\n`); 
+				expect(res.text).equals(`<pre>\nRequest must include mode parameter.\n</pre>\n`);
 			});
-			mocha.it('should accept status requests', async function ()  {
+			mocha.it('should accept status requests', async () => {
 				const conn = testDB.getConnection();
 				const password = 'password';
 				const hashedPassword = await bcrypt.hash(password, 10);
@@ -85,106 +85,108 @@ mocha.describe('Obvius API', () => {
 				//should respond with 200, success
 				expect(res).to.have.status(200);
 				//should also return expected message
-				expect(res.text).equals("<pre>\nSUCCESS\n</pre>\n"); 
+				expect(res.text).equals("<pre>\nSUCCESS\n</pre>\n");
 			});
-			mocha.it('should accept valid logfile uploads', async function () {
-				this.timeout(30000);
-		
+			mocha.it('should accept valid logfile uploads', async () => {
+				//PromiseRejectionHandledWarning originates here
 				const conn = testDB.getConnection();
 				const password = 'password';
 				const hashedPassword = await bcrypt.hash(password, 10);
 				const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
 				await obviusUser.insert(conn);
 				obviusUser.password = password;
-				const requestMode = 'LOGFILEUPLOAD';
-		
+				const logfileRequestMode = 'LOGFILEUPLOAD';
+				const configFileRequestMode = 'CONFIGFILEUPLOAD';
+
 				// Adapted from ../obvius/README.md
 				const logfilePath = 'src/server/test/web/obvius/mb-001.log.gz';
-				
+				const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
+
+
+				//the upload of a logfile is the subject of the test
+				const res = await chai.request(app)
+					.post('/api/obvius')
+					.field('username', obviusUser.username)
+					.field('password', obviusUser.password)
+					.field('mode', logfileRequestMode)
+					.field('serialnumber', 'mb-001')
+					.attach('files', logfilePath);
+
+				//should respond with 200, success
+				expect(res).to.have.status(200);
+				//should also return expected message
+				expect(res.text).equals("<pre>\nSUCCESS\nLogfile Upload IS PROVISIONAL</pre>\n");
+
+			});
+			mocha.it('should accept valid config file uploads', async () => {
+				const conn = testDB.getConnection();
+				const password = 'password';
+				const hashedPassword = await bcrypt.hash(password, 10);
+				const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
+				await obviusUser.insert(conn);
+				obviusUser.password = password;
+				const requestMode = 'CONFIGFILEUPLOAD';
+
+				// Adapted from ../obvius/README.md
+				const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
+
 				const res = await chai.request(app)
-						.post('/api/obvius')
-						.field('username', obviusUser.username)
-						.field('password', obviusUser.password)
-						.field('mode', requestMode)
-						.field('serialnumber', 'mb-001')
-						.attach('files', logfilePath);
-		
+					.post('/api/obvius')
+					.field('username', obviusUser.username)
+					.field('password', obviusUser.password)
+					.field('mode', requestMode)
+					.field('serialnumber', 'mb-001')
+					.field('modbusdevice', '1234')
+					.attach('files', configFilePath);
+
 				//should respond with 200, success
 				expect(res).to.have.status(200);
 				//should also return expected message
-				expect(res.text).equals("<pre>\nSUCCESS\nLogfile Upload IS PROVISIONAL</pre>\n"); 
-				});
-				mocha.it('should accept valid config file uploads', async function () {
-					this.timeout(30000);
-			
-					const conn = testDB.getConnection();
-					const password = 'password';
-					const hashedPassword = await bcrypt.hash(password, 10);
-					const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
-					await obviusUser.insert(conn);
-					obviusUser.password = password;
-					const requestMode = 'CONFIGFILEUPLOAD';
-			
-					// Adapted from ../obvius/README.md
-					const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
-					
-					const res = await chai.request(app)
-							.post('/api/obvius')
-							.field('username', obviusUser.username)
-							.field('password', obviusUser.password)
-							.field('mode', requestMode)
-							.field('serialnumber', 'mb-001')
-							.field('modbusdevice', '1234')
-							.attach('files', configFilePath);
-
-					//should respond with 200, success
-					expect(res).to.have.status(200);
-					//should also return expected message
-					expect(res.text).equals("<pre>\nSUCCESS\nAcquired config log with (pseudo)filename mb-001-mb-1234.ini.</pre>\n"); 
-					});
-				mocha.it('should return accurate config file manifests', async function () {
-					this.timeout(30000);
-			
-					const conn = testDB.getConnection();
-					const password = 'password';
-					const hashedPassword = await bcrypt.hash(password, 10);
-					const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
-					await obviusUser.insert(conn);
-					obviusUser.password = password;
-					const uploadRequestMode = 'CONFIGFILEUPLOAD';
-					const manifestRequestMode = 'CONFIGFILEMANIFEST';
-			
-					// Adapted from ../obvius/README.md
-					const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
-					
-					const upload = await chai.request(app)
-							.post('/api/obvius')
-							.field('username', obviusUser.username)
-							.field('password', obviusUser.password)
-							.field('mode', uploadRequestMode)
-							.field('serialnumber', 'mb-001')
-							.field('modbusdevice', '1234')
-							.attach('files', configFilePath);
-			
-					const res = await chai.request(app)
-							.post('/api/obvius')
-							.field('username', obviusUser.username)
-							.field('password', obviusUser.password)
-							.field('mode', manifestRequestMode);
-
-					//should respond with 200, success
-					expect(res).to.have.status(200);
-
-					//get "all" config files to compare to response
-					const allConfigfiles = await Configfile.getAll(conn);
-					let response = '';
-					for (f of allConfigfiles) {
-						response += `CONFIGFILE,${f.makeFilename()},${f.hash},${f.created.format('YYYY-MM-DD hh:mm:ss')}`;
-					}
-
-					//the third line of the response should be the config file
-					expect(res.text.split("\n")[2]).equals(response);
-					});
+				expect(res.text).equals("<pre>\nSUCCESS\nAcquired config log with (pseudo)filename mb-001-mb-1234.ini.</pre>\n");
+			});
+			mocha.it('should return accurate config file manifests', async () => {
+				const conn = testDB.getConnection();
+				const password = 'password';
+				const hashedPassword = await bcrypt.hash(password, 10);
+				const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
+				await obviusUser.insert(conn);
+				obviusUser.password = password;
+				const uploadRequestMode = 'CONFIGFILEUPLOAD';
+				const manifestRequestMode = 'CONFIGFILEMANIFEST';
+
+				// Adapted from ../obvius/README.md
+				const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
+				const upload = await chai.request(app)
+					.post('/api/obvius')
+					.field('username', obviusUser.username)
+					.field('password', obviusUser.password)
+					.field('mode', uploadRequestMode)
+					.field('serialnumber', 'mb-001')
+					.field('modbusdevice', '1234')
+					.attach('files', configFilePath);
+
+				const res = await chai.request(app)
+					.post('/api/obvius')
+					.field('username', obviusUser.username)
+					.field('password', obviusUser.password)
+					.field('mode', manifestRequestMode);
+
+				//logfile upload should respond with 200, success
+				expect(upload).to.have.status(200);
+
+				//logfile request should respond with 200, success
+				expect(res).to.have.status(200);
+
+				//get "all" config files to compare to response
+				const allConfigfiles = await Configfile.getAll(conn);
+				let response = '';
+				for (f of allConfigfiles) {
+					response += `CONFIGFILE,${f.makeFilename()},${f.hash},${f.created.format('YYYY-MM-DD hh:mm:ss')}`;
+				}
+
+				//the third line of the response should be the config file
+				expect(res.text.split("\n")[2]).equals(response);
+			});
 		});
 	});
 });

From f37d3804c4e36076d4c3589c9ef686dc4c3a5468 Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Wed, 20 Nov 2024 19:45:27 -0800
Subject: [PATCH 062/128] removed old components, moved all graphics and title
 into a single div, and changed tooltip style name.

---
 .../CreateCikVisualModalMapComponent.tsx      | 206 ----------------
 .../CreateVisualUnitModalMapComponent.tsx     | 220 ------------------
 .../visual-unit/VisualUnitDetailComponent.tsx |  21 +-
 3 files changed, 9 insertions(+), 438 deletions(-)
 delete mode 100644 src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
 delete mode 100644 src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx

diff --git a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
deleted file mode 100644
index 84c570901..000000000
--- a/src/client/app/components/visual-unit/CreateCikVisualModalMapComponent.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import * as d3 from 'd3';
-import { useEffect } from 'react';
-import { useIntl } from 'react-intl';
-import { selectCik } from '../../redux/api/conversionsApi';
-import { useAppSelector } from '../../redux/reduxHooks';
-import { selectAllUnits } from '../../redux/api/unitsApi';
-
-/**
- * Visual graph component that shows the result of OED's analysis on the
- * relationship between units and conversions entered by an admin. (Uses
- * Cik data for the conversion links).
- * @returns D3 force graph visual
- */
-export default function CreateCikVisualMapComponent() {
-	const intl = useIntl();
-
-	/* Get unit and Cik data from redux */
-	const unitData = useAppSelector(selectAllUnits);
-	const cikData = useAppSelector(selectCik);
-
-	/* creating color schema for nodes based on their unit type */
-	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
-	const colorSchema = d3.scaleOrdinal<string, string>()
-		.domain(['meter', 'unit', 'suffix', 'suffix.input'])
-		.range(colors);
-
-	/* Create data container to pass to D3 force graph */
-	const data: { nodes: any[], links: any[] } = {
-		nodes: [],
-		links: []
-	};
-
-	unitData.map(value =>
-		data.nodes.push({
-			'name': value.name,
-			'id': value.id,
-			'typeOfUnit': value.typeOfUnit,
-			'suffix' : value.suffix
-		})
-	);
-
-	cikData.map(function (value) {
-		data.links.push({
-			'source': value.meterUnitId,
-			'target': value.nonMeterUnitId,
-			'bidirectional': false
-		});
-	});
-
-	/* Visuals start here */
-	useEffect(() => {
-		/* View-box dimensions */
-		const width = window.innerWidth;
-		const height = 1000;
-
-		/* Grab data */
-		const nodes = data.nodes.map(d => ({...d}));
-		const links = data.links.map(d => ({...d}));
-
-		const simulation = d3.forceSimulation(nodes)
-			.force('link', d3.forceLink(links)
-				/* Set all link ids (from data.links) */
-				.id((d: any) => d.id)
-				/* This controls how long each link is */
-				.distance(120)
-			)
-			/* Create new many-body force */
-			.force('charge', d3.forceManyBody()
-				/* This controls the 'repelling' force on each node */
-				.strength(-800)
-			)
-			.force('x', d3.forceX())
-			.force('y', d3.forceY());
-
-		const svg = d3.select('#sample-cik')
-			.append('svg')
-			.attr('width', width)
-			.attr('height', height)
-			.attr('viewBox', [-width / 2, -height / 2, width, height])
-			.attr('style', 'max-width: 100%; height: auto;')
-			.append('g');
-
-		/* End arrow head */
-		svg.append('defs').append('marker')
-			.attr('id', 'arrow-end')
-			.attr('viewBox', '0 -5 10 10')
-			.attr('refX', 25)
-			.attr('refY', 0)
-			.attr('markerWidth', 4)
-			.attr('markerHeight', 4)
-			/* auto: point towards dest. node */
-			.attr('orient', 'auto')
-			.append('svg:path')
-			.attr('d', 'M0,-5L10,0L0,5');
-
-		/* Link style */
-		const link = svg.selectAll('line')
-			.data(links)
-			.enter().append('line')
-			.style('stroke', '#aaa')
-			.attr('stroke-width', 3)
-			.attr('marker-end', 'url(#arrow-end)');
-
-		/* Node style */
-		const node = svg.selectAll('.node')
-			.data(nodes)
-			.enter().append('circle')
-			/* Node radius */
-			.attr('r', 20)
-			/* checks if unit has a non empty suffix to color differently */
-			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix.input') : colorSchema(d.typeOfUnit));
-
-		/* Drag behavior */
-		node.call(d3.drag()
-			.on('start', dragstart)
-			.on('drag', dragged)
-			.on('end', dragend));
-
-		/* Node label style */
-		const label = svg.selectAll('.label')
-			.data(nodes)
-			.enter()
-			.append('text')
-			.text(function (d) { return d.name; })
-			.style('text-anchor', 'middle')
-			.style('fill', '#000')
-			.style('font-family', 'Arial')
-			.style('font-size', 14);
-
-		/* Update element positions when moved */
-		simulation.on('tick', () => {
-			link
-				.attr('x1', d => d.source.x)
-				.attr('y1', d => d.source.y)
-				.attr('x2', d => d.target.x)
-				.attr('y2', d => d.target.y);
-
-			node
-				.attr('cx', d => d.x)
-				.attr('cy', d => d.y);
-
-			label
-				.attr('x', function(d){ return d.x; })
-				.attr('y', function (d) {return d.y - 25; });
-		});
-
-		// eslint-disable-next-line jsdoc/require-jsdoc
-		function dragstart(event: any) {
-			if (!event.active) simulation.alphaTarget(0.3).restart();
-			event.subject.fx = event.subject.x;
-			event.subject.fy = event.subject.y;
-		}
-
-		// eslint-disable-next-line jsdoc/require-jsdoc
-		function dragged(event: any) {
-			event.subject.fx = event.x;
-			event.subject.fy = event.y;
-		}
-
-		// eslint-disable-next-line jsdoc/require-jsdoc
-		function dragend(event: any) {
-			if (!event.active) simulation.alphaTarget(0);
-			event.subject.fx = null;
-			event.subject.fy = null;
-		}
-
-		/* Color Legend */
-		const legend = svg.append('g')
-			.attr('transform', `translate(${-width / 2 + 20}, ${-height / 2 + 20})`);
-
-		colorSchema.domain().forEach((item, i) => {
-			const legendEntry = legend.append('g')
-				.attr('transform', `translate(0, ${i * 30})`);
-
-			// Rectangle color box
-			legendEntry.append('circle')
-				.attr('r', 15)
-				.attr('cx', 15) // Center the circle horizontally
-				.attr('cy', 15) // Center the circle vertically
-				.attr('fill', colorSchema(item));
-
-			// Text label
-			legendEntry.append('text')
-				.attr('x', 40) // Position the text to the right of the circle
-				.attr('y', 20) // Align the text vertically with the circle
-				.style('fill', '#000')
-				.style('font-size', '14px')
-				.style('alignment-middle', 'middle')
-				/* internationalizing color legend text */
-				.text(intl.formatMessage({id : `legend.graph.text.${item}`}));
-		});
-
-	// Empty dependency array to run the effect only once
-	}, []);
-
-	return (
-		<div>
-			<div id="sample-cik"></div>
-		</div>
-	);
-}
\ No newline at end of file
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
deleted file mode 100644
index 09f41fd8a..000000000
--- a/src/client/app/components/visual-unit/CreateVisualUnitModalMapComponent.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
-* License, v. 2.0. If a copy of the MPL was not distributed with this
-* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import * as d3 from 'd3';
-import { useEffect } from 'react';
-import { useIntl } from 'react-intl';
-import { useAppSelector } from '../../redux/reduxHooks';
-import { selectAllUnits } from '../../redux/api/unitsApi';
-import { selectConversionsDetails } from '../../redux/api/conversionsApi';
-
-/**
- * Visual graph component that shows the relationship between units and conversions
- * entered by an admin. (Uses conversion data for conversion links).
- * @returns D3 force graph visual
- */
-export default function CreateVisualUnitMapModalComponent() {
-	const intl = useIntl();
-
-	/* Get unit and conversion data from redux */
-	const unitData = useAppSelector(selectAllUnits);
-	const conversionData = useAppSelector(selectConversionsDetails);
-
-	/* creating color schema for nodes based on their unit type */
-	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
-	const colorSchema = d3.scaleOrdinal<string, string>()
-		.domain(['meter', 'unit', 'suffix', 'suffix.input'])
-		.range(colors);
-
-	/* Create data container to pass to D3 force graph */
-	const data: { nodes: any[], links: any[] } = {
-		nodes: [],
-		links: []
-	};
-	unitData.map(value =>
-		data.nodes.push({
-			'name': value.name,
-			'id': value.id,
-			'typeOfUnit': value.typeOfUnit,
-			'suffix': value.suffix
-		})
-	);
-	conversionData.map(value =>
-		data.links.push({
-			'source': value.sourceId,
-			'target': value.destinationId,
-			/* boolean value */
-			'bidirectional': value.bidirectional
-		})
-	);
-
-	/* Visuals start here */
-	useEffect(() => {
-		/* View-box dimensions */
-		const width = window.innerWidth;
-		const height = 750;
-
-		/* Grab data */
-		const nodes = data.nodes.map(d => ({...d}));
-		const links = data.links.map(d => ({...d}));
-
-		const simulation = d3.forceSimulation(nodes)
-			.force('link', d3.forceLink(links)
-				/* Set all link ids (from data.links) */
-				.id((d: any) => d.id)
-				/* This controls how long each link is */
-				.distance(90)
-			)
-			/* Create new many-body force */
-			.force('charge', d3.forceManyBody()
-				/* This controls the 'repelling' force on each node */
-				.strength(-500)
-			)
-			.force('x', d3.forceX())
-			.force('y', d3.forceY());
-
-		const svg = d3.select('#sample')
-			.append('svg')
-			.attr('width', width)
-			.attr('height', height)
-			.attr('viewBox', [-width / 2, -height / 2, width, height])
-			.attr('style', 'max-width: 100%; height: auto;')
-			.append('g');
-
-		/* End arrow head */
-		svg.append('defs').append('marker')
-			.attr('id', 'arrow-end')
-			.attr('viewBox', '0 -5 10 10')
-			.attr('refX', 25)
-			.attr('refY', 0)
-			.attr('markerWidth', 4)
-			.attr('markerHeight', 4)
-			/* auto: point towards dest. node */
-			.attr('orient', 'auto')
-			.append('svg:path')
-			.attr('d', 'M0,-5L10,0L0,5');
-
-		/* Start arrow head (for bidirectional edges) */
-		svg.append('defs').append('marker')
-			.attr('id', 'arrow-start')
-			.attr('viewBox', '0 -5 10 10')
-			.attr('refX', 25)
-			.attr('refY', 0)
-			.attr('markerWidth', 4)
-			.attr('markerHeight', 4)
-			/* auto-start-reverse: point towards src. node */
-			.attr('orient', 'auto-start-reverse')
-			.append('svg:path')
-			.attr('d', 'M0,-5L10,0L0,5');
-
-		/* Link style */
-		const link = svg.selectAll('line')
-			.data(links)
-			.enter().append('line')
-			.style('stroke', '#aaa')
-			.attr('stroke-width', 3)
-			.attr('marker-end', 'url(#arrow-end)')
-			/* Only draw start arrow head if bidirectional */
-			.attr('marker-start', d => d.bidirectional === true ? 'url(#arrow-start)' : '');
-
-		/* Node style */
-		const node = svg.selectAll('.node')
-			.data(nodes)
-			.enter().append('circle')
-			/* Node radius */
-			.attr('r', 20)
-			/* checks if unit has a non empty suffix to color differently */
-			.attr('fill', d => d.suffix && d.typeOfUnit === 'unit' ? colorSchema('suffix.input') : colorSchema(d.typeOfUnit));
-
-		/* Drag behavior */
-		node.call(d3.drag()
-			.on('start', dragstart)
-			.on('drag', dragged)
-			.on('end', dragend));
-
-		/* Node label style */
-		const label = svg.selectAll('.label')
-			.data(nodes)
-			.enter()
-			.append('text')
-			.text(function (d) { return d.name; })
-			.style('text-anchor', 'middle')
-			.style('fill', '#000')
-			.style('font-family', 'Arial')
-			.style('font-size', 14);
-
-		/* Update element positions when moved */
-		simulation.on('tick', () => {
-			link
-				.attr('x1', d => d.source.x)
-				.attr('y1', d => d.source.y)
-				.attr('x2', d => d.target.x)
-				.attr('y2', d => d.target.y);
-
-			node
-				.attr('cx', d => d.x)
-				.attr('cy', d => d.y);
-
-			label
-				.attr('x', function(d){ return d.x; })
-				.attr('y', function (d) {return d.y - 25; });
-		});
-
-		// eslint-disable-next-line jsdoc/require-jsdoc
-		function dragstart(event: any) {
-			if (!event.active) simulation.alphaTarget(0.3).restart();
-			event.subject.fx = event.subject.x;
-			event.subject.fy = event.subject.y;
-		}
-
-		// eslint-disable-next-line jsdoc/require-jsdoc
-		function dragged(event: any) {
-			event.subject.fx = event.x;
-			event.subject.fy = event.y;
-		}
-
-		// eslint-disable-next-line jsdoc/require-jsdoc
-		function dragend(event: any) {
-			if (!event.active) simulation.alphaTarget(0);
-			event.subject.fx = null;
-			event.subject.fy = null;
-		}
-
-		/* Color Legend */
-		const legend = svg.append('g')
-			.attr('transform', `translate(${-width / 2 + 20}, ${-height / 2 + 20})`);
-
-		colorSchema.domain().forEach((item, i) => {
-			const legendEntry = legend.append('g')
-				.attr('transform', `translate(0, ${i * 30})`);
-
-			// Rectangle color box
-			legendEntry.append('circle')
-				.attr('r', 15)
-				.attr('cx', 15) // Center the circle horizontally
-				.attr('cy', 15) // Center the circle vertically
-				.attr('fill', colorSchema(item));
-
-			// Text label
-			legendEntry.append('text')
-				.attr('x', 40) // Position the text to the right of the circle
-				.attr('y', 20) // Align the text vertically with the circle
-				.style('fill', '#000')
-				.style('font-size', '14px')
-				.style('alignment-middle', 'middle')
-				/* internationalizing color legend text */
-				.text(intl.formatMessage({id : `legend.graph.text.${item}`}));
-		});
-
-	// Empty dependency array to run the effect only once
-	}, []);
-
-	return (
-		<div>
-			<div id="sample"></div>
-		</div>
-	);
-
-}
\ No newline at end of file
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 1cd69ce71..28f86eeb3 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -28,7 +28,7 @@ export default function VisualUnitDetailComponent() {
 		textAlign: 'center'
 	};
 
-	const tooltipStyle = {
+	const seeUnitVisualizationPageStyle = {
 		display: 'inline-block',
 		fontSize: '50%',
 		// For now, only an admin can see the unit page.
@@ -42,29 +42,26 @@ export default function VisualUnitDetailComponent() {
 			<div className='container-fluid'>
 				<h1 style={titleStyle}>
 					<FormattedMessage id='units.conversion.page.title' />
-					<div style={tooltipStyle}>
-						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
+					<div style={seeUnitVisualizationPageStyle}>
+						<TooltipMarkerComponent page='visual-unit' helpTextId={seeUnitVisualizationPageStyle.tooltipVisualUnitView} />
 					</div>
 				</h1>
-				<br/>
 
 				<h2 style={titleStyle}>
 					<FormattedMessage id='visual.input.units.graphic' />
 				</h2>
-			</div>
 
-			<div style={titleStyle}>
-				<CreateVisualUnitComponent units={unitData} conversions={conversionData}/>
-			</div>
+				<div style={titleStyle}>
+					<CreateVisualUnitComponent units={unitData} conversions={conversionData}/>
+				</div>
 
-			<div className='container-fluid'>
 				<h2 style={titleStyle}>
 					<FormattedMessage id='visual.analyzed.units.graphic' />
 				</h2>
-			</div>
 
-			<div style={titleStyle}>
-				<CreateVisualUnitComponent units={unitData} conversions={cikData} isCik/>
+				<div style={titleStyle}>
+					<CreateVisualUnitComponent units={unitData} conversions={cikData} isCik/>
+				</div>
 			</div>
 		</div>
 	);

From dfa4a90698fe9b8f78931bb023cc95057da6c4d4 Mon Sep 17 00:00:00 2001
From: Rolando Chagolla <123438125+rchagolla@users.noreply.github.com>
Date: Thu, 21 Nov 2024 03:46:27 -0500
Subject: [PATCH 063/128] Removed unused imports in CreateVisualUnitComponent

---
 .../visual-unit/CreateVisualUnitComponent.tsx        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
index 6c7a4184a..e22b22ba4 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
@@ -6,23 +6,21 @@ import * as React from 'react';
 import * as d3 from 'd3';
 import { useEffect } from 'react';
 import { useIntl } from 'react-intl';
-// import { useAppSelector } from '../../redux/reduxHooks';
 import { UnitData } from 'types/redux/units';
 import { ConversionData } from 'types/redux/conversions';
 import { CikData } from 'types/redux/ciks';
-// import { selectAllUnits } from '../../redux/api/unitsApi';
 
-/**
- * Visual graph component that shows the relationship between units and conversions
- * entered by an admin.
- * @returns D3 force graph visual
- */
 interface CreateVisualUnitProps {
 	units: UnitData[];
 	conversions: ConversionData[] | CikData[];
 	isCik?: boolean;
 }
 
+/**
+ * Visual graph component that shows the relationship between units and conversions
+ * entered by an admin.
+ * @returns D3 force graph visual
+ */
 export const CreateVisualUnitComponent: React.FC<CreateVisualUnitProps> = ({
 	units,
 	conversions,

From 070f979d9f204c011e212a99f75ef218099ea8bd Mon Sep 17 00:00:00 2001
From: rchagolla <rchagollabonilla@csumb.edu>
Date: Thu, 21 Nov 2024 16:20:06 -0800
Subject: [PATCH 064/128] changed page name and moved unit data from redux to
 the visual component.

---
 src/client/app/components/RouteComponent.tsx    |  4 ++--
 .../visual-unit/CreateVisualUnitComponent.tsx   | 17 +++++++++--------
 ...mponent.tsx => SeeUnitVisualizationPage.tsx} | 16 +++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)
 rename src/client/app/components/visual-unit/{VisualUnitDetailComponent.tsx => SeeUnitVisualizationPage.tsx} (73%)

diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
index cdf4389a3..cbb569e27 100644
--- a/src/client/app/components/RouteComponent.tsx
+++ b/src/client/app/components/RouteComponent.tsx
@@ -25,7 +25,7 @@ import RoleOutlet from './router/RoleOutlet';
 import UnitsDetailComponent from './unit/UnitsDetailComponent';
 import ErrorComponent from './router/ErrorComponent';
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
-import VisualUnitDetailComponent from './visual-unit/VisualUnitDetailComponent';
+import SeeUnitVisualizationPage from './visual-unit/SeeUnitVisualizationPage';
 
 /**
  * @returns the router component Responsible for client side routing.
@@ -60,7 +60,7 @@ const router = createBrowserRouter([
 					{ path: 'maps', element: <MapsDetailContainer /> },
 					{ path: 'units', element: <UnitsDetailComponent /> },
 					{ path: 'users', element: <UsersDetailComponent /> },
-					{ path: 'visual-unit', element: <VisualUnitDetailComponent/> }
+					{ path: 'visual-unit', element: <SeeUnitVisualizationPage/> }
 				]
 			},
 			{
diff --git a/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx b/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
index e22b22ba4..e9e70757a 100644
--- a/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
+++ b/src/client/app/components/visual-unit/CreateVisualUnitComponent.tsx
@@ -6,27 +6,28 @@ import * as React from 'react';
 import * as d3 from 'd3';
 import { useEffect } from 'react';
 import { useIntl } from 'react-intl';
-import { UnitData } from 'types/redux/units';
+import { useAppSelector } from '../../redux/reduxHooks';
 import { ConversionData } from 'types/redux/conversions';
 import { CikData } from 'types/redux/ciks';
-
-interface CreateVisualUnitProps {
-	units: UnitData[];
-	conversions: ConversionData[] | CikData[];
-	isCik?: boolean;
-}
+import { selectAllUnits } from '../../redux/api/unitsApi';
 
 /**
  * Visual graph component that shows the relationship between units and conversions
  * entered by an admin.
  * @returns D3 force graph visual
  */
+interface CreateVisualUnitProps {
+	conversions: ConversionData[] | CikData[];
+	isCik?: boolean;
+}
+
 export const CreateVisualUnitComponent: React.FC<CreateVisualUnitProps> = ({
-	units,
 	conversions,
 	isCik = false
 }) => {
 	const intl = useIntl();
+	/* Get unit data from redux */
+	const units = useAppSelector(selectAllUnits);
 
 	/* creating color schema for nodes based on their unit type */
 	const colors = ['#1F77B4', '#2CA02C', '#fd7e14', '#e377c2'];
diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/SeeUnitVisualizationPage.tsx
similarity index 73%
rename from src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
rename to src/client/app/components/visual-unit/SeeUnitVisualizationPage.tsx
index 28f86eeb3..b0bbb47e0 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/SeeUnitVisualizationPage.tsx
@@ -10,15 +10,13 @@ import TooltipMarkerComponent from '../TooltipMarkerComponent';
 import { selectCik } from '../../redux/api/conversionsApi';
 import { selectConversionsDetails } from '../../redux/api/conversionsApi';
 import { useAppSelector } from '../../redux/reduxHooks';
-import { selectAllUnits } from '../../redux/api/unitsApi';
 
 /**
  * Defines the units and conversion graphics view.
  * @returns Units visual graphics page element
  */
-export default function VisualUnitDetailComponent() {
-	/* Get unit and conversion data from redux */
-	const unitData = useAppSelector(selectAllUnits);
+export default function SeeUnitVisualizationPage() {
+	/* Get conversion data from redux */
 	const conversionData = useAppSelector(selectConversionsDetails);
 	const cikData = useAppSelector(selectCik);
 
@@ -28,7 +26,7 @@ export default function VisualUnitDetailComponent() {
 		textAlign: 'center'
 	};
 
-	const seeUnitVisualizationPageStyle = {
+	const tooltipStyle = {
 		display: 'inline-block',
 		fontSize: '50%',
 		// For now, only an admin can see the unit page.
@@ -42,8 +40,8 @@ export default function VisualUnitDetailComponent() {
 			<div className='container-fluid'>
 				<h1 style={titleStyle}>
 					<FormattedMessage id='units.conversion.page.title' />
-					<div style={seeUnitVisualizationPageStyle}>
-						<TooltipMarkerComponent page='visual-unit' helpTextId={seeUnitVisualizationPageStyle.tooltipVisualUnitView} />
+					<div style={tooltipStyle}>
+						<TooltipMarkerComponent page='visual-unit' helpTextId={tooltipStyle.tooltipVisualUnitView} />
 					</div>
 				</h1>
 
@@ -52,7 +50,7 @@ export default function VisualUnitDetailComponent() {
 				</h2>
 
 				<div style={titleStyle}>
-					<CreateVisualUnitComponent units={unitData} conversions={conversionData}/>
+					<CreateVisualUnitComponent conversions={conversionData}/>
 				</div>
 
 				<h2 style={titleStyle}>
@@ -60,7 +58,7 @@ export default function VisualUnitDetailComponent() {
 				</h2>
 
 				<div style={titleStyle}>
-					<CreateVisualUnitComponent units={unitData} conversions={cikData} isCik/>
+					<CreateVisualUnitComponent conversions={cikData} isCik/>
 				</div>
 			</div>
 		</div>

From 12cc6b4dc391a46a812e80ccacab6e3624daca62 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Thu, 21 Nov 2024 19:21:49 -0600
Subject: [PATCH 065/128] put back component name

---
 src/client/app/components/RouteComponent.tsx                  | 4 ++--
 ...nitVisualizationPage.tsx => VisualUnitDetailComponent.tsx} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/client/app/components/visual-unit/{SeeUnitVisualizationPage.tsx => VisualUnitDetailComponent.tsx} (97%)

diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
index cbb569e27..cdf4389a3 100644
--- a/src/client/app/components/RouteComponent.tsx
+++ b/src/client/app/components/RouteComponent.tsx
@@ -25,7 +25,7 @@ import RoleOutlet from './router/RoleOutlet';
 import UnitsDetailComponent from './unit/UnitsDetailComponent';
 import ErrorComponent from './router/ErrorComponent';
 import { selectSelectedLanguage } from '../redux/slices/appStateSlice';
-import SeeUnitVisualizationPage from './visual-unit/SeeUnitVisualizationPage';
+import VisualUnitDetailComponent from './visual-unit/VisualUnitDetailComponent';
 
 /**
  * @returns the router component Responsible for client side routing.
@@ -60,7 +60,7 @@ const router = createBrowserRouter([
 					{ path: 'maps', element: <MapsDetailContainer /> },
 					{ path: 'units', element: <UnitsDetailComponent /> },
 					{ path: 'users', element: <UsersDetailComponent /> },
-					{ path: 'visual-unit', element: <SeeUnitVisualizationPage/> }
+					{ path: 'visual-unit', element: <VisualUnitDetailComponent/> }
 				]
 			},
 			{
diff --git a/src/client/app/components/visual-unit/SeeUnitVisualizationPage.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
similarity index 97%
rename from src/client/app/components/visual-unit/SeeUnitVisualizationPage.tsx
rename to src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index b0bbb47e0..7044e86fd 100644
--- a/src/client/app/components/visual-unit/SeeUnitVisualizationPage.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -15,7 +15,7 @@ import { useAppSelector } from '../../redux/reduxHooks';
  * Defines the units and conversion graphics view.
  * @returns Units visual graphics page element
  */
-export default function SeeUnitVisualizationPage() {
+export default function VisualUnitDetailComponent() {
 	/* Get conversion data from redux */
 	const conversionData = useAppSelector(selectConversionsDetails);
 	const cikData = useAppSelector(selectCik);
@@ -63,4 +63,4 @@ export default function SeeUnitVisualizationPage() {
 			</div>
 		</div>
 	);
-}
\ No newline at end of file
+}

From ba2b0d721f06ee4778f474769a7ee6b25f0d7e6c Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Thu, 21 Nov 2024 19:23:44 -0600
Subject: [PATCH 066/128] fix comment per PR comment

---
 .../app/components/visual-unit/VisualUnitDetailComponent.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
index 7044e86fd..bc4e8dc28 100644
--- a/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
+++ b/src/client/app/components/visual-unit/VisualUnitDetailComponent.tsx
@@ -29,7 +29,7 @@ export default function VisualUnitDetailComponent() {
 	const tooltipStyle = {
 		display: 'inline-block',
 		fontSize: '50%',
-		// For now, only an admin can see the unit page.
+		// For now, only an admin can see the unit visualization page.
 		tooltipVisualUnitView: 'help.admin.unitconversionvisuals'
 	};
 

From 391a0e7075e96217618f7b6a16af1a0fbf53ad04 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Thu, 21 Nov 2024 19:36:02 -0600
Subject: [PATCH 067/128] obvius test fixes & Obvius code

- Add kWh to DB before many tests so available.
- Have log upload wait to complete before returning
---
 src/server/routes/obvius.js       | 19 +++++++++++++++----
 src/server/test/web/obviusTest.js | 30 ++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/server/routes/obvius.js b/src/server/routes/obvius.js
index 19bad6443..d2a7ad785 100644
--- a/src/server/routes/obvius.js
+++ b/src/server/routes/obvius.js
@@ -100,7 +100,7 @@ function handleStatus(req, res) {
 /**
  * Logs the Obvius request and sets the req.IP field to be the ip address.
  */
-function obviusLog(req, res, next){
+function obviusLog(req, res, next) {
 	// Log the IP of the requester
 	const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
 	req.IP = ip;
@@ -111,7 +111,7 @@ function obviusLog(req, res, next){
 /**
  * Verifies an Obvius request via username and password.
  */
-function verifyObviusUser(req, res, next){
+function verifyObviusUser(req, res, next) {
 	// First we ensure that the password and username parameters are provided.
 	const password = req.param('password');
 	// TODO This is allowing for backwards compatibility if previous obvius meters are using the'email' parameter
@@ -157,6 +157,7 @@ router.all('/', obviusLog, verifyObviusUser, async (req, res) => {
 			return;
 		}
 		const conn = getConnection();
+		const loadLogfilePromises = [];
 		for (const fx of req.files) {
 			log.info(`Received ${fx.fieldname}: ${fx.originalname}`);
 			// Logfiles are always gzipped.
@@ -168,9 +169,19 @@ router.all('/', obviusLog, verifyObviusUser, async (req, res) => {
 				failure(req, res, `Unable to gunzip incoming buffer: ${err}`);
 				return;
 			}
-			loadLogfileToReadings(req.param('serialnumber'), ip, data, conn);
+			// The original code did not await for the Promise to finish. The new version
+			// allows the files to run in parallel (as before) but then wait for them all
+			// to finish before returning.
+			loadLogfilePromises.push(loadLogfileToReadings(req.param('serialnumber'), ip, data, conn));
 		}
-		success(req, res, 'Logfile Upload IS PROVISIONAL');
+		// TODO This version returns an error. Should check all usage to be sure it is properly handled.
+		Promise.all(loadLogfilePromises).then(() => {
+			success(req, res, 'Logfile Upload IS PROVISIONAL');
+		}).catch((err) => {
+			log.warn(`Logfile Upload had issues from ip: ${ip}`, err)
+			failure(req, res, 'Logfile Upload had issues');
+		});
+		// This return may not be needed.
 		return;
 	}
 
diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 68cb47a10..48630a27a 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -9,6 +9,8 @@ const { chai, mocha, expect, app, testDB, testUser } = require('../common');
 const User = require('../../models/User');
 const Configfile = require('../../models/obvius/Configfile');
 const bcrypt = require('bcryptjs');
+const { insertUnits } = require('../../util/insertData');
+const Unit = require('../../models/Unit');
 
 mocha.describe('Obvius API', () => {
 	mocha.describe('upload: ', () => {
@@ -60,8 +62,25 @@ mocha.describe('Obvius API', () => {
 			}
 		});
 		mocha.describe('obvius request modes', async () => {
-			mocha.it('should reject requests without a mode', async () => {
+			mocha.beforeEach(async () => {
 				const conn = testDB.getConnection();
+				// The kWh unit is not used in all tests but easier to just put in.
+				const unitData = [
+					{
+						name: 'kWh',
+						identifier: '',
+						unitRepresent: Unit.unitRepresentType.QUANTITY,
+						secInRate: 3600,
+						typeOfUnit: Unit.unitType.UNIT,
+						suffix: '',
+						displayable: Unit.displayableType.ALL,
+						preferredDisplay: true,
+						note: 'OED created standard unit'
+					}
+				];
+				await insertUnits(unitData, false, conn);
+			});
+			mocha.it('should reject requests without a mode', async () => {
 				const password = 'password';
 				const hashedPassword = await bcrypt.hash(password, 10);
 				const obviusUser = new User(undefined, 'obivus@example.com', hashedPassword, User.role.OBVIUS);
@@ -74,7 +93,6 @@ mocha.describe('Obvius API', () => {
 				expect(res.text).equals(`<pre>\nRequest must include mode parameter.\n</pre>\n`);
 			});
 			mocha.it('should accept status requests', async () => {
-				const conn = testDB.getConnection();
 				const password = 'password';
 				const hashedPassword = await bcrypt.hash(password, 10);
 				const obviusUser = new User(undefined, 'obivus@example.com', hashedPassword, User.role.OBVIUS);
@@ -88,20 +106,15 @@ mocha.describe('Obvius API', () => {
 				expect(res.text).equals("<pre>\nSUCCESS\n</pre>\n");
 			});
 			mocha.it('should accept valid logfile uploads', async () => {
-				//PromiseRejectionHandledWarning originates here
-				const conn = testDB.getConnection();
 				const password = 'password';
 				const hashedPassword = await bcrypt.hash(password, 10);
 				const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
 				await obviusUser.insert(conn);
 				obviusUser.password = password;
 				const logfileRequestMode = 'LOGFILEUPLOAD';
-				const configFileRequestMode = 'CONFIGFILEUPLOAD';
 
 				// Adapted from ../obvius/README.md
 				const logfilePath = 'src/server/test/web/obvius/mb-001.log.gz';
-				const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
-
 
 				//the upload of a logfile is the subject of the test
 				const res = await chai.request(app)
@@ -111,7 +124,6 @@ mocha.describe('Obvius API', () => {
 					.field('mode', logfileRequestMode)
 					.field('serialnumber', 'mb-001')
 					.attach('files', logfilePath);
-
 				//should respond with 200, success
 				expect(res).to.have.status(200);
 				//should also return expected message
@@ -119,7 +131,6 @@ mocha.describe('Obvius API', () => {
 
 			});
 			mocha.it('should accept valid config file uploads', async () => {
-				const conn = testDB.getConnection();
 				const password = 'password';
 				const hashedPassword = await bcrypt.hash(password, 10);
 				const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);
@@ -145,7 +156,6 @@ mocha.describe('Obvius API', () => {
 				expect(res.text).equals("<pre>\nSUCCESS\nAcquired config log with (pseudo)filename mb-001-mb-1234.ini.</pre>\n");
 			});
 			mocha.it('should return accurate config file manifests', async () => {
-				const conn = testDB.getConnection();
 				const password = 'password';
 				const hashedPassword = await bcrypt.hash(password, 10);
 				const obviusUser = new User(undefined, 'obvius@example.com', hashedPassword, User.role.OBVIUS);

From 05b6b66bd6e8df55e01b91a9f8f75a55131efce1 Mon Sep 17 00:00:00 2001
From: gballreich <garrett.ballreich101@gmail.com>
Date: Sun, 24 Nov 2024 12:15:23 -0800
Subject: [PATCH 068/128] added tests and sql

---
 .../sql/unit/get_area_unit_types_enum.sql     |  1 +
 src/server/sql/user/get_user_type_enum.sql    |  5 ++
 src/server/test/db/enumTests.js               | 55 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/server/sql/unit/get_area_unit_types_enum.sql
 create mode 100644 src/server/sql/user/get_user_type_enum.sql

diff --git a/src/server/sql/unit/get_area_unit_types_enum.sql b/src/server/sql/unit/get_area_unit_types_enum.sql
new file mode 100644
index 000000000..58ff46cf2
--- /dev/null
+++ b/src/server/sql/unit/get_area_unit_types_enum.sql
@@ -0,0 +1 @@
+SELECT unnest(enum_range(NULL::area_unit_type));
\ No newline at end of file
diff --git a/src/server/sql/user/get_user_type_enum.sql b/src/server/sql/user/get_user_type_enum.sql
new file mode 100644
index 000000000..34769e6f4
--- /dev/null
+++ b/src/server/sql/user/get_user_type_enum.sql
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+SELECT unnest(enum_range(NULL::user_type));
\ No newline at end of file
diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index 1ac7f1264..7455a32f0 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -3,11 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const Meter = require('../../models/Meter');
+const User = require('../../models/User');
+const Unit = require('../../models/Unit');
+
 const Database = require('../../models/database');
 const DB = require('../../db');
 const { expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
 const { mocha, expect } = require('../common');
-
+//METER_TYPE ENUM
 mocha.describe('Enums JS to DB', () => {
 	mocha.it('can equate Meter.type to SQL enum', async () => {
         const conn = DB.getConnection();
@@ -31,3 +34,53 @@ mocha.describe('Enums JS to DB', () => {
         })
     })
 })
+//USER_TYPE ENUM
+//checked length first
+//need to add sql file to the testing folder 
+mocha.describe('Enums JS to DB', () => {
+	mocha.it('can equate User.role to SQL enum', async () => {
+        const conn = DB.getConnection();
+        let serverEnum = [];
+        let jsObject = [];
+        conn.result(Database.sqlFile('user/get_user_type_enum.sql')).then(data => {
+            let resultArray = data.rows;
+            resultArray.forEach((item) =>{
+                serverEnum.push(item.unnest);
+            });
+            for(let key in User.role) {
+                if (User.role.hasOwnProperty(key)) {
+                    let value = User.role[key];
+                    jsObject.push(value);
+                }
+            }
+            serverEnum.sort();
+            jsObject.sort();
+            expect(serverEnum.length).to.equal(jsObject.length);
+            expect(serverEnum.toString()).to.equal(jsObject.toString());
+        })
+    })
+})
+//AREA_UNIT_TYPE
+mocha.describe('Enums JS to DB', () => {
+	mocha.it('can equate Unit.areaUnitType to SQL enum', async () => {
+        const conn = DB.getConnection();
+        let serverEnum = [];
+        let jsObject = [];
+        conn.result(Database.sqlFile('unit/get_area_unit_types.sql')).then(data => {
+            let resultArray = data.rows;
+            resultArray.forEach((item) =>{
+                serverEnum.push(item.unnest);
+            });
+            for(let key in User.role) {
+                if (Unit.areaUnitType.hasOwnProperty(key)) {
+                    let value = User.role[key];
+                    jsObject.push(value);
+                }
+            }
+            serverEnum.sort();
+            jsObject.sort();
+            expect(serverEnum.length).to.equal(jsObject.length);
+            expect(serverEnum.toString()).to.equal(jsObject.toString());
+        })
+    })
+})
\ No newline at end of file

From 48b423cdf9fc927dba9d51f71c9f596f962fad0f Mon Sep 17 00:00:00 2001
From: DPJProgramming <cheesyd64@hotmail.com>
Date: Sun, 24 Nov 2024 13:29:18 -0800
Subject: [PATCH 069/128] added unit type enum test to enumTest.js

---
 src/server/test/db/enumTests.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index 7455a32f0..233b07799 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -83,4 +83,32 @@ mocha.describe('Enums JS to DB', () => {
             expect(serverEnum.toString()).to.equal(jsObject.toString());
         })
     })
+
+    //test unit_types
+    mocha.it('can equate unit.unitType to SQL enum', async () => {
+        const conn = DB.getConnection();
+        let serverEnum = [];
+        let jsEnum = [];
+        conn.result(Database.sqlFile('unit/get_unit_types_enum.sql')).then(data => {
+            //need sql inlin code for getting unit enum SELECT unnest(enum_range(NULL::unit_type));
+            let resultArray = data.rows;
+            resultArray.forEach((item) =>{
+                serverEnum.push(item.unnest);
+            });
+            for(let key in Unit.unitType) {
+                if (Unit.unitType.hasOwnProperty(key)) {
+                    let value = Unit.unitType[key];
+                    jsEnum.push(value);
+                }
+            }
+            serverEnum.sort();
+            jsEnum.sort();
+            // console.log("server: " + serverEnum.toString())
+            // console.log("js: " + jsEnum.toString())
+            expect(serverEnum.toString()).to.equal(jsEnum.toString());
+            expect(serverEnum.length).to.equal(jsEnum.length);
+            // expectArrayOfUnitsToBeEquivalent(serverEnum, jsEnum);
+            // expectCompareToEqualExpected(serverEnum.length, jsEnum.length);
+        })
+    })
 })
\ No newline at end of file

From 53971623168da753629f439ef6a8af6b3e68e801 Mon Sep 17 00:00:00 2001
From: Eboyd3443 <ETBoyd@proton.me>
Date: Sun, 24 Nov 2024 14:27:03 -0800
Subject: [PATCH 070/128] Add displayable_type test. Incorporate SQL code into
 tests.

---
 src/server/sql/meter/get_meter_enum.sql       |   5 -
 .../sql/unit/get_area_unit_types_enum.sql     |   1 -
 src/server/sql/user/get_user_type_enum.sql    |   5 -
 src/server/test/db/enumTests.js               | 192 +++++++++++-------
 4 files changed, 115 insertions(+), 88 deletions(-)
 delete mode 100644 src/server/sql/meter/get_meter_enum.sql
 delete mode 100644 src/server/sql/unit/get_area_unit_types_enum.sql
 delete mode 100644 src/server/sql/user/get_user_type_enum.sql

diff --git a/src/server/sql/meter/get_meter_enum.sql b/src/server/sql/meter/get_meter_enum.sql
deleted file mode 100644
index 95b3c37f9..000000000
--- a/src/server/sql/meter/get_meter_enum.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-SELECT unnest(enum_range(NULL::meter_type));
\ No newline at end of file
diff --git a/src/server/sql/unit/get_area_unit_types_enum.sql b/src/server/sql/unit/get_area_unit_types_enum.sql
deleted file mode 100644
index 58ff46cf2..000000000
--- a/src/server/sql/unit/get_area_unit_types_enum.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT unnest(enum_range(NULL::area_unit_type));
\ No newline at end of file
diff --git a/src/server/sql/user/get_user_type_enum.sql b/src/server/sql/user/get_user_type_enum.sql
deleted file mode 100644
index 34769e6f4..000000000
--- a/src/server/sql/user/get_user_type_enum.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-SELECT unnest(enum_range(NULL::user_type));
\ No newline at end of file
diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index 233b07799..05d7d3160 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -10,78 +10,116 @@ const Database = require('../../models/database');
 const DB = require('../../db');
 const { expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
 const { mocha, expect } = require('../common');
-//METER_TYPE ENUM
+
 mocha.describe('Enums JS to DB', () => {
+    //meter_type ENUM
 	mocha.it('can equate Meter.type to SQL enum', async () => {
-        const conn = DB.getConnection();
-        let serverEnum = [];
-        let jsObject = [];
-        conn.result(Database.sqlFile('meter/get_meter_enum.sql')).then(data => {
-            let resultArray = data.rows;
-            resultArray.forEach((item) =>{
-                serverEnum.push(item.unnest);
-            });
-            for(let key in Meter.type) {
-                if (Meter.type.hasOwnProperty(key)) {
-                    let value = Meter.type[key];
-                    jsObject.push(value);
-                }
-            }
-            serverEnum.sort();
-            jsObject.sort();
-            expect(serverEnum.toString()).to.equal(jsObject.toString());
-            expect(serverEnum.length).to.equal(jsObject.length);
-        })
-    })
-})
-//USER_TYPE ENUM
-//checked length first
-//need to add sql file to the testing folder 
-mocha.describe('Enums JS to DB', () => {
+		const conn = DB.getConnection();
+		let serverEnum = [];
+		let jsObject = [];
+		await conn.result('SELECT unnest(enum_range(NULL::meter_type));')
+			.then(data => {
+				let resultArray = data.rows;
+				resultArray.forEach((item) =>{
+					serverEnum.push(item.unnest);
+				});
+				for(let key in Meter.type) {
+					if (Meter.type.hasOwnProperty(key)) {
+						let value = Meter.type[key];
+						jsObject.push(value);
+					}
+				}
+				serverEnum.sort();
+				jsObject.sort();
+                console.log(serverEnum.toString());
+                console.log(jsObject.toString());
+				expect(serverEnum.length).to.equal(jsObject.length);
+				expect(serverEnum.toString()).to.equal(jsObject.toString());
+			}
+        )
+	})
+
+    //displayable_type ENUM
+	mocha.it('can equate displayableType to SQL enum', async () => {
+		const conn = DB.getConnection();
+		let serverEnum = [];
+		let jsObject = [];
+		await conn.result('SELECT unnest(enum_range(NULL::displayable_type));')
+			.then(data => {
+				let resultArray = data.rows;
+				resultArray.forEach((item) =>{
+					serverEnum.push(item.unnest);
+				});
+				for(let key in Unit.displayableType) {
+					if (Unit.displayableType.hasOwnProperty(key)) {
+						let value = Unit.displayableType[key];
+						jsObject.push(value);
+                    }
+				}
+				serverEnum.sort();
+				jsObject.sort();
+                console.log("DB",serverEnum.toString());
+                console.log("JS",jsObject.toString());
+				expect(serverEnum.length).to.equal(jsObject.length);
+				expect(serverEnum.toString()).to.equal(jsObject.toString());
+			}
+        )
+	})
+
+    //USER_TYPE ENUM
+    //checked length first
+    //need to add sql file to the testing folder 
 	mocha.it('can equate User.role to SQL enum', async () => {
         const conn = DB.getConnection();
         let serverEnum = [];
         let jsObject = [];
-        conn.result(Database.sqlFile('user/get_user_type_enum.sql')).then(data => {
-            let resultArray = data.rows;
-            resultArray.forEach((item) =>{
-                serverEnum.push(item.unnest);
-            });
-            for(let key in User.role) {
-                if (User.role.hasOwnProperty(key)) {
-                    let value = User.role[key];
-                    jsObject.push(value);
+        await conn.result('SELECT unnest(enum_range(NULL::user_type));')
+            .then(data => {
+                let resultArray = data.rows;
+                resultArray.forEach((item) =>{
+                    serverEnum.push(item.unnest);
+                });
+                for(let key in User.role) {
+                    if (User.role.hasOwnProperty(key)) {
+                        let value = User.role[key];
+                        jsObject.push(value);
+                    }
                 }
+                serverEnum.sort();
+                jsObject.sort();
+                console.log(serverEnum.toString());
+                console.log(jsObject.toString());
+                expect(serverEnum.length).to.equal(jsObject.length);
+                expect(serverEnum.toString()).to.equal(jsObject.toString());
             }
-            serverEnum.sort();
-            jsObject.sort();
-            expect(serverEnum.length).to.equal(jsObject.length);
-            expect(serverEnum.toString()).to.equal(jsObject.toString());
-        })
+        )
     })
-})
-//AREA_UNIT_TYPE
-mocha.describe('Enums JS to DB', () => {
+
+    //AREA_UNIT_TYPE
 	mocha.it('can equate Unit.areaUnitType to SQL enum', async () => {
         const conn = DB.getConnection();
         let serverEnum = [];
         let jsObject = [];
-        conn.result(Database.sqlFile('unit/get_area_unit_types.sql')).then(data => {
-            let resultArray = data.rows;
-            resultArray.forEach((item) =>{
-                serverEnum.push(item.unnest);
-            });
-            for(let key in User.role) {
-                if (Unit.areaUnitType.hasOwnProperty(key)) {
-                    let value = User.role[key];
-                    jsObject.push(value);
+        await conn.result('SELECT unnest(enum_range(NULL::area_unit_type));')
+            .then(data => {
+                let resultArray = data.rows;
+                resultArray.forEach((item) =>{
+                    serverEnum.push(item.unnest);
+                });
+                for(let key in Unit.areaUnitType) {
+                    if (Unit.areaUnitType.hasOwnProperty(key)) {
+                        let value = Unit.areaUnitType[key];
+                        jsObject.push(value);
+                    }
                 }
+                serverEnum.sort();
+                jsObject.sort();
+                console.log(serverEnum.toString());
+                console.log(jsObject.toString());
+                expect(serverEnum.length).to.equal(jsObject.length);
+                expect(serverEnum.toString()).to.equal(jsObject.toString());
             }
-            serverEnum.sort();
-            jsObject.sort();
-            expect(serverEnum.length).to.equal(jsObject.length);
-            expect(serverEnum.toString()).to.equal(jsObject.toString());
-        })
+        )
     })
 
     //test unit_types
@@ -89,26 +127,26 @@ mocha.describe('Enums JS to DB', () => {
         const conn = DB.getConnection();
         let serverEnum = [];
         let jsEnum = [];
-        conn.result(Database.sqlFile('unit/get_unit_types_enum.sql')).then(data => {
-            //need sql inlin code for getting unit enum SELECT unnest(enum_range(NULL::unit_type));
-            let resultArray = data.rows;
-            resultArray.forEach((item) =>{
-                serverEnum.push(item.unnest);
-            });
-            for(let key in Unit.unitType) {
-                if (Unit.unitType.hasOwnProperty(key)) {
-                    let value = Unit.unitType[key];
-                    jsEnum.push(value);
+        await conn.result('SELECT unnest(enum_range(NULL::unit_type));')
+            .then(data => {
+                //need sql inlin code for getting unit enum SELECT unnest(enum_range(NULL::unit_type));
+                let resultArray = data.rows;
+                resultArray.forEach((item) =>{
+                    serverEnum.push(item.unnest);
+                });
+                for(let key in Unit.unitType) {
+                    if (Unit.unitType.hasOwnProperty(key)) {
+                        let value = Unit.unitType[key];
+                        jsEnum.push(value);
+                    }
                 }
+                serverEnum.sort();
+                jsEnum.sort();
+                console.log("DB",serverEnum.toString());
+                console.log("JS",jsEnum.toString());
+                expect(serverEnum.length).to.equal(jsEnum.length);
+                expect(serverEnum.toString()).to.equal(jsEnum.toString());
             }
-            serverEnum.sort();
-            jsEnum.sort();
-            // console.log("server: " + serverEnum.toString())
-            // console.log("js: " + jsEnum.toString())
-            expect(serverEnum.toString()).to.equal(jsEnum.toString());
-            expect(serverEnum.length).to.equal(jsEnum.length);
-            // expectArrayOfUnitsToBeEquivalent(serverEnum, jsEnum);
-            // expectCompareToEqualExpected(serverEnum.length, jsEnum.length);
-        })
+        )
     })
-})
\ No newline at end of file
+});
\ No newline at end of file

From 63a7cd7b59d7e35dfe8aad92dc945d8e20fb6582 Mon Sep 17 00:00:00 2001
From: Eboyd3443 <ETBoyd@proton.me>
Date: Sun, 24 Nov 2024 14:37:55 -0800
Subject: [PATCH 071/128] Add displayable_type test. Incorporate SQL code into
 tests.

---
 src/server/test/db/enumTests.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index 05d7d3160..2fab05fba 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -31,8 +31,6 @@ mocha.describe('Enums JS to DB', () => {
 				}
 				serverEnum.sort();
 				jsObject.sort();
-                console.log(serverEnum.toString());
-                console.log(jsObject.toString());
 				expect(serverEnum.length).to.equal(jsObject.length);
 				expect(serverEnum.toString()).to.equal(jsObject.toString());
 			}
@@ -58,8 +56,6 @@ mocha.describe('Enums JS to DB', () => {
 				}
 				serverEnum.sort();
 				jsObject.sort();
-                console.log("DB",serverEnum.toString());
-                console.log("JS",jsObject.toString());
 				expect(serverEnum.length).to.equal(jsObject.length);
 				expect(serverEnum.toString()).to.equal(jsObject.toString());
 			}
@@ -87,8 +83,6 @@ mocha.describe('Enums JS to DB', () => {
                 }
                 serverEnum.sort();
                 jsObject.sort();
-                console.log(serverEnum.toString());
-                console.log(jsObject.toString());
                 expect(serverEnum.length).to.equal(jsObject.length);
                 expect(serverEnum.toString()).to.equal(jsObject.toString());
             }
@@ -114,8 +108,6 @@ mocha.describe('Enums JS to DB', () => {
                 }
                 serverEnum.sort();
                 jsObject.sort();
-                console.log(serverEnum.toString());
-                console.log(jsObject.toString());
                 expect(serverEnum.length).to.equal(jsObject.length);
                 expect(serverEnum.toString()).to.equal(jsObject.toString());
             }
@@ -142,8 +134,6 @@ mocha.describe('Enums JS to DB', () => {
                 }
                 serverEnum.sort();
                 jsEnum.sort();
-                console.log("DB",serverEnum.toString());
-                console.log("JS",jsEnum.toString());
                 expect(serverEnum.length).to.equal(jsEnum.length);
                 expect(serverEnum.toString()).to.equal(jsEnum.toString());
             }

From 1e712e0aa3c71e80e86de67727a0db3b75a12fc2 Mon Sep 17 00:00:00 2001
From: Diana <Khachaturova.Diana@student.greenriver.edu>
Date: Tue, 26 Nov 2024 13:32:04 -0800
Subject: [PATCH 072/128] Wrote C8 Test Case

---
 .../test/web/readingsCompareMeterQuantity.js     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index e278afc55..ceced1188 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -74,7 +74,21 @@ mocha.describe('readings API', () => {
 
 				// Add C6 here
 
-				// Add C8 here
+				mocha.it('C8: 1 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as MJ', async() => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWh);
+					// Get the unit ID since the DB could use any value.
+  					const unitId = await getUnitId('MJ');
+					const expected = [11232.0660730344, 12123.0051081528]; 
+					// for compare, need the unitID, currentStart, currentEnd, shift
+					const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`)
+					.query({
+						curr_start: '2022-10-31 00:00:00',  
+						curr_end: '2022-10-31 17:00:00',  
+						shift: 'P1D',                      
+						graphicUnitId: unitId              
+					});
+					expectCompareToEqualExpected(res, expected);
+				});
 
 				// Add C9 here
 

From c8ab76fbf100976a5a4916239d6cecf8ad609c99 Mon Sep 17 00:00:00 2001
From: Madeleine Chance <mechance782@gmail.com>
Date: Tue, 26 Nov 2024 14:20:10 -0800
Subject: [PATCH 073/128] unit data types added

---
 .../test/web/readingsCompareMeterQuantity.js  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index ceced1188..165277b6a 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -75,6 +75,46 @@ mocha.describe('readings API', () => {
 				// Add C6 here
 
 				mocha.it('C8: 1 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as MJ', async() => {
+					// adding u1, u2, u3
+					const unitData = [
+						{
+							//u1
+							name: 'kWh',
+							identifier: '',
+							unitRepresent: Unit.unitRepresentType.QUANTITY,
+							secInRate: 3600,
+							typeOfUnit: Unit.unitType.UNIT,
+							suffix: '',
+							displayable: Unit.displayableType.ALL,
+							prefferedDisplay: true,
+							note: 'OED created standard unit'
+						},
+						{
+							//u2
+							name: 'Electric_Utility',
+							identifier: '',
+							unitRepresent: Unit.unitRepresentType.QUANTITY,
+							secInRate: 3600,
+							typeOfUnit: Unit.unitType.METER,
+							suffix: '',
+							displayable: Unit.displayableType.NONE,
+							prefferedDisplay: false,
+							note: 'special unit'
+						},
+						{
+							//u3
+							name: 'MJ',
+							identifier: 'megaJoules',
+							unitRepresent: Unit.unitRepresentType.QUANTITY,
+							secInRate: 3600,
+							typeOfUnit: Unit.unitType.UNIT,
+							suffix: '',
+							displayable: Unit.displayableType.ALL,
+							prefferedDisplay: false,
+							note: 'MJ'
+						}
+
+					]
 					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWh);
 					// Get the unit ID since the DB could use any value.
   					const unitId = await getUnitId('MJ');

From 3fa08dd72a01435ba92f8cdcc5e67a2c1c637ea6 Mon Sep 17 00:00:00 2001
From: Madeleine Chance <mechance782@gmail.com>
Date: Tue, 26 Nov 2024 14:24:56 -0800
Subject: [PATCH 074/128] added conversion units

---
 .../test/web/readingsCompareMeterQuantity.js  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index 165277b6a..6b09b58bb 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -113,9 +113,29 @@ mocha.describe('readings API', () => {
 							prefferedDisplay: false,
 							note: 'MJ'
 						}
+					];
 
+					const conversionData = [
+						{
+							//c1
+							sourceName: 'Electric_Utility',
+							destinationName: 'kWh',
+							bidirectional: false,
+							slope: 1,
+							intercept: 0,
+							note: 'Electric_Utility → kWh'
+						},
+						{
+							// c2
+							sourceName: 'kWh',
+							destinationName: 'MJ',
+							bidirectional: true,
+							slope: 3.6,
+							intercept: 0,
+							note: 'kWh → MJ'
+						}
 					]
-					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWh);
+					await prepareTest(unitData, conversionData, meterData);
 					// Get the unit ID since the DB could use any value.
   					const unitId = await getUnitId('MJ');
 					const expected = [11232.0660730344, 12123.0051081528]; 

From 2f5024f59815da35515a83b8086b569ba8063944 Mon Sep 17 00:00:00 2001
From: Madeleine Chance <mechance782@gmail.com>
Date: Tue, 26 Nov 2024 14:27:35 -0800
Subject: [PATCH 075/128] fixed comments

---
 src/server/test/web/readingsCompareMeterQuantity.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index 6b09b58bb..a53d1ee64 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -75,10 +75,10 @@ mocha.describe('readings API', () => {
 				// Add C6 here
 
 				mocha.it('C8: 1 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as MJ', async() => {
-					// adding u1, u2, u3
+					// adding units u1, u2, u3
 					const unitData = [
 						{
-							//u1
+							// u1
 							name: 'kWh',
 							identifier: '',
 							unitRepresent: Unit.unitRepresentType.QUANTITY,
@@ -90,7 +90,7 @@ mocha.describe('readings API', () => {
 							note: 'OED created standard unit'
 						},
 						{
-							//u2
+							// u2
 							name: 'Electric_Utility',
 							identifier: '',
 							unitRepresent: Unit.unitRepresentType.QUANTITY,
@@ -102,7 +102,7 @@ mocha.describe('readings API', () => {
 							note: 'special unit'
 						},
 						{
-							//u3
+							// u3
 							name: 'MJ',
 							identifier: 'megaJoules',
 							unitRepresent: Unit.unitRepresentType.QUANTITY,
@@ -114,10 +114,10 @@ mocha.describe('readings API', () => {
 							note: 'MJ'
 						}
 					];
-
 					const conversionData = [
+						// adding conversions c1, c2
 						{
-							//c1
+							// c1
 							sourceName: 'Electric_Utility',
 							destinationName: 'kWh',
 							bidirectional: false,

From d2021cbb4ee4f02fa14be261c3fb112d463796b9 Mon Sep 17 00:00:00 2001
From: TavSingh <tavsingh@ImTired2.>
Date: Tue, 26 Nov 2024 14:36:19 -0800
Subject: [PATCH 076/128] Adding meterData object

---
 .../test/web/readingsCompareMeterQuantity.js  | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index a53d1ee64..a23a8c6fa 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -74,7 +74,7 @@ mocha.describe('readings API', () => {
 
 				// Add C6 here
 
-				mocha.it('C8: 1 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as MJ', async() => {
+				mocha.it('C8: 1 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as MJ', async () => {
 					// adding units u1, u2, u3
 					const unitData = [
 						{
@@ -134,19 +134,33 @@ mocha.describe('readings API', () => {
 							intercept: 0,
 							note: 'kWh → MJ'
 						}
-					]
+					];
+					const meterData = [
+						// adding meterData for MJ Unit
+						{
+						name: 'Electric_Utility MJ',
+						unit: 'Electric_Utility',
+						displayable: true,
+						gps: undefined,
+						note: 'special meter',
+						file: 'readings_ri_15_days_75.csv',
+						deleteFile: false,
+						readingFrequency: '15 minutes',
+						id: METER_ID
+						}
+					];
 					await prepareTest(unitData, conversionData, meterData);
 					// Get the unit ID since the DB could use any value.
-  					const unitId = await getUnitId('MJ');
-					const expected = [11232.0660730344, 12123.0051081528]; 
+					const unitId = await getUnitId('MJ');
+					const expected = [11232.0660730344, 12123.0051081528];
 					// for compare, need the unitID, currentStart, currentEnd, shift
 					const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`)
-					.query({
-						curr_start: '2022-10-31 00:00:00',  
-						curr_end: '2022-10-31 17:00:00',  
-						shift: 'P1D',                      
-						graphicUnitId: unitId              
-					});
+						.query({
+							curr_start: '2022-10-31 00:00:00',
+							curr_end: '2022-10-31 17:00:00',
+							shift: 'P1D',
+							graphicUnitId: unitId
+						});
 					expectCompareToEqualExpected(res, expected);
 				});
 

From 77c94ff137ca530a3453f46f889601bff5f98fd4 Mon Sep 17 00:00:00 2001
From: Madeleine Chance <mechance782@gmail.com>
Date: Tue, 26 Nov 2024 14:41:03 -0800
Subject: [PATCH 077/128] fixed typo

---
 src/server/test/web/readingsCompareMeterQuantity.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index a23a8c6fa..ab758028a 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -86,7 +86,7 @@ mocha.describe('readings API', () => {
 							typeOfUnit: Unit.unitType.UNIT,
 							suffix: '',
 							displayable: Unit.displayableType.ALL,
-							prefferedDisplay: true,
+							preferredDisplay: true,
 							note: 'OED created standard unit'
 						},
 						{
@@ -98,7 +98,7 @@ mocha.describe('readings API', () => {
 							typeOfUnit: Unit.unitType.METER,
 							suffix: '',
 							displayable: Unit.displayableType.NONE,
-							prefferedDisplay: false,
+							preferredDisplay: false,
 							note: 'special unit'
 						},
 						{
@@ -110,7 +110,7 @@ mocha.describe('readings API', () => {
 							typeOfUnit: Unit.unitType.UNIT,
 							suffix: '',
 							displayable: Unit.displayableType.ALL,
-							prefferedDisplay: false,
+							preferredDisplay: false,
 							note: 'MJ'
 						}
 					];

From 7a3171655b51406766b4ed54315fb5678fb04f92 Mon Sep 17 00:00:00 2001
From: Madeleine Chance <mechance782@gmail.com>
Date: Tue, 26 Nov 2024 14:44:32 -0800
Subject: [PATCH 078/128] fixed file path in meterData

---
 src/server/test/web/readingsCompareMeterQuantity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index ab758028a..8d17e75df 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -143,7 +143,7 @@ mocha.describe('readings API', () => {
 						displayable: true,
 						gps: undefined,
 						note: 'special meter',
-						file: 'readings_ri_15_days_75.csv',
+						file: 'test/web/readingsData/readings_ri_15_days_75.csv',
 						deleteFile: false,
 						readingFrequency: '15 minutes',
 						id: METER_ID

From 174a74e7d5722c385d66e3d35f4dd6eb9f19a96a Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Tue, 26 Nov 2024 18:36:27 -0500
Subject: [PATCH 079/128] removed trailing space to pass test and check

---
 src/client/app/components/RadarChartComponent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index dc320b5ee..35ff6d34e 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -48,7 +48,7 @@ export default function RadarChartComponent() {
 	const selectedGroups = useAppSelector(selectSelectedGroups);
 	const meterDataById = useAppSelector(selectMeterDataById);
 	const groupDataById = useAppSelector(selectGroupDataById);
-	
+
 	if (meterIsLoading || groupIsLoading) {
 		return <SpinnerComponent loading width={50} height={50} />;
 		// return <SpinnerComponent loading width={50} height={50} />

From 4abcfdf124a6c269024622105bc03b98504fb3a7 Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Tue, 26 Nov 2024 16:16:16 -0800
Subject: [PATCH 080/128] config file meter inspections

---
 src/server/test/web/obviusTest.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 48630a27a..6adfe0cc5 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -11,6 +11,7 @@ const Configfile = require('../../models/obvius/Configfile');
 const bcrypt = require('bcryptjs');
 const { insertUnits } = require('../../util/insertData');
 const Unit = require('../../models/Unit');
+const Meter = require('../../models/Meter.js');
 
 mocha.describe('Obvius API', () => {
 	mocha.describe('upload: ', () => {
@@ -196,6 +197,15 @@ mocha.describe('Obvius API', () => {
 
 				//the third line of the response should be the config file
 				expect(res.text.split("\n")[2]).equals(response);
+
+				//config file uploads should create accurate meters
+				const allMeters = await Meter.getAll(conn);
+				allMeters.forEach((meter) => {
+					expect(meter.type).to.equal('obvius');
+				})
+
+				//mb-001.ini should make 28 meters (obvius uses submeters to describe traits of a meter)
+				expect(allMeters.length).to.equal(28);
 			});
 		});
 	});

From e16bd1562e33e3edfcf5d170b814fc3d6443d7f0 Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Tue, 26 Nov 2024 16:49:38 -0800
Subject: [PATCH 081/128] started meter field comparisons

---
 src/server/test/web/obviusTest.js | 37 ++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 6adfe0cc5..b2787ba90 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -198,15 +198,42 @@ mocha.describe('Obvius API', () => {
 				//the third line of the response should be the config file
 				expect(res.text.split("\n")[2]).equals(response);
 
+
+				//mb-001.ini should make 28 meters (obvius uses submeters to describe traits of a meter)
+				expect(allMeters.length).to.equal(28);
+
 				//config file uploads should create accurate meters
 				const allMeters = await Meter.getAll(conn);
+				//combine each field into different arrays for one assertion
+				//these arrays should vary for different submeters
+				const meterNames = [];
+				const meterIDs = [];
+				//these arrays should not vary for different submeters
+				const meterTypes = [];
+				const meterIsDisplayable = [];
+				const meterIsEnabled = [];
+
+				let count = 0;
 				allMeters.forEach((meter) => {
-					expect(meter.type).to.equal('obvius');
+					meterNames[count] = meter.name;
+					meterIDs[count] = meter.id;
+					meterTypes[count] = meter.type;
+					meterIsDisplayable[count] = meter.displayable;
+					meterIsEnabled[count] = meter.enabled;
+					count++;
 				})
-
-				//mb-001.ini should make 28 meters (obvius uses submeters to describe traits of a meter)
-				expect(allMeters.length).to.equal(28);
+				const allMetersAreNotDisplayable = 
+/**You can keep the current PR and update if you want.
+I think it is important that the meter has:
+displayable as false
+enabled as false
+name to be correct (varies for each one)
+identifier to be correct (varies for each one)
+I think I have this correct but did not double check the details.
+The name & identifier are constructed by OED per our conversation yesterday.
+You will probably need to create a list in the test code to compare against.
+I hope this helps. */
 			});
 		});
 	});
-});
+});
\ No newline at end of file

From ea1de0d88e30680c33fbaccfaba238f7d91ea4f8 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Thu, 28 Nov 2024 12:58:59 -0600
Subject: [PATCH 082/128] minor wording fix

---
 src/client/app/containers/CompareChartContainer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/containers/CompareChartContainer.ts b/src/client/app/containers/CompareChartContainer.ts
index 1f9d33213..cabbd8490 100644
--- a/src/client/app/containers/CompareChartContainer.ts
+++ b/src/client/app/containers/CompareChartContainer.ts
@@ -249,7 +249,7 @@ function mapStateToProps(state: RootState, ownProps: CompareChartContainerProps)
 		config: {
 			displayModeBar: true,
 			modeBarButtonsToRemove: defaultButtons,
-			// TO DO: Removes line above and uncomment below. Read above for more info
+			// TODO: Removes line above and uncomment below. Read above for more info
 			// modeBarButtonsToRemove: listOfButtons,
 			// modeBarButtonsToAdd: [{
 			// 	name: 'toggle-options',

From 6e8fea15c805e5ccd55155e7e6e1e7327b2011d3 Mon Sep 17 00:00:00 2001
From: AlexanderORuban <alexruban29@gmail.com>
Date: Fri, 29 Nov 2024 02:19:56 +0000
Subject: [PATCH 083/128] Edited test case to match comment on pull request.

---
 .../test/web/readingsCompareMeterQuantity.js  | 63 +++----------------
 1 file changed, 7 insertions(+), 56 deletions(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index 8d17e75df..1d933f8d8 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -75,34 +75,9 @@ mocha.describe('readings API', () => {
 				// Add C6 here
 
 				mocha.it('C8: 1 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as MJ', async () => {
-					// adding units u1, u2, u3
-					const unitData = [
-						{
-							// u1
-							name: 'kWh',
-							identifier: '',
-							unitRepresent: Unit.unitRepresentType.QUANTITY,
-							secInRate: 3600,
-							typeOfUnit: Unit.unitType.UNIT,
-							suffix: '',
-							displayable: Unit.displayableType.ALL,
-							preferredDisplay: true,
-							note: 'OED created standard unit'
-						},
+					// Use predefined unit and conversion data
+					const unitData = unitDatakWh.concat([
 						{
-							// u2
-							name: 'Electric_Utility',
-							identifier: '',
-							unitRepresent: Unit.unitRepresentType.QUANTITY,
-							secInRate: 3600,
-							typeOfUnit: Unit.unitType.METER,
-							suffix: '',
-							displayable: Unit.displayableType.NONE,
-							preferredDisplay: false,
-							note: 'special unit'
-						},
-						{
-							// u3
 							name: 'MJ',
 							identifier: 'megaJoules',
 							unitRepresent: Unit.unitRepresentType.QUANTITY,
@@ -113,20 +88,9 @@ mocha.describe('readings API', () => {
 							preferredDisplay: false,
 							note: 'MJ'
 						}
-					];
-					const conversionData = [
-						// adding conversions c1, c2
+					]);
+					const conversionData = conversionDatakWh.concat([
 						{
-							// c1
-							sourceName: 'Electric_Utility',
-							destinationName: 'kWh',
-							bidirectional: false,
-							slope: 1,
-							intercept: 0,
-							note: 'Electric_Utility → kWh'
-						},
-						{
-							// c2
 							sourceName: 'kWh',
 							destinationName: 'MJ',
 							bidirectional: true,
@@ -134,22 +98,9 @@ mocha.describe('readings API', () => {
 							intercept: 0,
 							note: 'kWh → MJ'
 						}
-					];
-					const meterData = [
-						// adding meterData for MJ Unit
-						{
-						name: 'Electric_Utility MJ',
-						unit: 'Electric_Utility',
-						displayable: true,
-						gps: undefined,
-						note: 'special meter',
-						file: 'test/web/readingsData/readings_ri_15_days_75.csv',
-						deleteFile: false,
-						readingFrequency: '15 minutes',
-						id: METER_ID
-						}
-					];
-					await prepareTest(unitData, conversionData, meterData);
+					]);
+					// Prepare test with the standard data
+					await prepareTest(unitData, conversionData, meterDatakWh);
 					// Get the unit ID since the DB could use any value.
 					const unitId = await getUnitId('MJ');
 					const expected = [11232.0660730344, 12123.0051081528];

From 669ee0cfc2636a0cd23cf9f5d82875a56f32babd Mon Sep 17 00:00:00 2001
From: dalejk88 <98486119+dalejk88@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:59:55 +0000
Subject: [PATCH 084/128] comment all code in a readable way

---
 src/server/test/db/enumTests.js | 51 ++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/server/test/db/enumTests.js b/src/server/test/db/enumTests.js
index 2fab05fba..ce68aff2b 100644
--- a/src/server/test/db/enumTests.js
+++ b/src/server/test/db/enumTests.js
@@ -2,139 +2,162 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+ /**
+ * This class is for testing javascript objects against enum types in the database
+ * Currently these are stored in both locations, so these tests ensure they are equal
+ */
 const Meter = require('../../models/Meter');
 const User = require('../../models/User');
 const Unit = require('../../models/Unit');
 
+//pulls from real database instead of test database,
+//since the actual enum values are needed
 const Database = require('../../models/database');
 const DB = require('../../db');
 const { expectArrayOfUnitsToBeEquivalent } = require('../../util/compareUnits');
 const { mocha, expect } = require('../common');
 
 mocha.describe('Enums JS to DB', () => {
-    //meter_type ENUM
+    //Meter.type JS object to meter_type SQL ENUM
 	mocha.it('can equate Meter.type to SQL enum', async () => {
 		const conn = DB.getConnection();
 		let serverEnum = [];
 		let jsObject = [];
+        //SQL query returning meter_type ENUM
 		await conn.result('SELECT unnest(enum_range(NULL::meter_type));')
 			.then(data => {
+                //get meter_type enum as nested enumerations
 				let resultArray = data.rows;
+                //unnest into array for comparison
 				resultArray.forEach((item) =>{
 					serverEnum.push(item.unnest);
 				});
+                //convert Meter.type JS object properties to array for comparison
 				for(let key in Meter.type) {
 					if (Meter.type.hasOwnProperty(key)) {
 						let value = Meter.type[key];
 						jsObject.push(value);
 					}
 				}
+                //sort each array before testing against each other
 				serverEnum.sort();
 				jsObject.sort();
-				expect(serverEnum.length).to.equal(jsObject.length);
 				expect(serverEnum.toString()).to.equal(jsObject.toString());
 			}
         )
 	})
 
-    //displayable_type ENUM
+    //Unit.displayableType JS object to displayable_type SQL ENUM
 	mocha.it('can equate displayableType to SQL enum', async () => {
 		const conn = DB.getConnection();
 		let serverEnum = [];
 		let jsObject = [];
+        //SQL query returning displayable_type ENUM
 		await conn.result('SELECT unnest(enum_range(NULL::displayable_type));')
 			.then(data => {
+				//get displayable_type enum as nested enumerations
 				let resultArray = data.rows;
+                //unnest into array for comparison
 				resultArray.forEach((item) =>{
 					serverEnum.push(item.unnest);
 				});
+                //convert Unit.displayableType JS object properties to array for comparison
 				for(let key in Unit.displayableType) {
 					if (Unit.displayableType.hasOwnProperty(key)) {
 						let value = Unit.displayableType[key];
 						jsObject.push(value);
                     }
 				}
+                //sort each array before testing against each other
 				serverEnum.sort();
 				jsObject.sort();
-				expect(serverEnum.length).to.equal(jsObject.length);
 				expect(serverEnum.toString()).to.equal(jsObject.toString());
 			}
         )
 	})
 
-    //USER_TYPE ENUM
-    //checked length first
-    //need to add sql file to the testing folder 
+    //User.role JS object to user_type SQL ENUM
 	mocha.it('can equate User.role to SQL enum', async () => {
         const conn = DB.getConnection();
         let serverEnum = [];
         let jsObject = [];
+        //SQL query returning user_type ENUM
         await conn.result('SELECT unnest(enum_range(NULL::user_type));')
             .then(data => {
+                //get user_type enum as nested enumerations
                 let resultArray = data.rows;
+                //unnest into array for comparison
                 resultArray.forEach((item) =>{
                     serverEnum.push(item.unnest);
                 });
+                //convert User.role JS object properties to array for comparison
                 for(let key in User.role) {
                     if (User.role.hasOwnProperty(key)) {
                         let value = User.role[key];
                         jsObject.push(value);
                     }
                 }
+                //sort each array before testing
                 serverEnum.sort();
                 jsObject.sort();
-                expect(serverEnum.length).to.equal(jsObject.length);
                 expect(serverEnum.toString()).to.equal(jsObject.toString());
             }
         )
     })
 
-    //AREA_UNIT_TYPE
+    //Unit.areaUnitType JS object to area_unit_type SQL ENUM
 	mocha.it('can equate Unit.areaUnitType to SQL enum', async () => {
         const conn = DB.getConnection();
         let serverEnum = [];
         let jsObject = [];
+        //SQL query returning area_unit_type ENUM
         await conn.result('SELECT unnest(enum_range(NULL::area_unit_type));')
             .then(data => {
+                //get area_unit_type enum as nested enumerations
                 let resultArray = data.rows;
+                //unnest into array for comparison
                 resultArray.forEach((item) =>{
                     serverEnum.push(item.unnest);
                 });
+                //convert Unit.areaUnitType JS object properties to array for comparison
                 for(let key in Unit.areaUnitType) {
                     if (Unit.areaUnitType.hasOwnProperty(key)) {
                         let value = Unit.areaUnitType[key];
                         jsObject.push(value);
                     }
                 }
+                //sort each array before testing
                 serverEnum.sort();
                 jsObject.sort();
-                expect(serverEnum.length).to.equal(jsObject.length);
                 expect(serverEnum.toString()).to.equal(jsObject.toString());
             }
         )
     })
 
-    //test unit_types
-    mocha.it('can equate unit.unitType to SQL enum', async () => {
+    //Unit.unitType JS object to unit_type SQL ENUM
+    mocha.it('can equate Unit.unitType to SQL enum', async () => {
         const conn = DB.getConnection();
         let serverEnum = [];
         let jsEnum = [];
+        //SQL query returning unit_type ENUM
         await conn.result('SELECT unnest(enum_range(NULL::unit_type));')
             .then(data => {
-                //need sql inlin code for getting unit enum SELECT unnest(enum_range(NULL::unit_type));
+                //get unit_type enum as nested enumerations
                 let resultArray = data.rows;
+                //unnest into array for comparison
                 resultArray.forEach((item) =>{
                     serverEnum.push(item.unnest);
                 });
+                //convert Unit.unitType JS object properties to array for comparison
                 for(let key in Unit.unitType) {
                     if (Unit.unitType.hasOwnProperty(key)) {
                         let value = Unit.unitType[key];
                         jsEnum.push(value);
                     }
                 }
+                //sort each array before testing
                 serverEnum.sort();
                 jsEnum.sort();
-                expect(serverEnum.length).to.equal(jsEnum.length);
                 expect(serverEnum.toString()).to.equal(jsEnum.toString());
             }
         )

From 3418e86528dfdfdb958b11d87ab6922e8be330be Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Sat, 30 Nov 2024 14:44:36 -0800
Subject: [PATCH 085/128] finished Meter comparisons

---
 src/server/test/web/obviusTest.js | 91 +++++++++++++++++++++----------
 1 file changed, 62 insertions(+), 29 deletions(-)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index b2787ba90..5a2881d29 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -198,41 +198,74 @@ mocha.describe('Obvius API', () => {
 				//the third line of the response should be the config file
 				expect(res.text.split("\n")[2]).equals(response);
 
+				//config file uploads should create accurate meter objects
+				const allMeters = await Meter.getAll(conn);
 
-				//mb-001.ini should make 28 meters (obvius uses submeters to describe traits of a meter)
+				//mb-001.ini should make 28 meters
 				expect(allMeters.length).to.equal(28);
 
-				//config file uploads should create accurate meters
-				const allMeters = await Meter.getAll(conn);
-				//combine each field into different arrays for one assertion
 				//these arrays should vary for different submeters
 				const meterNames = [];
 				const meterIDs = [];
-				//these arrays should not vary for different submeters
-				const meterTypes = [];
-				const meterIsDisplayable = [];
-				const meterIsEnabled = [];
-
-				let count = 0;
-				allMeters.forEach((meter) => {
-					meterNames[count] = meter.name;
-					meterIDs[count] = meter.id;
-					meterTypes[count] = meter.type;
-					meterIsDisplayable[count] = meter.displayable;
-					meterIsEnabled[count] = meter.enabled;
-					count++;
-				})
-				const allMetersAreNotDisplayable = 
-/**You can keep the current PR and update if you want.
-I think it is important that the meter has:
-displayable as false
-enabled as false
-name to be correct (varies for each one)
-identifier to be correct (varies for each one)
-I think I have this correct but did not double check the details.
-The name & identifier are constructed by OED per our conversation yesterday.
-You will probably need to create a list in the test code to compare against.
-I hope this helps. */
+
+				//flags for meter fields (.type, .displayable, .enabled)
+				const allMetersAreObvius = true;
+				const allMetersAreNotDisplayable = true;
+				const allMetersAreNotEnabled = true;
+
+				//expected names and ids
+				const expMeterNames = [
+					'mb-001.0', 'mb-001.1', 'mb-001.2', 'mb-001.3', 'mb-001.4', 'mb-001.5', 'mb-001.6', 'mb-001.7', 
+					'mb-001.8', 'mb-001.9', 'mb-001.10', 'mb-001.11', 'mb-001.12', 'mb-001.13', 'mb-001.14', 'mb-001.15', 
+					'mb-001.16', 'mb-001.17', 'mb-001.18', 'mb-001.19', 'mb-001.20', 'mb-001.21', 'mb-001.22', 'mb-001.23', 
+					'mb-001.24', 'mb-001.25', 'mb-001.26', 'mb-001.27'
+				  ];
+				  
+				  const expMeterIDs = [
+					1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28
+				  ];
+				for(const meter of allMeters) {
+					//populate arrays with varying values in ascending order
+					let currentName = meter.name + "";
+					let idx = currentName.split('.')[1];
+					meterNames[parseInt(idx)] = meter.name;
+					meterIDs[meter.id-1] = meter.id;
+					//ensure each meter is obvius, not displayable, and not enabled
+					if(meter.type != 'obvius') {
+						allMetersAreObvius = false;
+					}
+					if(meter.displayable != false) {
+						allMetersAreNotDisplayable = false;
+					}
+					if(meter.enabled != false) {
+						allMetersAreNotEnabled = false;
+					}
+				}
+
+				//flags for comparison between expected arrays and actual arrays
+				const expectedNamesAreEqual = true;
+				const expectedIDsAreEqual = true;
+
+				//both arrays should be contain the same sequence of values
+				for(let i = 0; i < 28; i++) {
+					if(expMeterNames[i] != meterNames[i]) {
+						expectedNamesAreEqual = false;
+					}
+				
+					if(expMeterIDs[i] != meterIDs[i]) {
+						expectedIDsAreEqual = false;
+					}
+				}
+
+				//assertion for type, displayable, and enabled
+				expect(allMetersAreObvius).to.equal(true);
+				expect(allMetersAreNotDisplayable).to.equal(true);
+				expect(allMetersAreNotEnabled).to.equal(true);
+
+
+				//expected arrays should equal actual arrays
+				expect(expectedNamesAreEqual).to.equal(true);
+				expect(expectedIDsAreEqual).to.equal(true);
 			});
 		});
 	});

From acbc07965f0dc954a9610c42f475e8135753ee62 Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Sat, 30 Nov 2024 14:46:12 -0800
Subject: [PATCH 086/128] format

---
 src/server/test/web/obviusTest.js | 33 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 5a2881d29..e93129bd7 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -215,29 +215,29 @@ mocha.describe('Obvius API', () => {
 
 				//expected names and ids
 				const expMeterNames = [
-					'mb-001.0', 'mb-001.1', 'mb-001.2', 'mb-001.3', 'mb-001.4', 'mb-001.5', 'mb-001.6', 'mb-001.7', 
-					'mb-001.8', 'mb-001.9', 'mb-001.10', 'mb-001.11', 'mb-001.12', 'mb-001.13', 'mb-001.14', 'mb-001.15', 
-					'mb-001.16', 'mb-001.17', 'mb-001.18', 'mb-001.19', 'mb-001.20', 'mb-001.21', 'mb-001.22', 'mb-001.23', 
+					'mb-001.0', 'mb-001.1', 'mb-001.2', 'mb-001.3', 'mb-001.4', 'mb-001.5', 'mb-001.6', 'mb-001.7',
+					'mb-001.8', 'mb-001.9', 'mb-001.10', 'mb-001.11', 'mb-001.12', 'mb-001.13', 'mb-001.14', 'mb-001.15',
+					'mb-001.16', 'mb-001.17', 'mb-001.18', 'mb-001.19', 'mb-001.20', 'mb-001.21', 'mb-001.22', 'mb-001.23',
 					'mb-001.24', 'mb-001.25', 'mb-001.26', 'mb-001.27'
-				  ];
-				  
-				  const expMeterIDs = [
+				];
+
+				const expMeterIDs = [
 					1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28
-				  ];
-				for(const meter of allMeters) {
+				];
+				for (const meter of allMeters) {
 					//populate arrays with varying values in ascending order
 					let currentName = meter.name + "";
 					let idx = currentName.split('.')[1];
 					meterNames[parseInt(idx)] = meter.name;
-					meterIDs[meter.id-1] = meter.id;
+					meterIDs[meter.id - 1] = meter.id;
 					//ensure each meter is obvius, not displayable, and not enabled
-					if(meter.type != 'obvius') {
+					if (meter.type != 'obvius') {
 						allMetersAreObvius = false;
 					}
-					if(meter.displayable != false) {
+					if (meter.displayable != false) {
 						allMetersAreNotDisplayable = false;
 					}
-					if(meter.enabled != false) {
+					if (meter.enabled != false) {
 						allMetersAreNotEnabled = false;
 					}
 				}
@@ -247,12 +247,12 @@ mocha.describe('Obvius API', () => {
 				const expectedIDsAreEqual = true;
 
 				//both arrays should be contain the same sequence of values
-				for(let i = 0; i < 28; i++) {
-					if(expMeterNames[i] != meterNames[i]) {
+				for (let i = 0; i < 28; i++) {
+					if (expMeterNames[i] != meterNames[i]) {
 						expectedNamesAreEqual = false;
 					}
-				
-					if(expMeterIDs[i] != meterIDs[i]) {
+
+					if (expMeterIDs[i] != meterIDs[i]) {
 						expectedIDsAreEqual = false;
 					}
 				}
@@ -262,7 +262,6 @@ mocha.describe('Obvius API', () => {
 				expect(allMetersAreNotDisplayable).to.equal(true);
 				expect(allMetersAreNotEnabled).to.equal(true);
 
-
 				//expected arrays should equal actual arrays
 				expect(expectedNamesAreEqual).to.equal(true);
 				expect(expectedIDsAreEqual).to.equal(true);

From 11ca99a317920b6f0f29924c2b0b1e9ce54663e6 Mon Sep 17 00:00:00 2001
From: LauraV-702 <Villaraza.Laura@student.greenriver.edu>
Date: Sun, 1 Dec 2024 06:37:40 +0000
Subject: [PATCH 087/128] Added testcase C5 to the file
 readingsCompareMeterQuantity

---
 .../test/web/readingsCompareMeterQuantity.js      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index 1d933f8d8..c492b6292 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -68,9 +68,22 @@ mocha.describe('readings API', () => {
 						});
 					expectCompareToEqualExpected(res, expected);
 				});
+				
 				// Add C4 here
 
-				// Add C5 here
+				mocha.it('C5: 7 day shift end 2022-11-01 15:00:00 (beyond data) for 15 minute reading intervals and quantity units & kWh as kWh', async () => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWh);
+					const unitId = await getUnitId('kWh');
+					const expected = [9132.81261972035, 13147.7382388332];
+					const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`)
+					  .query({
+						curr_start: '2022-10-30 00:00:00',
+						curr_end: '2022-11-01 15:00:00',  // 3-day window, ends at 2022-11-01 15:00:00
+						shift: 'P7D',  // 7-day shift (different from C3)
+						graphicUnitId: unitId
+					  });
+					expectCompareToEqualExpected(res, expected);
+				  });				  
 
 				// Add C6 here
 

From 529efe1d75d955cacdc6858b1ee44bc3a584c9fb Mon Sep 17 00:00:00 2001
From: LauraV-702 <Villaraza.Laura@student.greenriver.edu>
Date: Sun, 1 Dec 2024 07:39:47 +0000
Subject: [PATCH 088/128] Removed comments from testcase C5

---
 src/server/test/web/readingsCompareMeterQuantity.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index c492b6292..fb7641024 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -68,7 +68,7 @@ mocha.describe('readings API', () => {
 						});
 					expectCompareToEqualExpected(res, expected);
 				});
-				
+
 				// Add C4 here
 
 				mocha.it('C5: 7 day shift end 2022-11-01 15:00:00 (beyond data) for 15 minute reading intervals and quantity units & kWh as kWh', async () => {
@@ -78,8 +78,8 @@ mocha.describe('readings API', () => {
 					const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`)
 					  .query({
 						curr_start: '2022-10-30 00:00:00',
-						curr_end: '2022-11-01 15:00:00',  // 3-day window, ends at 2022-11-01 15:00:00
-						shift: 'P7D',  // 7-day shift (different from C3)
+						curr_end: '2022-11-01 15:00:00',  
+						shift: 'P7D',  
 						graphicUnitId: unitId
 					  });
 					expectCompareToEqualExpected(res, expected);

From 6fc88ebb3c231e647948c00b1de8c7c46e3b3c5e Mon Sep 17 00:00:00 2001
From: LauraV-702 <Villaraza.Laura@student.greenriver.edu>
Date: Sun, 1 Dec 2024 21:26:42 +0000
Subject: [PATCH 089/128] Fixed formatting, removed white spaces, and extra
 tabs from testcase C5 in the readingsCompareMeterQuantity.js file

---
 .../test/web/readingsCompareMeterQuantity.js       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index fb7641024..89002d46b 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -76,14 +76,14 @@ mocha.describe('readings API', () => {
 					const unitId = await getUnitId('kWh');
 					const expected = [9132.81261972035, 13147.7382388332];
 					const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`)
-					  .query({
-						curr_start: '2022-10-30 00:00:00',
-						curr_end: '2022-11-01 15:00:00',  
-						shift: 'P7D',  
-						graphicUnitId: unitId
-					  });
+						.query({
+							curr_start: '2022-10-30 00:00:00',
+							curr_end: '2022-11-01 15:00:00',
+							shift: 'P7D',
+							graphicUnitId: unitId
+						});
 					expectCompareToEqualExpected(res, expected);
-				  });				  
+				});
 
 				// Add C6 here
 

From 137d53715ebe0ec96430d95e0a230547b34e4262 Mon Sep 17 00:00:00 2001
From: Luke Cheng <Lukeecheng@gmail.com>
Date: Sun, 1 Dec 2024 20:53:44 -0800
Subject: [PATCH 090/128] created a script to check website status and send
 email to users if website is down

---
 package-lock.json                         | 32 ++++++++++++++
 package.json                              |  3 ++
 src/server/services/checkWebsiteStatus.js | 52 +++++++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 src/server/services/checkWebsiteStatus.js

diff --git a/package-lock.json b/package-lock.json
index 68bc1cd28..30f020e45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
 				"bcryptjs": "~2.4.3",
 				"body-parser": "~1.20.2",
 				"bootstrap": "~5.3.3",
+				"colors": "~1.4.0",
 				"csv": "~5.3.2",
 				"csv-stringify": "~5.6.5",
 				"d3": "~7.8.5",
@@ -34,6 +35,7 @@
 				"multer": "~1.4.5-lts.1",
 				"ngraph.graph": "~20.0.0",
 				"ngraph.path": "~1.5.0",
+				"node-cron": "~3.0.3",
 				"nodemailer": "~6.9.13",
 				"pg": "~8.12.0",
 				"pg-promise": "~11.8.0",
@@ -2886,6 +2888,15 @@
 			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
 			"dev": true
 		},
+		"node_modules/colors": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+			"integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.1.90"
+			}
+		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -7252,6 +7263,27 @@
 			"integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
 			"dev": true
 		},
+		"node_modules/node-cron": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz",
+			"integrity": "sha512-dOal67//nohNgYWb+nWmg5dkFdIwDm8EpeGYMekPMrngV3637lqnX0lbUcCtgibHTz6SEz7DAIjKvKDFYCnO1A==",
+			"license": "ISC",
+			"dependencies": {
+				"uuid": "8.3.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/node-cron/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"license": "MIT",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
 		"node_modules/node-polyfill-webpack-plugin": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz",
diff --git a/package.json b/package.json
index fa5f6d8de..4fc5b5ad3 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 	"scripts": {
 		"start": "node ./src/bin/www",
 		"start:dev": "nodemon --legacy-watch --inspect=0.0.0.0 ./src/bin/www",
+		"status": "node src/server/services/checkWebsiteStatus.js",
 		"webpack:dev": "webpack watch --color --progress --mode development",
 		"webpack:build": "webpack build --node-env production",
 		"webpack": "webpack build --color --progress --mode development",
@@ -62,6 +63,7 @@
 		"bcryptjs": "~2.4.3",
 		"body-parser": "~1.20.2",
 		"bootstrap": "~5.3.3",
+		"colors": "~1.4.0",
 		"csv": "~5.3.2",
 		"csv-stringify": "~5.6.5",
 		"d3": "~7.8.5",
@@ -81,6 +83,7 @@
 		"multer": "~1.4.5-lts.1",
 		"ngraph.graph": "~20.0.0",
 		"ngraph.path": "~1.5.0",
+		"node-cron": "~3.0.3",
 		"nodemailer": "~6.9.13",
 		"pg": "~8.12.0",
 		"pg-promise": "~11.8.0",
diff --git a/src/server/services/checkWebsiteStatus.js b/src/server/services/checkWebsiteStatus.js
new file mode 100644
index 000000000..b8e2ad9de
--- /dev/null
+++ b/src/server/services/checkWebsiteStatus.js
@@ -0,0 +1,52 @@
+const cron = require('node-cron');
+const { getConnection } = require('../db');
+const { logMailer } = require('../logMailer');
+const LogEmail = require('../models/LogEmail');
+const colors = require('colors');
+  
+async function checkWebsite() {
+  const conn = getConnection();
+
+  try {
+    const response = await fetch('https://httpstat.us/500/', { method: 'HEAD' });
+
+    if (response.ok) {
+      console.log('The server is up'.green.inverse);
+    } else {
+      console.error('The server is down'.red.inverse);
+
+      const errorMessage = 'The server at https://httpstat.us/500/ is down.';
+
+      // Log the error in the database
+      const log = new LogEmail(undefined, errorMessage);
+      await log.insert(conn);
+
+      // Send a logging email
+      await logMailer(conn);
+    }
+  } 
+  catch (error) {
+    console.error('Error:', error);
+
+    const errorMessage = `Failed to reach https://httpstat.us/500/. Error: ${error.message}`;
+
+    // Log the error in the database
+    const log = new LogEmail(undefined, errorMessage);
+    await log.insert(conn);
+
+    // Send a logging email
+    await logMailer(conn);
+  } finally {
+    if (conn.close) {
+      await conn.close();
+    }
+  }
+}
+
+// Schedule the task to run every hour
+// cron.schedule('0 * * * *', () => {
+//   console.log('Running website status check...');
+//   checkWebsite();
+// });
+
+checkWebsite();
\ No newline at end of file

From 97a09a633b9d409889c50ceebcc2e14dc5836f01 Mon Sep 17 00:00:00 2001
From: madargani <mad3913@gmail.com>
Date: Mon, 2 Dec 2024 09:53:32 -0800
Subject: [PATCH 091/128] Added code for CG6 Test Case

---
 .../test/web/readingsCompareGroupQuantity.js     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index 41b9277de..cf6d3fa85 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -58,7 +58,21 @@ mocha.describe('readings API', () => {
 
 				// Add CG5 here
 
-				// Add CG6 here
+				mocha.it('CG6: 28 day shift end 2022-10-31 17:12:34 for 15 minute reading intervals and quantity units & kWh as kWh ', async () => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh);
+					// Get the unit ID since the DB could use any value.
+					const unitId = await getUnitId('kWh');
+					const expected = [189951.689612281, 190855.90449004];
+					// for compare, need the unitID, currentStart, currentEnd, shift
+					const res = await chai.request(app).get(`/api/compareReadings/groups/${GROUP_ID}`)
+						.query({
+							curr_start: '2022-10-09 00:00:00',
+							curr_end: '2022-10-31 17:12:34',
+							shift: 'P28D',
+							graphicUnitId: unitId
+						});
+					expectCompareToEqualExpected(res, expected, GROUP_ID);
+				});
 
 				// Add CG8 here
 

From 580cfd9aeae82297719218696b152e4925d3c07e Mon Sep 17 00:00:00 2001
From: Eboyd3443 <ETBoyd@proton.me>
Date: Mon, 2 Dec 2024 12:34:09 -0800
Subject: [PATCH 092/128] Remove area from unit.unitType in Unit.js

---
 src/server/models/Unit.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/server/models/Unit.js b/src/server/models/Unit.js
index fff20750e..b3271da45 100644
--- a/src/server/models/Unit.js
+++ b/src/server/models/Unit.js
@@ -232,8 +232,7 @@ class Unit {
 Unit.unitType = Object.freeze({
 	UNIT: 'unit',
 	METER: 'meter',
-	SUFFIX: 'suffix',
-	AREA: 'area'
+	SUFFIX: 'suffix'
 });
 
 Unit.displayableType = Object.freeze({

From ede099ad579a8387c5bd0460630b103248bd7c64 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Mon, 2 Dec 2024 23:58:09 -0500
Subject: [PATCH 093/128] resolved PR comments

---
 .../app/components/HeaderButtonsComponent.tsx |   4 +-
 src/client/app/components/RouteComponent.tsx  |   1 -
 .../app/components/admin/LogMsgComponent.tsx  | 124 +++--
 src/client/app/translations/data.ts           | 522 +++++++++---------
 src/server/log.js                             |   8 +-
 src/server/models/LogMsg.js                   |  42 --
 src/server/routes/logs.js                     |   2 +-
 src/server/sql/logmsg/get_all_logs.sql        |   6 -
 src/server/sql/logmsg/get_logs_from_dates.sql |  11 -
 src/server/sql/logmsg/get_logs_from_type.sql  |  10 -
 10 files changed, 337 insertions(+), 393 deletions(-)
 delete mode 100644 src/server/sql/logmsg/get_all_logs.sql
 delete mode 100644 src/server/sql/logmsg/get_logs_from_dates.sql
 delete mode 100644 src/server/sql/logmsg/get_logs_from_type.sql

diff --git a/src/client/app/components/HeaderButtonsComponent.tsx b/src/client/app/components/HeaderButtonsComponent.tsx
index f0881b58c..244fce906 100644
--- a/src/client/app/components/HeaderButtonsComponent.tsx
+++ b/src/client/app/components/HeaderButtonsComponent.tsx
@@ -102,7 +102,7 @@ export default function HeaderButtonsComponent() {
 			shouldCSVReadingsButtonDisabled: pathname === '/csvReadings',
 			shouldUnitsButtonDisabled: pathname === '/units',
 			shouldConversionsButtonDisabled: pathname === '/conversions',
-			shouldLogMsgButtonDisabled: pathname === '/logmsg'
+			shouldLogMsgButtonDisabled: pathname === '/logmsg',
 			shouldVisualUnitMapButtonDisabled: pathname === '/visual-unit'
 		}));
 	}, [pathname]);
@@ -315,7 +315,7 @@ export default function HeaderButtonsComponent() {
 						{translate('log.in')}
 					</ModalHeader>
 					<ModalBody>
-						<LoginComponent handleClose={handleClose}/>
+						<LoginComponent handleClose={handleClose} />
 					</ModalBody>
 				</Modal>
 			</>
diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
index 72dd3019e..15d46daf4 100644
--- a/src/client/app/components/RouteComponent.tsx
+++ b/src/client/app/components/RouteComponent.tsx
@@ -60,7 +60,6 @@ const router = createBrowserRouter([
 					{ path: 'csvMeters', element: <MetersCSVUploadComponent /> },
 					{ path: 'maps', element: <MapsDetailContainer /> },
 					{ path: 'units', element: <UnitsDetailComponent /> },
-					{ path: 'conversions', element: <ConversionsDetailComponent /> },
 					{ path: 'users', element: <UsersDetailComponent /> },
 					{ path: 'logmsg', element: <LogMsgComponent /> },
 					{ path: 'users', element: <UsersDetailComponent /> },
diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index 58760d95c..9e8350cd0 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -3,29 +3,38 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 import * as React from 'react';
 import * as moment from 'moment';
 import {
 	Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle,
+	FormFeedback,
 	FormGroup, Input, Label, Modal, ModalBody, ModalHeader, Pagination, PaginationItem, PaginationLink, Table
 } from 'reactstrap';
 import DateRangePicker from '@wojtekmaj/react-daterange-picker';
 import { useAppSelector } from '../../redux/reduxHooks';
 import { selectSelectedLanguage } from '../../redux/slices/appStateSlice';
-import { showWarnNotification } from '../../utils/notifications';
 import { logsApi } from '../../utils/api';
 import translate from '../../utils/translate';
 import { TimeInterval } from '../../../../common/TimeInterval';
 import { dateRangeToTimeInterval, timeIntervalToDateRange } from '../../utils/dateRangeCompatibility';
 import { Value } from '@wojtekmaj/react-daterange-picker/dist/cjs/shared/types';
 
-
 // number of log messages to display per page
 const PER_PAGE = 20;
+
+enum LogTypes {
+	ERROR = 'ERROR',
+	INFO = 'INFO',
+	WARN = 'WARN',
+	DEBUG = 'DEBUG',
+	SILENT = 'SILENT'
+}
+// log types for filtering
+const logTypes = Object.values(LogTypes);
+
 // initialize log message array to hold log messages
 const initialLogs: any[] = [];
-// log types for filtering
-const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
 
 /**
  * React component that defines the log message page
@@ -33,37 +42,38 @@ const logTypes = ['ERROR', 'INFO', 'WARN', 'SILENT'];
  */
 export default function LogMsgComponent() {
 	const locale = useAppSelector(selectSelectedLanguage);
-
 	// Log messages state
 	const [logs, setLogs] = React.useState(initialLogs);
-	// Selected log types for filtering in the update log
-	const [selectedUpdateLogTypes, setSelectedUpdateLogTypes] = React.useState<string[]>(logTypes);
-	// Dropdown open state for log type in the header for filtering
-	const [typeTableDropdown, setTypeTableDropdown] = React.useState(false);
-	// Selected log types for filtering in the table
-	const [selectedTableLogTypes, setSelectedTableLogTypes] = React.useState<string[]>(logTypes);
-	// Dropdown open state for log type in the table for filtering
-	const [updateLogDropdown, setUpdateLogDropdown] = React.useState(false);
-	// Sort order for date column in the table
-	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
 	// Log messages date range state
 	const [logDateRange, setLogDateRange] = React.useState<TimeInterval>(TimeInterval.unbounded());
+	// Sort order for date column in the table
+	const [dateSortOrder, setDateSortOrder] = React.useState<'asc' | 'desc'>('asc');
 	// Number of log messages to display
-	const [logLimit, setLogLimit] = React.useState(0);
-	// "Select All Logs" button state for update log
-	const [selectAllUpdate, setSelectAllUpdate] = React.useState(true);
-	// "Select All Logs" button state for table log
-	const [selectAllTable, setSelectAllTable] = React.useState(true);
+	const [logLimit, setLogLimit] = React.useState(PER_PAGE);
 	// Current page state for pagination
 	const [currentPage, setCurrentPage] = React.useState(1);
-	// Modal state for displaying full log message
-	const [modalOpen, setModalOpen] = React.useState(false);
-	// Full log message to display in the modal
-	const [modalLogMessage, setModalLogMessage] = React.useState('');
 	// Showing all logs instead of paginated
 	const [showAllLogs, setShowAllLogs] = React.useState(false);
 	// Update button state
 	const [buttonAvailable, setButtonAvailable] = React.useState(false);
+	// Modal state for displaying full log message
+	const [modalOpen, setModalOpen] = React.useState(false);
+	// Log type and time to display in the modal header
+	const [modelHeader, setModelHeader] = React.useState('');
+	// Full log message to display in the modal
+	const [modalLogMessage, setModalLogMessage] = React.useState('');
+	// Selected log types for filtering in the update log
+	const [selectedUpdateLogTypes, setSelectedUpdateLogTypes] = React.useState<string[]>(logTypes);
+	// "Select All Logs" button state for update log
+	const [selectAllUpdate, setSelectAllUpdate] = React.useState(true);
+	// Dropdown open state for log type in the header for filter
+	const [typeTableDropdown, setTypeTableDropdown] = React.useState(false);
+	// Selected log types for filtering in the table
+	const [selectedTableLogTypes, setSelectedTableLogTypes] = React.useState<string[]>(logTypes);
+	// Dropdown open state for log type in the table for filtering
+	const [updateLogDropdown, setUpdateLogDropdown] = React.useState(false);
+	// "Select All Logs" button state for table log
+	const [selectAllTable, setSelectAllTable] = React.useState(true);
 
 	// Update the availability of the update button each time the selected log types, log limit, or date range changes
 	React.useEffect(() => {
@@ -71,25 +81,30 @@ export default function LogMsgComponent() {
 	}, [selectedUpdateLogTypes, logLimit, logDateRange]);
 
 	// Open modal with the full log message
-	const handleLogMessageClick = (logMessage: string) => {
+	const handleLogMessageModal = (logType: string, logTime: string, logMessage: string) => {
+		setModelHeader(`[${logType}] ${moment(logTime).toLocaleString()}`);
 		setModalLogMessage(logMessage);
 		setModalOpen(true);
 	};
 
 	// Handle checkbox change for log type in the table
 	const handleTableCheckboxChange = (logType: string) => {
-		if (selectedTableLogTypes.includes(logType)) { // Remove log type if already selected
+		if (selectedTableLogTypes.includes(logType)) {
+			// Remove log type if already selected
 			setSelectedTableLogTypes(selectedTableLogTypes.filter(type => type !== logType));
-		} else { // Add log type if not selected
+		} else {
+			// Add log type if not selected
 			setSelectedTableLogTypes([...selectedTableLogTypes, logType]);
 		}
 	};
 
 	// Handle checkbox change for log type in the update log
 	const handleUpdateCheckboxChange = (logType: string) => {
-		if (selectedUpdateLogTypes.includes(logType)) {  // Remove log type if already selected
+		if (selectedUpdateLogTypes.includes(logType)) {
+			// Remove log type if already selected
 			setSelectedUpdateLogTypes(selectedUpdateLogTypes.filter(type => type !== logType));
-		} else { // Add log type if not selected
+		} else {
+			// Add log type if not selected
 			setSelectedUpdateLogTypes([...selectedUpdateLogTypes, logType]);
 		}
 	};
@@ -114,13 +129,13 @@ export default function LogMsgComponent() {
 	const handleDateSort = () => {
 		const newDateSortOrder = dateSortOrder === 'asc' ? 'desc' : 'asc';
 		const sortedLogs = [...logs].sort((a, b) => {
-			const dateA = new Date(a.logTime);
-			const dateB = new Date(b.logTime);
+			const dateA = moment(a.logTime);
+			const dateB = moment(b.logTime);
 
 			if (newDateSortOrder === 'asc') {
-				return dateA.getTime() - dateB.getTime();
+				return dateA.valueOf() - dateB.valueOf();
 			} else {
-				return dateB.getTime() - dateA.getTime();
+				return dateB.valueOf() - dateA.valueOf();
 			}
 		});
 		setDateSortOrder(newDateSortOrder);
@@ -165,20 +180,15 @@ export default function LogMsgComponent() {
 	 * Handle showing the log table by fetching from the server
 	 */
 	async function handleShowLogTable() {
-		// Number of logs being fetched must be between 1 and 1000
-		if (!logLimit || logLimit < 1 || logLimit > 1000) {
-			showWarnNotification(translate('log.limit.required'));
-		} else {
-			try {
-				// get log by date and type
-				const data = await logsApi.getLogsByDateRangeAndType(logDateRange, selectedUpdateLogTypes, logLimit.toString());
-				setLogs(data);
-				// reset pagination to first page after fetching new logs
-				setCurrentPage(1);
-				setButtonAvailable(true);
-			} catch (error) {
-				console.error(error);
-			}
+		try {
+			// get log by date and type
+			const data = await logsApi.getLogsByDateRangeAndType(logDateRange, selectedUpdateLogTypes, logLimit.toString());
+			setLogs(data);
+			// reset pagination to first page after fetching new logs
+			setCurrentPage(1);
+			setButtonAvailable(true);
+		} catch (error) {
+			console.error(error);
 		}
 	}
 
@@ -223,7 +233,8 @@ export default function LogMsgComponent() {
 						onChange={handleDateRangeChange}
 						minDate={new Date(1970, 0, 1)}
 						maxDate={new Date()}
-						locale={locale} // Formats Dates, and Calendar months base on locale
+						// Formats Dates, and Calendar months base on locale
+						locale={locale}
 						calendarIcon={null}
 						calendarProps={{ defaultView: 'year' }} />
 				</FormGroup>
@@ -237,11 +248,20 @@ export default function LogMsgComponent() {
 						placeholder={translate('from.1.to.1000')}
 						type="number"
 						onChange={e => setLogLimit(e.target.valueAsNumber)}
-						invalid={logLimit < 1 || logLimit > 1000}
+						invalid={!logLimit || logLimit < 1 || logLimit > 1000}
 						value={logLimit}
 					/>
+					<FormFeedback>
+						{translate('log.limit.required')}
+					</FormFeedback>
 				</FormGroup>
-				<Button color='primary' disabled={buttonAvailable} onClick={handleShowLogTable}>{translate('log.msg.update')}</Button>
+				<Button
+					color='primary'
+					disabled={buttonAvailable || !logLimit || logLimit < 1 || logLimit > 1000}
+					onClick={handleShowLogTable}
+				>
+					{translate('update')[0].toUpperCase() + translate('update').slice(1)}
+				</Button>
 			</div>
 
 			{/* Display log messages table */}
@@ -286,7 +306,7 @@ export default function LogMsgComponent() {
 								<td>{log.logType}</td>
 								<td
 									style={{ cursor: 'pointer' }}
-									onClick={() => handleLogMessageClick(log.logMessage)}
+									onClick={() => handleLogMessageModal(log.logType, log.logTime, log.logMessage)}
 								>{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}</td>
 								<td>
 									{new Date(log.logTime).toLocaleString('en-US', {
@@ -340,7 +360,7 @@ export default function LogMsgComponent() {
 
 			{/* Modal for displaying full log message */}
 			<Modal isOpen={modalOpen} toggle={() => setModalOpen(!modalOpen)} centered>
-				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>{translate('log.message')}</ModalHeader>
+				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>{modelHeader}</ModalHeader>
 				<ModalBody>
 					{modalLogMessage}
 				</ModalBody>
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index e789bb182..95395495f 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -8,9 +8,9 @@
 const LocaleTranslationData = {
 	"en": {
 		"3D": "3D",
+		"4.weeks": "4 Weeks",
 		"400": "400 Bad Request",
 		"404": "404 Not Found",
-		"4.weeks": "4 Weeks",
 		"action": "Action",
 		"add.new.meters": "Add new meters",
 		"admin.only": "Admin Only",
@@ -18,16 +18,16 @@ const LocaleTranslationData = {
 		"alphabetically": "Alphabetically",
 		"area": "Area:",
 		"area.but.no.unit": "You have entered a nonzero area but no area unit.",
+		"area.calculate.auto": "Calculate Group Area",
 		"area.error": "Please enter a number for area",
 		"area.normalize": "Normalize by Area",
-		"area.calculate.auto": "Calculate Group Area",
 		"area.unit": "Area Unit:",
 		"AreaUnitType.feet": "sq. feet",
 		"AreaUnitType.meters": "sq. meters",
 		"AreaUnitType.none": "no unit",
-		"ascending": "Ascending",
-		"as.meter.unit": "as meter unit",
 		"as.meter.defaultgraphicunit": "as meter default graphic unit",
+		"as.meter.unit": "as meter unit",
+		"ascending": "Ascending",
 		"bar": "Bar",
 		"bar.interval": "Bar Interval",
 		"bar.raw": "Cannot create bar graph on raw units such as temperature",
@@ -53,8 +53,6 @@ const LocaleTranslationData = {
 		"confirm.action": "Confirm Action",
 		"contact.us": "Contact us",
 		"conversion": "Conversion",
-		"conversions": "Conversions",
-		"ConversionType.conversion": "conversion",
 		"conversion.bidirectional": "Bidirectional:",
 		"conversion.create.destination.meter": "The destination cannot be a meter",
 		"conversion.create.exists": "This conversion already exists",
@@ -80,16 +78,14 @@ const LocaleTranslationData = {
 		"conversion.successfully.create.conversion": "Successfully created a conversion.",
 		"conversion.successfully.delete.conversion": "Successfully deleted conversion.",
 		"conversion.successfully.edited.conversion": "Successfully edited conversion.",
+		"conversions": "Conversions",
+		"ConversionType.conversion": "conversion",
 		"create.conversion": "Create a Conversion",
 		"create.group": "Create a Group",
 		"create.map": "Create a Map",
-		"create.user": "Create a User",
 		"create.unit": "Create a Unit",
+		"create.user": "Create a User",
 		"csv": "CSV",
-		"csvMeters": "CSV Meters",
-		"csvReadings": "CSV Readings",
-		"csv.file": "CSV File:",
-		"csv.file.error": "File must be in CSV format or GZIP format (.csv or .gz). ",
 		"csv.clear.button": "Clear Form",
 		"csv.common.param.gzip": "Gzip",
 		"csv.common.param.header.row": "Header Row",
@@ -97,6 +93,8 @@ const LocaleTranslationData = {
 		"csv.download.size.limit": "Sorry you don't have permissions to download due to large number of points.",
 		"csv.download.size.warning.size": "Total size of all files will be about (usually within 10% for large exports).",
 		"csv.download.size.warning.verify": "Are you sure you want to download",
+		"csv.file": "CSV File:",
+		"csv.file.error": "File must be in CSV format or GZIP format (.csv or .gz). ",
 		"csv.readings.param.create.meter": "Create Meter",
 		"csv.readings.param.honor.dst": "Honor Daylight Savings Time",
 		"csv.readings.param.meter.identifier": "Meter Identifier:",
@@ -111,6 +109,8 @@ const LocaleTranslationData = {
 		"csv.tab.readings": "Readings",
 		"csv.upload.meters": "Upload Meters",
 		"csv.upload.readings": "Upload Readings",
+		"csvMeters": "CSV Meters",
+		"csvReadings": "CSV Readings",
 		"custom.value": "Custom value",
 		"date.range": 'Date Range',
 		"day": "Day",
@@ -120,52 +120,52 @@ const LocaleTranslationData = {
 		"default.area.normalize": "Normalize readings by area by default",
 		"default.area.unit": "Default Area Unit",
 		"default.bar.stacking": "Stack bars by default",
-		"default.graph.type": "Default Graph Type",
-		"default.graph.settings": "Default Graph Settings",
-		"defaultGraphicUnit": "Default Graphic Unit:",
-		"default.language": "Default Language",
-		"default.meter.reading.frequency": "Default meter reading frequency",
-		"default.warning.file.size": "Default Warning File Size",
 		"default.file.size.limit": "Default File Size Limit",
+		"default.graph.settings": "Default Graph Settings",
+		"default.graph.type": "Default Graph Type",
 		"default.help.url": "Documentation URL",
-		"default.time.zone": "Default Time Zone",
-		"default.meter.minimum.value": "Default meter minimum reading value check",
+		"default.language": "Default Language",
+		"default.meter.disable.checks": "Default meter disable checks",
+		"default.meter.maximum.date": "Default meter maximum reading date check",
+		"default.meter.maximum.errors": "Default maximum number of errors in meter reading",
 		"default.meter.maximum.value": "Default meter maximum reading value check",
 		"default.meter.minimum.date": "Default meter minimum reading date check",
-		"default.meter.maximum.date": "Default meter maximum reading date check",
+		"default.meter.minimum.value": "Default meter minimum reading value check",
+		"default.meter.reading.frequency": "Default meter reading frequency",
 		"default.meter.reading.gap": "Default meter reading gap",
-		"default.meter.maximum.errors": "Default maximum number of errors in meter reading",
-		"default.meter.disable.checks": "Default meter disable checks",
+		"default.time.zone": "Default Time Zone",
+		"default.warning.file.size": "Default Warning File Size",
+		"defaultGraphicUnit": "Default Graphic Unit:",
 		"delete.group": "Delete Group",
 		"delete.map": "Delete Map",
 		"delete.self": "Cannot delete your own Account.",
 		"delete.user": "Delete User",
 		"descending": "Descending",
-		"discard.changes": "Discard Changes",
 		"disable": "Disable",
+		"discard.changes": "Discard Changes",
 		"displayable": "Displayable:",
-		"DisplayableType.none": "none",
-		"DisplayableType.all": "all",
 		"DisplayableType.admin": "admin",
-		"error.bounds": "Must be between {min} and {max}.",
-		"error.displayable": "Displayable will be set to false because no unit is selected.",
-		"error.displayable.meter": "Meter units will set displayable to none.",
-		"error.displayable.suffix.input": "Suffix input will set displayable to none.",
-		"error.greater": "Must be greater than {min}.",
-		"error.gps": "Latitude must be between -90 and 90, and Longitude must be between -180 and 180.",
-		"error.negative": "Cannot be negative.",
-		"error.required": "Required field.",
-		"error.unknown": "Oops! An error has occurred.",
+		"DisplayableType.all": "all",
+		"DisplayableType.none": "none",
 		"edit": "Edit",
-		"edited": "edited",
 		"edit.a.group": "Edit a Group",
 		"edit.a.meter": "Edit a Meter",
 		"edit.group": "Edit Group",
 		"edit.meter": "Details/Edit Meter",
 		"edit.unit": "Edit Unit",
 		"edit.user": "Edit User",
+		"edited": "edited",
 		"enable": "Enable",
 		"error.bar": "Show error bars",
+		"error.bounds": "Must be between {min} and {max}.",
+		"error.displayable": "Displayable will be set to false because no unit is selected.",
+		"error.displayable.meter": "Meter units will set displayable to none.",
+		"error.displayable.suffix.input": "Suffix input will set displayable to none.",
+		"error.gps": "Latitude must be between -90 and 90, and Longitude must be between -180 and 180.",
+		"error.greater": "Must be greater than {min}.",
+		"error.negative": "Cannot be negative.",
+		"error.required": "Required field.",
+		"error.unknown": "Oops! An error has occurred.",
 		"export.graph.data": "Export graph data",
 		"export.raw.graph.data": "Export graph meter data",
 		"failed.to.create.map": "Failed to create map",
@@ -175,6 +175,7 @@ const LocaleTranslationData = {
 		"failed.to.link.graph": "Failed to link graph",
 		"failed.to.submit.changes": "Failed to submit changes",
 		"false": "False",
+		"from.1.to.1000": "from 1 to 1000",
 		"gps": "GPS: latitude, longitude",
 		"graph": "Graph",
 		"graph.settings": "Graph Settings",
@@ -182,12 +183,12 @@ const LocaleTranslationData = {
 		"group": "Group",
 		"group.all.meters": "All Meters",
 		"group.area.calculate": "Calculate Group Area",
-		"group.area.calculate.header": "Group Area will be set to ",
+		"group.area.calculate.error.group.unit": "No group area unit",
 		"group.area.calculate.error.header": "The following meters were excluded from the sum because:",
-		"group.area.calculate.error.zero": ": area is unset or zero",
-		"group.area.calculate.error.unit": ": nonzero area but no area unit",
 		"group.area.calculate.error.no.meters": "No meters in group",
-		"group.area.calculate.error.group.unit": "No group area unit",
+		"group.area.calculate.error.unit": ": nonzero area but no area unit",
+		"group.area.calculate.error.zero": ": area is unset or zero",
+		"group.area.calculate.header": "Group Area will be set to ",
 		"group.create.nounit": "The default graphic unit was changed to no unit from ",
 		"group.delete.group": "Delete Group",
 		"group.delete.issue": "is contained in the following groups and cannot be deleted",
@@ -205,14 +206,14 @@ const LocaleTranslationData = {
 		"group.hidden": "At least one group is not visible to you",
 		"group.input.error": "Input invalid so group not created or edited.",
 		"group.name.error": "Please enter a valid name: (must have at least one character that is not a space)",
-		"groups": "Groups",
 		"group.successfully.create.group": "Successfully created a group.",
 		"group.successfully.edited.group": "Successfully edited group.",
+		"groups": "Groups",
 		"groups.select": "Select Groups",
 		"has.no.data": "has no current data",
 		"has.used": "has used",
-		"header.pages": "Pages",
 		"header.options": "Options",
+		"header.pages": "Pages",
 		"help": "Help",
 		"help.admin.conversioncreate": "This page allows admins to create conversions. Please visit {link} for further details and information.",
 		"help.admin.conversionedit": "This page allows admins to edit conversions. Please visit {link} for further details and information.",
@@ -232,14 +233,13 @@ const LocaleTranslationData = {
 		"help.admin.users": "This page allows admins to view and edit users. Please visit {link} for further details and information.",
 		"help.csv.meters": "This page allows admins to upload meters via a CSV file. Please visit {link} for further details and information.",
 		"help.csv.readings": "This page allows certain users to upload readings via a CSV file. Please visit {link} for further details and information.",
+		"help.groups.area.calculate": "This will sum together the area of all meters in this group with a nonzero area with an area unit. It will ignore any meters which have no area or area unit. If this group has no area unit, it will do nothing.",
 		"help.groups.groupdetails": "This page shows detailed information on a group. Please visit {link} for further details and information.",
 		"help.groups.groupview": "This page shows information on groups. Please visit {link} for further details and information.",
-		"help.groups.area.calculate": "This will sum together the area of all meters in this group with a nonzero area with an area unit. It will ignore any meters which have no area or area unit. If this group has no area unit, it will do nothing.",
 		"help.home.area.normalize": "Toggles normalization by area. Meters/Groups without area will be hidden. Please visit {link} for further details and information.",
 		"help.home.bar.days.tip": "Allows user to select the desired number of days for each bar.  Please see {link} for further details and information.",
 		"help.home.bar.interval.tip": "Selects the time interval (Day, Week or 4 Weeks) for each bar.  Please see {link} for further details and information.",
 		"help.home.bar.stacking.tip": "Bars stack on top of each other. Please see {link} for further details and information.",
-		"help.home.map.interval.tip": "Selects the time interval (the last Day, Week or 4 Weeks) for map corresponding to bar's time interval. Please see {link} for further details and information.",
 		"help.home.chart.plotly.controls": "These controls are provided by Plotly, the graphics package used by OED. You generally do not need them but they are provided in case you want that level of control. Note that some of these options may not interact nicely with OED features. See Plotly documentation at {link}.",
 		"help.home.chart.redraw.restore": "OED automatically averages data when necessary so the graphs have a reasonable number of points. If you use the controls under the graph to scroll and/or zoom, you may find the resolution at this averaged level is not what you desire. Clicking the \"Redraw\" button will have OED recalculate the averaging and bring in higher resolution for the number of points it displays. If you want to restore the graph to the full range of dates, then click the \"Restore\" button. Please visit {link} for further details and information.",
 		"help.home.chart.select": "Any graph type can be used with any combination of groups and meters. Line graphs show the usage (e.g., kW) vs. time. You can zoom and scroll with the controls right below the graph. Bar shows the total usage (e.g., kWh) for the time frame of each bar where you can control the time frame. Compare allows you to see the current usage vs. the usage in the last previous period for a day, week and four weeks. Map graphs show a spatial image of each meter where the circle size is related to four weeks of usage. 3D graphs show usage vs. day vs. hours in the day. Clicking on one of the choices renders that graphic. Please visit {link} for further details and information.",
@@ -248,6 +248,7 @@ const LocaleTranslationData = {
 		"help.home.error.bar": "Toggle error bars with min and max value. Please visit {link} for further details and information.",
 		"help.home.export.graph.data": "With the \"Export graph data\" button, one can export the data for the graph when viewing either a line or bar graphic. The zoom and scroll feature on the line graph allows you to control the time frame of the data exported. The \"Export graph data\" button gives the data points for the graph and not the original meter data. The \"Export graph meter data\" gives the underlying meter data (line graphs only). Please visit {link} for further details and information on when meter data export is allowed.",
 		"help.home.history": "Allows the user to navigate through the recent history of graphs. Please visit {link} for further details and information.",
+		"help.home.map.interval.tip": "Selects the time interval (the last Day, Week or 4 Weeks) for map corresponding to bar's time interval. Please see {link} for further details and information.",
 		"help.home.navigation": "The \"Graph\" button goes to the graphic page, the \"Pages\" dropdown allows navigation to information pages, the \"Options\" dropdown allows selection of language, hide options and login/out and the \"Help\" button goes to the help pages. See help on the dropdown menus or the linked pages for further information.",
 		"help.home.readings.per.day": "The number of readings shown for each day in a 3D graphic. Please visit {link} for further details and information.",
 		"help.home.select.dateRange": "Select date range used in graphic display. For 3D graphic must be one year or less. Please visit {link} for further details and information.",
@@ -290,18 +291,22 @@ const LocaleTranslationData = {
 		"less.energy": "less energy",
 		"line": "Line",
 		"log.in": "Log in",
+		"log.limit.required": "Number of logs to display must be within 1 to 1000",
+		"log.message": "Log Message",
+		"log.messages": "Log Messages",
 		"log.out": "Log out",
+		"log.time": "Log Time",
+		"log.type": "Log Type",
 		"login.failed": "Failed logging in",
 		"login.success": "Login Successful",
 		"logo": "Logo",
 		"manage": "Manage",
 		"map": "Map",
-		"maps": "Maps",
+		"map.bad.digita": "Greater than 360, please change angle to a number between 0 and 360",
+		"map.bad.digitb": "Less than 0, please change angle to a number between 0 and 360",
 		"map.bad.load": "Map image file needed",
 		"map.bad.name": "Map name needed",
 		"map.bad.number": "Not a number, please change angle to a number between 0 and 360",
-		"map.bad.digita": "Greater than 360, please change angle to a number between 0 and 360",
-		"map.bad.digitb": "Less than 0, please change angle to a number between 0 and 360",
 		"map.calibrate": "Calibrate",
 		"map.calibration": "Calibration status",
 		"map.circle.size": "Map Circle Size",
@@ -325,39 +330,35 @@ const LocaleTranslationData = {
 		"map.notify.calibration.needed": "Calibration needed before display",
 		"map.unavailable": "There's not an available map",
 		"map.upload.new.file": "Redo",
+		"maps": "Maps",
 		"max": "max",
 		"menu": "Menu",
 		"meter": "Meter",
-		"meters": "Meters",
 		"meter.create": "Create a Meter",
 		"meter.cumulative": "Cumulative:",
 		"meter.cumulativeReset": "Cumulative Reset:",
 		"meter.cumulativeResetEnd": "Cumulative Reset End:",
 		"meter.cumulativeResetStart": "Cumulative Reset Start:",
-		"meter.edit.displayable.warning": "is not displayable but is used by the following displayable groups:",
+		"meter.disableChecks": "Disable Checks",
 		"meter.edit.displayable.verify": "Given the group(s) listed above, do you want to cancel this change (click Cancel) or continue (click OK)?",
+		"meter.edit.displayable.warning": "is not displayable but is used by the following displayable groups:",
 		"meter.enabled": "Updates:",
 		"meter.endOnlyTime": "Only End Times:",
 		"meter.endTimeStamp": "End Time Stamp:",
-		"meter.minVal": "Minimum Reading Value Check",
-		"meter.maxVal": "Maximum Reading Value Check",
-		"meter.minDate": "Minimum Reading Date Check",
-		"meter.maxDate": "Maximum Reading Date Check",
-		"meter.maxError": "Maximum Number of Errors Check",
-		"meter.disableChecks": "Disable Checks",
 		"meter.failed.to.create.meter": "Failed to create a meter with message: ",
 		"meter.failed.to.edit.meter": "Failed to edit meter with message: ",
 		"meter.hidden": "At least one meter is not visible to you",
 		"meter.id": "ID",
 		"meter.input.error": "Input invalid so meter not created or edited.",
-		"meter.unit.change.requires": "needs to be changed before changing this unit's type",
-		"meter.unitName": "Unit:",
-		"meter.url": "URL:",
 		"meter.is.displayable": "Display Enabled",
 		"meter.is.enabled": "Updates Enabled",
 		"meter.is.not.displayable": "Display Disabled",
 		"meter.is.not.enabled": "Updates Disabled",
-		"meter.unit.is.not.editable": "This meter's unit cannot be changed and was put back to the original value because: ",
+		"meter.maxDate": "Maximum Reading Date Check",
+		"meter.maxError": "Maximum Number of Errors Check",
+		"meter.maxVal": "Maximum Reading Value Check",
+		"meter.minDate": "Minimum Reading Date Check",
+		"meter.minVal": "Minimum Reading Value Check",
 		"meter.previousEnd": "Previous End Time Stamp:",
 		"meter.reading": "Reading:",
 		"meter.readingDuplication": "Reading Duplication:",
@@ -368,19 +369,26 @@ const LocaleTranslationData = {
 		"meter.startTimeStamp": "Start Time Stamp:",
 		"meter.successfully.create.meter": "Successfully created a meter.",
 		"meter.successfully.edited.meter": "Successfully edited meter.",
-		"meter.timeSort": "Time Sort:",
 		"meter.time.zone": "Time Zone:",
+		"meter.timeSort": "Time Sort:",
 		"meter.type": "Type:",
-		"minute": "Minute",
+		"meter.unit.change.requires": "needs to be changed before changing this unit's type",
+		"meter.unit.is.not.editable": "This meter's unit cannot be changed and was put back to the original value because: ",
+		"meter.unitName": "Unit:",
+		"meter.url": "URL:",
+		"meters": "Meters",
 		"min": "min",
+		"minute": "Minute",
 		"more.energy": "more energy",
 		"more.options": "More Options",
 		"name": "Name:",
 		"navigation": "Navigation",
 		"need.more.points": "Need more points",
 		"no": "no",
-		"note": "Note: ",
 		"no.data.in.range": "No Data In Date Range",
+		"no.logs": "No logs to display. Please select another log type or data range",
+		"note": "Note: ",
+		"num.logs.display": "Number of logs to display",
 		"oed": "Open Energy Dashboard",
 		"oed.description": "Open Energy Dashboard is an independent open source project. ",
 		"oed.version": "OED version ",
@@ -403,8 +411,8 @@ const LocaleTranslationData = {
 		"rate.limit.error.first": "You have been rate limited by your OED site",
 		"rate.limit.error.second": "We suggest you try these in this order:",
 		"reading": "Reading:",
-		"redo.cik.and.refresh.db.views": "Processing changes. This may take a while.",
 		"readings.per.day": "Readings per Day",
+		"redo.cik.and.refresh.db.views": "Processing changes. This may take a while.",
 		"redraw": "Redraw",
 		"refresh.page.first": "Click the Refresh this page' button below to try again",
 		"refresh.page.second": "If you keep returning to this page wait longer and click 'Refresh this page' button",
@@ -418,11 +426,12 @@ const LocaleTranslationData = {
 		"save.meter.edits": "Save meter edits",
 		"save.role.changes": "Save role changes",
 		"second": "Second",
+		"select.all": "Select All",
 		"select.groups": "Select Groups",
 		"select.map": "Select Map",
 		"select.meter": "Select Meter",
-		"select.meter.type": "Select Meter Type",
 		"select.meter.group": "Select meter or group to graph",
+		"select.meter.type": "Select Meter Type",
 		"select.meters": "Select Meters",
 		"select.unit": "Select Unit",
 		"show": "Show",
@@ -432,12 +441,11 @@ const LocaleTranslationData = {
 		"site.title": "Site Title",
 		"sort": "Sort Order",
 		"submit": "Submit",
-		"submitting": "submitting",
 		"submit.changes": "Submit changes",
 		"submit.new.user": "Submit new user",
+		"submitting": "submitting",
 		"the.unit.of.meter": "The unit of meter",
 		"this.four.weeks": "These four weeks",
-		"timezone.no": "No timezone",
 		"this.week": "This week",
 		"threeD.area.incompatible": "<br>is incompatible<br> with area normalization",
 		"threeD.date": "Date",
@@ -449,28 +457,23 @@ const LocaleTranslationData = {
 		"threeD.y.axis.label": "Days of Calendar Year",
 		"TimeSortTypes.decreasing": "decreasing",
 		"TimeSortTypes.increasing": "increasing",
+		"timezone.no": "No timezone",
 		"today": "Today",
 		"toggle.link": "Toggle chart link",
-		"toggle.options" : "Toggle options",
+		"toggle.options": "Toggle options",
 		"total": "total",
 		"true": "True",
 		"TrueFalseType.false": "no",
 		"TrueFalseType.true": "yes",
 		"undefined": "undefined",
 		"unit": "Unit",
-		"UnitRepresentType.quantity": "quantity",
-		"UnitRepresentType.flow": "flow",
-		"UnitRepresentType.raw": "raw",
-		"UnitType.unit": "unit",
-		"UnitType.meter": "meter",
-		"UnitType.suffix": "suffix",
 		"unit.delete.failure": "Failed to deleted unit with error: ",
 		"unit.delete.success": "Successfully deleted unit",
 		"unit.delete.unit": "Delete Unit",
 		"unit.destination.error": "as the destination unit",
-		"unit.dropdown.displayable.option.none": "None",
-		"unit.dropdown.displayable.option.all": "All",
 		"unit.dropdown.displayable.option.admin": "admin",
+		"unit.dropdown.displayable.option.all": "All",
+		"unit.dropdown.displayable.option.none": "None",
 		"unit.failed.to.create.unit": "Failed to create a unit.",
 		"unit.failed.to.delete.unit": "Delete cannot be done because this unit is used by the following",
 		"unit.failed.to.edit.unit": "Failed to edit unit.",
@@ -486,8 +489,14 @@ const LocaleTranslationData = {
 		"unit.suffix": "Suffix:",
 		"unit.type.of.unit": "Type of Unit:",
 		"unit.type.of.unit.suffix": "Added suffix will set type of unit to suffix",
+		"UnitRepresentType.flow": "flow",
+		"UnitRepresentType.quantity": "quantity",
+		"UnitRepresentType.raw": "raw",
 		"units": "Units",
 		"units.conversion.page.title": "Units and Conversions Visual Graphics",
+		"UnitType.meter": "meter",
+		"UnitType.suffix": "suffix",
+		"UnitType.unit": "unit",
 		"unsaved.failure": "Changes failed to save",
 		"unsaved.success": "Changes saved",
 		"unsaved.warning": "You have unsaved change(s). Are you sure you want to leave?",
@@ -502,13 +511,13 @@ const LocaleTranslationData = {
 		"upload.readings.csv": "Upload readings CSV file",
 		"used.so.far": "used so far",
 		"used.this.time": "used this time",
-		"username": "Username:",
 		"user.delete.confirm": "Delete the user: ",
 		"user.password.edit": "Only enter password to update password",
 		"user.password.length": "Password must be a minimum of 8 characters",
 		"user.password.mismatch": "Passwords do not match",
 		"user.role": "Role: ",
 		"user.role.select": "Select Role",
+		"username": "Username:",
 		"users": "Users",
 		"users.failed.to.create.user": "Failed to create the user: ",
 		"users.failed.to.delete.user": "Failed to delete the user: ",
@@ -519,31 +528,20 @@ const LocaleTranslationData = {
 		"uses": "uses",
 		"view.groups": "View Groups",
 		"visit": " or visit our ",
-		"visual.unit": "Units Visual Graphics",
-		"visual.input.units.graphic": "Input Units Visual Graphic",
 		"visual.analyzed.units.graphic": "Analyzed Units Visual Graphic",
+		"visual.input.units.graphic": "Input Units Visual Graphic",
+		"visual.unit": "Units Visual Graphics",
 		"website": "website",
 		"week": "Week",
 		"yes": "yes",
 		"yesterday": "Yesterday",
 		"you.cannot.create.a.cyclic.group": "You cannot create a cyclic group",
-		"log.messages": "Log Messages",
-		"log.message": "Log Message",
-		"log.type": "Log Type",
-		"log.time": "Log Time",
-		"num.logs.display": "Number of logs to display",
-		"log.msg.update": "Update",
-		"from.1.to.1000": "from 1 to 1000",
-		"show.logs": "Show Log Table",
-		"select.all": "Select All",
-		"no.logs": "No logs to display. Please select another log type or data range",
-		"log.limit.required": "You must enter a valid number of logs to display"
 	},
 	"fr": {
 		"3D": "3D",
+		"4.weeks": "4 Semaines",
 		"400": "400 Bad Request\u{26A1}",
 		"404": "404 Introuvable",
-		"4.weeks": "4 Semaines",
 		"action": "Action\u{26A1}",
 		"add.new.meters": "Ajouter de Nouveaux Mètres",
 		"admin.only": "Uniquement pour Les Administrateurs",
@@ -551,16 +549,16 @@ const LocaleTranslationData = {
 		"alphabetically": "Alphabétiquement",
 		"area": "Région:",
 		"area.but.no.unit": "You have entered a nonzero area but no area unit.\u{26A1}",
+		"area.calculate.auto": "Calculate Group Area\u{26A1}",
 		"area.error": "Please enter a number for area\u{26A1}",
 		"area.normalize": "Normalize by Area\u{26A1}",
-		"area.calculate.auto": "Calculate Group Area\u{26A1}",
 		"area.unit": "Area Unit:\u{26A1}",
 		"AreaUnitType.feet": "pieds carrés",
 		"AreaUnitType.meters": "mètre carré",
 		"AreaUnitType.none": "no unit\u{26A1}",
-		"ascending": "Ascendant",
-		"as.meter.unit": "as meter unit\u{26A1}",
 		"as.meter.defaultgraphicunit": "as meter default graphic unit\u{26A1}",
+		"as.meter.unit": "as meter unit\u{26A1}",
+		"ascending": "Ascendant",
 		"bar": "Bande",
 		"bar.interval": "Intervalle du Diagramme à Bandes",
 		"bar.raw": "Cannot create bar graph on raw units such as temperature\u{26A1}",
@@ -586,8 +584,6 @@ const LocaleTranslationData = {
 		"confirm.action": "Confirm Action\u{26A1}",
 		"contact.us": "Contactez nous",
 		"conversion": "Conversion\u{26A1}",
-		"conversions": "Conversions\u{26A1}",
-		"ConversionType.conversion": "conversion\u{26A1}",
 		"conversion.bidirectional": "Bidirectional:\u{26A1}",
 		"conversion.create.destination.meter": "The destination cannot be a meter\u{26A1}",
 		"conversion.create.exists": "This conversion already exists\u{26A1}",
@@ -613,16 +609,14 @@ const LocaleTranslationData = {
 		"conversion.successfully.create.conversion": "Successfully created a conversion.\u{26A1}",
 		"conversion.successfully.delete.conversion": "Successfully deleted conversion.\u{26A1}",
 		"conversion.successfully.edited.conversion": "Successfully edited conversion.\u{26A1}",
+		"conversions": "Conversions\u{26A1}",
+		"ConversionType.conversion": "conversion\u{26A1}",
 		"create.conversion": "Create a Conversion\u{26A1}",
 		"create.group": "Créer un Groupe",
 		"create.map": "Créer une carte",
 		"create.unit": "Create a Unit\u{26A1}",
 		"create.user": "Créer un utilisateur",
 		"csv": "CSV",
-		"csvMeters": "CSV Meters\u{26A1}",
-		"csvReadings": "CSV Readings\u{26A1}",
-		"csv.file": "Fichier CSV:",
-		"csv.file.error": "Le fichier doit être au format CSV ou GZIP (.csv ou .gz). ",
 		"csv.clear.button": "Forme claire",
 		"csv.common.param.gzip": "Gzip",
 		"csv.common.param.header.row": "Ligne d'en-tête",
@@ -630,6 +624,8 @@ const LocaleTranslationData = {
 		"csv.download.size.limit": "Sorry you don't have permissions to download due to large number of points.\u{26A1}",
 		"csv.download.size.warning.size": "Total size of all files will be about (usually within 10% for large exports).\u{26A1}",
 		"csv.download.size.warning.verify": "Are you sure you want to download\u{26A1}",
+		"csv.file": "Fichier CSV:",
+		"csv.file.error": "Le fichier doit être au format CSV ou GZIP (.csv ou .gz). ",
 		"csv.readings.param.create.meter": "Créer un compteur",
 		"csv.readings.param.honor.dst": "Honor Daylight Savings Time\u{26A1}",
 		"csv.readings.param.meter.identifier": "Identifiant du compteur:",
@@ -644,6 +640,8 @@ const LocaleTranslationData = {
 		"csv.tab.readings": "Lectures",
 		"csv.upload.meters": "Téléverser Mètres",
 		"csv.upload.readings": "Téléverser Lectures",
+		"csvMeters": "CSV Meters\u{26A1}",
+		"csvReadings": "CSV Readings\u{26A1}",
 		"custom.value": "Custom value\u{26A1}",
 		"date.range": 'Plage de dates',
 		"day": "Journée",
@@ -653,52 +651,52 @@ const LocaleTranslationData = {
 		"default.area.normalize": "Normalize readings by area by default\u{26A1}",
 		"default.area.unit": "Default Area Unit\u{26A1}",
 		"default.bar.stacking": "Stack bars by default\u{26A1}",
-		"default.graph.type": "Type du Diagramme par Défaut",
-		"default.graph.settings": "Default Graph Settings\u{26A1}",
-		"defaultGraphicUnit": "Default Graphic Unit:\u{26A1}",
-		"default.language": "Langue par Défaut",
-		"default.meter.reading.frequency": "Default meter reading frequency\u{26A1}",
-		"default.warning.file.size": "Taille du fichier d'avertissement par défaut",
 		"default.file.size.limit": "Limite de taille de fichier par défaut",
+		"default.graph.settings": "Default Graph Settings\u{26A1}",
+		"default.graph.type": "Type du Diagramme par Défaut",
 		"default.help.url": "Documentation URL\u{26A1}",
-		"default.time.zone": "Zona Horaria Predeterminada",
-		"default.meter.minimum.value": "Default meter minimum reading value check\u{26A1}",
+		"default.language": "Langue par Défaut",
+		"default.meter.disable.checks": "Default meter disable checks\u{26A1}",
+		"default.meter.maximum.date": "Default meter maximum reading date check\u{26A1}",
+		"default.meter.maximum.errors": "Default maximum number of errors in meter reading\u{26A1}",
 		"default.meter.maximum.value": "Default meter maximum reading value check\u{26A1}",
 		"default.meter.minimum.date": "Default meter minimum reading date check\u{26A1}",
-		"default.meter.maximum.date": "Default meter maximum reading date check\u{26A1}",
+		"default.meter.minimum.value": "Default meter minimum reading value check\u{26A1}",
+		"default.meter.reading.frequency": "Default meter reading frequency\u{26A1}",
 		"default.meter.reading.gap": "Default meter reading gap\u{26A1}",
-		"default.meter.maximum.errors": "Default maximum number of errors in meter reading\u{26A1}",
-		"default.meter.disable.checks": "Default meter disable checks\u{26A1}",
+		"default.time.zone": "Zona Horaria Predeterminada",
+		"default.warning.file.size": "Taille du fichier d'avertissement par défaut",
+		"defaultGraphicUnit": "Default Graphic Unit:\u{26A1}",
 		"delete.group": "Supprimer le Groupe",
 		"delete.map": "Supprimer la carte",
 		"delete.self": "Impossible de supprimer votre propre compte.",
 		"delete.user": "Supprimer l'utilisateur",
 		"descending": "Descendant",
-		"discard.changes": "Annuler les Modifications",
 		"disable": "Désactiver",
+		"discard.changes": "Annuler les Modifications",
 		"displayable": "Affichable:",
-		"DisplayableType.none": "none\u{26A1}",
-		"DisplayableType.all": "all\u{26A1}",
 		"DisplayableType.admin": "admin\u{26A1}",
-		"error.bounds": "Must be between {min} and {max}.\u{26A1}",
-		"error.displayable": "Displayable will be set to false because no unit is selected.\u{26A1}",
-		"error.displayable.meter": "Meter units will set displayable to none.\u{26A1}",
-		"error.displayable.suffix.input": "Suffix input will set displayable to none.\u{26A1}",
-		"error.greater": "Must be greater than {min}.\u{26A1}",
-		"error.gps": "Latitude must be between -90 and 90, and Longitude must be between -180 and 180.\u{26A1}",
-		"error.negative": "Cannot be negative.\u{26A1}",
-		"error.required": "Required field.\u{26A1}",
-		"error.unknown": "Oops! An error has occurred.\u{26A1}",
+		"DisplayableType.all": "all\u{26A1}",
+		"DisplayableType.none": "none\u{26A1}",
 		"edit": "Modifier",
-		"edited": "édité",
 		"edit.a.group": "Modifier le Groupe",
 		"edit.a.meter": "Modifier le Métre",
 		"edit.group": "Modifier Groupe",
 		"edit.meter": "Details/Modifier Métre\u{26A1}",
 		"edit.unit": "Edit Unit\u{26A1}",
 		"edit.user": "Modifier l'utilisateur",
+		"edited": "édité",
 		"enable": "Activer",
 		"error.bar": "Show error bars\u{26A1}",
+		"error.bounds": "Must be between {min} and {max}.\u{26A1}",
+		"error.displayable": "Displayable will be set to false because no unit is selected.\u{26A1}",
+		"error.displayable.meter": "Meter units will set displayable to none.\u{26A1}",
+		"error.displayable.suffix.input": "Suffix input will set displayable to none.\u{26A1}",
+		"error.gps": "Latitude must be between -90 and 90, and Longitude must be between -180 and 180.\u{26A1}",
+		"error.greater": "Must be greater than {min}.\u{26A1}",
+		"error.negative": "Cannot be negative.\u{26A1}",
+		"error.required": "Required field.\u{26A1}",
+		"error.unknown": "Oops! An error has occurred.\u{26A1}",
 		"export.graph.data": "Exporter les données du diagramme",
 		"export.raw.graph.data": "Export graph meter data\u{26A1}",
 		"failed.to.create.map": "Échec de la création d'une carte",
@@ -708,6 +706,7 @@ const LocaleTranslationData = {
 		"failed.to.link.graph": "Échec de lier le graphique",
 		"failed.to.submit.changes": "Échec de l'envoi des modifications",
 		"false": "Faux",
+		"from.1.to.1000": "from 1 to 1000\u{26A1}",
 		"gps": "GPS: latitude, longitude\u{26A1}",
 		"graph": "Graphique",
 		"graph.settings": "Graph Settings\u{26A1}",
@@ -715,12 +714,12 @@ const LocaleTranslationData = {
 		"group": "Groupe",
 		"group.all.meters": "Tous les compteurs",
 		"group.area.calculate": "Calculate Group Area\u{26A1}",
-		"group.area.calculate.header": "Group Area will be set to \u{26A1}",
+		"group.area.calculate.error.group.unit": "No group area unit\u{26A1}",
 		"group.area.calculate.error.header": "The following meters were excluded from the sum because:\u{26A1}",
-		"group.area.calculate.error.zero": ": area is unset or zero\u{26A1}",
-		"group.area.calculate.error.unit": ": nonzero area but no area unit\u{26A1}",
 		"group.area.calculate.error.no.meters": "No meters in group\u{26A1}",
-		"group.area.calculate.error.group.unit": "No group area unit\u{26A1}",
+		"group.area.calculate.error.unit": ": nonzero area but no area unit\u{26A1}",
+		"group.area.calculate.error.zero": ": area is unset or zero\u{26A1}",
+		"group.area.calculate.header": "Group Area will be set to \u{26A1}",
 		"group.create.nounit": "The default graphic unit was changed to no unit from \u{26A1}",
 		"group.delete.group": "Delete Group\u{26A1}",
 		"group.delete.issue": "is contained in the following groups and cannot be deleted\u{26A1}",
@@ -738,14 +737,14 @@ const LocaleTranslationData = {
 		"group.hidden": "At least one group is not visible to you\u{26A1}",
 		"group.input.error": "Input invalid so group not created or edited.\u{26A1}",
 		"group.name.error": "Please enter a valid name: (must have at least one character that is not a space)\u{26A1}",
-		"groups": "Groupes",
 		"group.successfully.create.group": "Successfully created a group.\u{26A1}",
 		"group.successfully.edited.group": "Successfully edited group.\u{26A1}",
+		"groups": "Groupes",
 		"groups.select": "Sélectionnez des Groupes",
 		"has.no.data": "has no current data\u{26A1}",
 		"has.used": "a utilisé",
-		"header.pages": "Pages\u{26A1}",
 		"header.options": "Options\u{26A1}",
+		"header.pages": "Pages\u{26A1}",
 		"help": "Help\u{26A1}",
 		"help.admin.conversioncreate": "This page allows admins to create conversions. Please visit {link} for further details and information.\u{26A1}",
 		"help.admin.conversionedit": "This page allows admins to edit conversions. Please visit {link} for further details and information.\u{26A1}",
@@ -765,14 +764,13 @@ const LocaleTranslationData = {
 		"help.admin.users": "This page allows admins to view and edit users. Please visit {link} for further details and information.\u{26A1}",
 		"help.csv.meters": "Cette page permet aux administrateurs de téléverser des mètres via un fichier CSV. Veuillez visiter {link} pour plus de détails et d'informations.\u{26A1}",
 		"help.csv.readings": "Cette page permet à certains utilisateurs de télécharger des lectures via un fichier CSV. Veuillez visiter {link} pour plus de détails et d'informations.\u{26A1}",
+		"help.groups.area.calculate": "This will sum together the area of all meters in this group with a nonzero area with an area unit. It will ignore any meters which have no area or area unit. If this group has no area unit, it will do nothing.\u{26A1}",
 		"help.groups.groupdetails": "This page shows detailed information on a group. Please visit {link} for further details and information.\u{26A1}",
 		"help.groups.groupview": "This page shows information on groups. Please visit {link} for further details and information.\u{26A1}",
-		"help.groups.area.calculate": "This will sum together the area of all meters in this group with a nonzero area with an area unit. It will ignore any meters which have no area or area unit. If this group has no area unit, it will do nothing.\u{26A1}",
 		"help.home.area.normalize": "Toggles normalization by area. Meters/Groups without area will be hidden. Please visit {link} for further details and information.\u{26A1}",
 		"help.home.bar.days.tip": "Allows user to select the desired number of days for each bar.  Please see {link} for further details and information.\u{26A1}",
 		"help.home.bar.interval.tip": "Selects the time interval (Day, Week or 4 Weeks) for each bar.  Please see {link} for further details and information.\u{26A1}",
 		"help.home.bar.stacking.tip": "Bars stack on top of each other. Please see {link} for further details and information.\u{26A1}",
-		"help.home.map.interval.tip": "for map corresponding to bar's time interval. Please see {link} for further details and information.\u{26A1}",
 		"help.home.chart.plotly.controls": "These controls are provided by Plotly, the graphics package used by OED. You generally do not need them but they are provided in case you want that level of control. Note that some of these options may not interact nicely with OED features. See Plotly documentation at {link}.\u{26A1}",
 		"help.home.chart.redraw.restore": "OED automatically averages data when necessary so the graphs have a reasonable number of points. If you use the controls under the graph to scroll and/or zoom, you may find the resolution at this averaged level is not what you desire. Clicking the \"Redraw\" button will have OED recalculate the averaging and bring in higher resolution for the number of points it displays. If you want to restore the graph to the full range of dates, then click the \"Restore\" button. Please visit {link} for further details and information.\u{26A1}",
 		"help.home.chart.select": "for the time frame of each bar where you can control the time frame. Compare allows you to see the current usage vs. the usage in the last previous period for a day, week and four weeks. Map graphs show a spatial image of each meter where the circle size is related to four weeks of usage. 3D graphs show usage vs. day vs. hours in the day. Clicking on one of the choices renders that graphic. Please visit {link} for further details and information.\u{26A1}",
@@ -781,6 +779,7 @@ const LocaleTranslationData = {
 		"help.home.error.bar": "Toggle error bars with min and max value. Please visit {link} for further details and information.\u{26A1}",
 		"help.home.export.graph.data": "With the \"Export graph data\" button, one can export the data for the graph when viewing either a line or bar graphic. The zoom and scroll feature on the line graph allows you to control the time frame of the data exported. The \"Export graph data\" button gives the data points for the graph and not the original meter data. The \"Export graph meter data\" gives the underlying meter data (line graphs only). Please visit {link} for further details and information on when meter data export is allowed.\u{26A1}",
 		"help.home.history": "Permet à l'utilisateur de naviguer dans l'historique récent des graphiques. Veuillez visiter {link} pour plus de détails et d'informations.",
+		"help.home.map.interval.tip": "for map corresponding to bar's time interval. Please see {link} for further details and information.\u{26A1}",
 		"help.home.navigation": "The \"Graph\" button goes to the graphic page, the \"Pages\" dropdown allows navigation to information pages, the \"Options\" dropdown allows selection of language, hide options and login/out and the \"Help\" button goes to the help pages. See help on the dropdown menus or the linked pages for further information.\u{26A1}",
 		"help.home.readings.per.day": "The number of readings shown for each day in a 3D graphic. Please visit {link} for further details and information.\u{26A1}",
 		"help.home.select.dateRange": "Select date range used in graphic display. For 3D graphic must be one year or less. Please visit {link} for further details and information.\u{26A1}",
@@ -823,18 +822,22 @@ const LocaleTranslationData = {
 		"less.energy": "moins d'énergie",
 		"line": "Ligne",
 		"log.in": "Se Connecter",
+		"log.limit.required": "Number of logs to display must be within 1 to 1000\u{26A1}",
+		"log.message": "Log Message\u{26A1}",
+		"log.messages": "Log Messages\u{26A1}",
 		"log.out": "Se Déconnecter",
+		"log.time": "Log Time\u{26A1}",
+		"log.type": "Log Type\u{26A1}",
 		"login.failed": "Echec de la connexion",
 		"login.success": "Login Successful\u{26A1}",
 		"logo": "Logo",
 		"manage": "Manage\u{26A1}",
 		"map": "Carte",
-		"maps": "Plans",
+		"map.bad.digita": "Supérieur à 360, veuillez changer l'angle en un nombre compris entre 0 et 360",
+		"map.bad.digitb": "Moins de 0, veuillez changer l'angle en un nombre compris entre 0 et 360",
 		"map.bad.load": "Fichier image de la carte requis",
 		"map.bad.name": "Nom de la carte requis",
 		"map.bad.number": "Pas un nombre, veuillez changer l'angle en un nombre entre 0 et 360",
-		"map.bad.digita": "Supérieur à 360, veuillez changer l'angle en un nombre compris entre 0 et 360",
-		"map.bad.digitb": "Moins de 0, veuillez changer l'angle en un nombre compris entre 0 et 360",
 		"map.calibrate": "Étalonner",
 		"map.calibration": "Statut d'étalonnage",
 		"map.circle.size": "Taille du cercle de la carte",
@@ -858,39 +861,35 @@ const LocaleTranslationData = {
 		"map.notify.calibration.needed": "Étalonnage nécessaire pour l'affichage",
 		"map.unavailable": "There's not an available map\u{26A1}",
 		"map.upload.new.file": "Refaire",
+		"maps": "Plans",
 		"max": "max\u{26A1}",
 		"menu": "Menu",
 		"meter": "Mèter",
-		"meters": "Mèters",
 		"meter.create": "Create a Meter\u{26A1}",
 		"meter.cumulative": "Cumulative:\u{26A1}",
 		"meter.cumulativeReset": "Cumulative Reset:\u{26A1}",
 		"meter.cumulativeResetEnd": "Cumulative Reset End:\u{26A1}",
 		"meter.cumulativeResetStart": "Cumulative Reset Start:\u{26A1}",
-		"meter.edit.displayable.warning": "is not displayable but is used by the following displayable groups:\u{26A1}",
+		"meter.disableChecks": "Disable Checks\u{26A1}",
 		"meter.edit.displayable.verify": "Given the group(s) listed above, do you want to cancel this change (click Cancel) or continue (click OK)?\u{26A1}",
+		"meter.edit.displayable.warning": "is not displayable but is used by the following displayable groups:\u{26A1}",
 		"meter.enabled": "Mises à Jour du Mèters",
 		"meter.endOnlyTime": "End Only Time:\u{26A1}",
 		"meter.endTimeStamp": "End Time Stamp:\u{26A1}",
-		"meter.minVal": "Minimum Reading Value Check\u{26A1}",
-		"meter.maxVal": "Maximum Reading Value Check\u{26A1}",
-		"meter.minDate": "Minimum Reading Date Check\u{26A1}",
-		"meter.maxDate": "Maximum Reading Date Check\u{26A1}",
-		"meter.maxError": "Maximum Number of Errors Check\u{26A1}",
-		"meter.disableChecks": "Disable Checks\u{26A1}",
 		"meter.failed.to.create.meter": "Failed to create a meter with message: \u{26A1}",
 		"meter.failed.to.edit.meter": "Failed to edit meter with message: \u{26A1}",
 		"meter.hidden": "At least one meter is not visible to you\u{26A1}",
 		"meter.id": "Identifiant du Mèters",
 		"meter.input.error": "Input invalid so meter not created or edited.\u{26A1}",
-		"meter.unit.change.requires": "needs to be changed before changing this unit's type\u{26A1}",
-		"meter.unitName": "Unit:\u{26A1}",
-		"meter.url": "URL",
 		"meter.is.displayable": "Affichage Activées",
 		"meter.is.enabled": "Mises à Jour Activées",
 		"meter.is.not.displayable": "Affichage Désactivé",
 		"meter.is.not.enabled": "Mises à Jour Désactivées",
-		"meter.unit.is.not.editable": "This meter's unit cannot be changed and was put back to the original value because: \u{26A1}",
+		"meter.maxDate": "Maximum Reading Date Check\u{26A1}",
+		"meter.maxError": "Maximum Number of Errors Check\u{26A1}",
+		"meter.maxVal": "Maximum Reading Value Check\u{26A1}",
+		"meter.minDate": "Minimum Reading Date Check\u{26A1}",
+		"meter.minVal": "Minimum Reading Value Check\u{26A1}",
 		"meter.previousEnd": "Previous End Time Stamp:\u{26A1}",
 		"meter.reading": "Reading:\u{26A1}",
 		"meter.readingDuplication": "Reading Duplication:\u{26A1}",
@@ -901,19 +900,26 @@ const LocaleTranslationData = {
 		"meter.startTimeStamp": "Start Time Stamp:\u{26A1}",
 		"meter.successfully.create.meter": "Successfully created a meter.\u{26A1}",
 		"meter.successfully.edited.meter": "Successfully edited meter.\u{26A1}",
-		"meter.timeSort": "Time Sort:\u{26A1}",
 		"meter.time.zone": "fuseau horaire du mètre",
+		"meter.timeSort": "Time Sort:\u{26A1}",
 		"meter.type": "Type de Mèters",
-		"minute": "Minute\u{26A1}",
+		"meter.unit.change.requires": "needs to be changed before changing this unit's type\u{26A1}",
+		"meter.unit.is.not.editable": "This meter's unit cannot be changed and was put back to the original value because: \u{26A1}",
+		"meter.unitName": "Unit:\u{26A1}",
+		"meter.url": "URL",
+		"meters": "Mèters",
 		"min": "min\u{26A1}",
+		"minute": "Minute\u{26A1}",
 		"more.energy": "plus d'énergie",
 		"more.options": "More Options\u{26A1}",
 		"name": "Nom:",
 		"navigation": "Navigation",
 		"need.more.points": "Need more points\u{26A1}",
 		"no": "no\u{26A1}",
-		"note": "Noter: ",
 		"no.data.in.range": "No Data In Date Range\u{26A1}",
+		"no.logs": "No logs to display. Please select another log type or date range\u{26A1}",
+		"note": "Noter: ",
+		"num.logs.display": "Number of logs to display\u{26A1}",
 		"oed": "Tableau de Bord Ouvert d'énergie",
 		"oed.description": "Le Tableau de Bord Ouvert d'énergie est un projet open source indépendant. ",
 		"oed.version": "OED version \u{26A1}",
@@ -936,8 +942,8 @@ const LocaleTranslationData = {
 		"rate.limit.error.first": "You have been rate limited by your OED site\u{26A1}",
 		"rate.limit.error.second": "We suggest you try these in this order:\u{26A1}",
 		"reading": "Reading:\u{26A1}",
-		"redo.cik.and.refresh.db.views": "Processing changes. This may take a while\u{26A1}",
 		"readings.per.day": "Readings per Day\u{26A1}",
+		"redo.cik.and.refresh.db.views": "Processing changes. This may take a while\u{26A1}",
 		"redraw": "Redessiner",
 		"refresh.page.first": "Click the Refresh this page' button below to try again\u{26A1}",
 		"refresh.page.second": "If you keep returning to this page wait longer and click 'Refresh this page' button\u{26A1}",
@@ -951,11 +957,12 @@ const LocaleTranslationData = {
 		"save.meter.edits": "Enregistrer les modifications de compteur",
 		"save.role.changes": "Save role changes\u{26A1}",
 		"second": "Second\u{26A1}",
+		"select.all": "Select All\u{26A1}",
 		"select.groups": "Sélectionnez des Groupes",
 		"select.map": "Select Map\u{26A1}",
-		"select.meter.type": "Select Meter Type\u{26A1}",
 		"select.meter": "Sélectionnez de Mètres",
 		"select.meter.group": "Select meter or group to graph\u{26A1}",
+		"select.meter.type": "Select Meter Type\u{26A1}",
 		"select.meters": "Sélectionnez des Mètres",
 		"select.unit": "Select Unit\u{26A1}",
 		"show": "Montrer",
@@ -965,9 +972,9 @@ const LocaleTranslationData = {
 		"site.title": "Site Title\u{26A1}",
 		"sort": "Sort Order\u{26A1}",
 		"submit": "Soumettre",
-		"submitting": "submitting\u{26A1}",
 		"submit.changes": "Soumettre les changements",
 		"submit.new.user": "Submit new user\u{26A1}",
+		"submitting": "submitting\u{26A1}",
 		"the.unit.of.meter": "The unit of meter\u{26A1}",
 		"this.four.weeks": "Cette quatre semaines",
 		"this.week": "Cette semaine",
@@ -975,35 +982,26 @@ const LocaleTranslationData = {
 		"threeD.date": "Date",
 		"threeD.date.range.too.long": "Date Range Must be a year or less\u{26A1}",
 		"threeD.incompatible": "Not Compatible with 3D\u{26A1}",
-		'threeD.rendering': "Rendering\u{26A1}",
 		"threeD.time": "Temps",
-		'threeD.x.axis.label': 'Heures de la journée',
-		'threeD.y.axis.label': 'Jours de l\'année calendaire',
-		"timezone.no": "Pas de fuseau horaire",
 		"TimeSortTypes.decreasing": "décroissant",
 		"TimeSortTypes.increasing": "en augmentant",
+		"timezone.no": "Pas de fuseau horaire",
 		"today": "Aujourd'hui",
 		"toggle.link": "Bascule du lien du diagramme",
-		"toggle.options" : "Basculer les options",
+		"toggle.options": "Basculer les options",
 		"total": "total",
 		"true": "Vrai",
 		"TrueFalseType.false": "no\u{26A1}",
 		"TrueFalseType.true": "yes\u{26A1}",
 		"undefined": "undefined\u{26A1}",
 		"unit": "Unit\u{26A1}",
-		"UnitRepresentType.quantity": "quantity\u{26A1}",
-		"UnitRepresentType.flow": "flow\u{26A1}",
-		"UnitRepresentType.raw": "raw\u{26A1}",
-		"UnitType.unit": "unit\u{26A1}",
-		"UnitType.meter": "meter\u{26A1}",
-		"UnitType.suffix": "suffix\u{26A1}",
 		"unit.delete.failure": "Failed to deleted unit with error: \u{26A1}",
 		"unit.delete.success": "Successfully deleted unit\u{26A1}",
 		"unit.delete.unit": "Delete Unit\u{26A1}",
 		"unit.destination.error": "as the destination unit\u{26A1}",
-		"unit.dropdown.displayable.option.none": "None\u{26A1}",
-		"unit.dropdown.displayable.option.all": "All\u{26A1}",
 		"unit.dropdown.displayable.option.admin": "admin\u{26A1}",
+		"unit.dropdown.displayable.option.all": "All\u{26A1}",
+		"unit.dropdown.displayable.option.none": "None\u{26A1}",
 		"unit.failed.to.create.unit": "Failed to create a unit.\u{26A1}",
 		"unit.failed.to.delete.unit": "Delete cannot be done because this unit is used by the following\u{26A1}",
 		"unit.failed.to.edit.unit": "Failed to edit unit.\u{26A1}",
@@ -1019,8 +1017,14 @@ const LocaleTranslationData = {
 		"unit.suffix": "Suffix:\u{26A1}",
 		"unit.type.of.unit": "Type of Unit:\u{26A1}",
 		"unit.type.of.unit.suffix": "Added suffix will set type of unit to suffix\u{26A1}",
+		"UnitRepresentType.flow": "flow\u{26A1}",
+		"UnitRepresentType.quantity": "quantity\u{26A1}",
+		"UnitRepresentType.raw": "raw\u{26A1}",
 		"units": "Units\u{26A1}",
 		"units.conversion.page.title": "Units and Conversions Visual Graphics\u{26A1}",
+		"UnitType.meter": "meter\u{26A1}",
+		"UnitType.suffix": "suffix\u{26A1}",
+		"UnitType.unit": "unit\u{26A1}",
 		"unsaved.failure": "Changes failed to save\u{26A1}",
 		"unsaved.success": "Changes saved\u{26A1}",
 		"unsaved.warning": "You have unsaved change(s). Are you sure you want to leave?\u{26A1}",
@@ -1052,31 +1056,23 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Visionner les groupes",
 		"visit": " ou visitez notre ",
-		"visual.unit": "Units Visual Graphics\u{26A1}",
-		"visual.input.units.graphic": "Graphique Visuel des Unités D'Entrée",
 		"visual.analyzed.units.graphic": "Graphique Visuel des Unités Analysées",
+		"visual.input.units.graphic": "Graphique Visuel des Unités D'Entrée",
+		"visual.unit": "Units Visual Graphics\u{26A1}",
 		"website": "site web",
 		"week": "Semaine",
 		"yes": " yes\u{26A1}",
 		"yesterday": "Hier",
 		"you.cannot.create.a.cyclic.group": "Vous ne pouvez pas créer un groupe cyclique",
-		"log.messages": "Log Messages\u{26A1}",
-		"log.message": "Log Message\u{26A1}",
-		"log.type": "Log Type\u{26A1}",
-		"log.time": "Log Time\u{26A1}",
-		"num.logs.display": "Number of logs to display\u{26A1}",
-		"log.msg.update": "Update\u{26A1}",
-		"from.1.to.1000": "from 1 to 1000\u{26A1}",
-		"show.logs": "Show Log Table\u{26A1}",
-		"select.all": "Select All\u{26A1}",
-		"no.logs": "No logs to display. Please select another log type or date range\u{26A1}",
-		"log.limit.required": "You must enter a valid number of logs to display\u{26A1}"
+		'threeD.rendering': "Rendering\u{26A1}",
+		'threeD.x.axis.label': 'Heures de la journée',
+		'threeD.y.axis.label': 'Jours de l\'année calendaire',
 	},
 	"es": {
 		"3D": "3D",
+		"4.weeks": "4 Semanas",
 		"400": "400 Solicitud incorrecta",
 		"404": "404 Página no encontrada",
-		"4.weeks": "4 Semanas",
 		"action": "Acción",
 		"add.new.meters": "Agregar nuevos medidores",
 		"admin.only": "Solo administrador",
@@ -1084,16 +1080,16 @@ const LocaleTranslationData = {
 		"alphabetically": "Alfabéticamente",
 		"area": "Área:",
 		"area.but.no.unit": "Ha ingresado un área distinta a cero sin unidad de área.",
+		"area.calculate.auto": "Calcular el área del grupo",
 		"area.error": "Por favor indique un número para el área",
 		"area.normalize": "Normalizar según el área",
-		"area.calculate.auto": "Calcular el área del grupo",
 		"area.unit": "Unidad de área:",
 		"AreaUnitType.feet": "pies cuadrados",
 		"AreaUnitType.meters": "metros cuadrados",
 		"AreaUnitType.none": "sin unidad",
-		"ascending": "Ascendiente",
-		"as.meter.unit": "como unidad de medidor",
 		"as.meter.defaultgraphicunit": "como unidad gráfica predeterminada del medidor",
+		"as.meter.unit": "como unidad de medidor",
+		"ascending": "Ascendiente",
 		"bar": "Barra",
 		"bar.interval": "Intervalo de barra",
 		"bar.raw": "No se puede crear un gráfico de barras con unidades crudas como la temperatura",
@@ -1119,8 +1115,6 @@ const LocaleTranslationData = {
 		"confirm.action": "Confirmar acción",
 		"contact.us": "Contáctenos",
 		"conversion": "Conversión",
-		"conversions": "Conversiones",
-		"ConversionType.conversion": "conversión",
 		"conversion.bidirectional": "Bidireccional:",
 		"conversion.create.destination.meter": "La destinación no puede ser un medidor",
 		"conversion.create.exists": "Esta conversión ya existe",
@@ -1146,16 +1140,14 @@ const LocaleTranslationData = {
 		"conversion.successfully.create.conversion": "Se creó una conversión con éxito.",
 		"conversion.successfully.delete.conversion": "Se eliminó una conversión con éxito.",
 		"conversion.successfully.edited.conversion": "Se editó una conversión con éxito",
+		"conversions": "Conversiones",
+		"ConversionType.conversion": "conversión",
 		"create.conversion": "Crear una conversión",
 		"create.group": "Crear un grupo",
 		"create.map": "Crear un mapa",
 		"create.unit": "Crear una unidad",
 		"create.user": "Crear un usuario",
 		"csv": "CSV",
-		"csvMeters": "CSV Meters\u{26A1}",
-		"csvReadings": "CSV Readings\u{26A1}",
-		"csv.file": "Archivo CSV:",
-		"csv.file.error": "El archivo debe estar en formato CSV o GZIP (.csv o .gz). ",
 		"csv.clear.button": "Forma clara",
 		"csv.common.param.gzip": "Gzip",
 		"csv.common.param.header.row": "Fila de cabecera",
@@ -1163,6 +1155,8 @@ const LocaleTranslationData = {
 		"csv.download.size.limit": "Perdón, no tienes permiso para descargar por el número de puntos grande.",
 		"csv.download.size.warning.size": "El tamaño todos los archivos juntos será de unos (usualmente dentro de 10% para exportaciones largas).",
 		"csv.download.size.warning.verify": "Estás seguro que quieres descargar",
+		"csv.file": "Archivo CSV:",
+		"csv.file.error": "El archivo debe estar en formato CSV o GZIP (.csv o .gz). ",
 		"csv.readings.param.create.meter": "Crear medidor",
 		"csv.readings.param.honor.dst": "Seguir el horario de verano",
 		"csv.readings.param.meter.identifier": "Identificador del medidor:",
@@ -1177,6 +1171,8 @@ const LocaleTranslationData = {
 		"csv.tab.readings": "Lecturas",
 		"csv.upload.meters": "Subir medidores CSV",
 		"csv.upload.readings": "Subir lecturas CSV",
+		"csvMeters": "CSV Meters\u{26A1}",
+		"csvReadings": "CSV Readings\u{26A1}",
 		"custom.value": "Valor personalizado",
 		"date.range": 'Rango de fechas',
 		"day": "Día",
@@ -1186,53 +1182,53 @@ const LocaleTranslationData = {
 		"default.area.normalize": "Normalizar lecturas según el área por defecto",
 		"default.area.unit": "Unidad de área predeterminada",
 		"default.bar.stacking": "Apilar barras por defecto",
-		"default.graph.type": "Tipo de gráfico por defecto",
-		"default.graph.settings": "Configuraciones predeterminadas del gráfico",
-		"defaultGraphicUnit": "Unidad del gráfico predeterminada:",
-		"default.language": "Idioma predeterminado",
-		"default.meter.reading.frequency": "Frecuencia de lectura del medidor predeterminada",
-		"default.site.title": "Título predeterminado de la página ",
-		"default.warning.file.size": "Advertencia predeterminada de tamaño del archivo",
 		"default.file.size.limit": "Límite predeterminado de tamaño del archivo",
+		"default.graph.settings": "Configuraciones predeterminadas del gráfico",
+		"default.graph.type": "Tipo de gráfico por defecto",
 		"default.help.url": "URL Documentación",
-		"default.time.zone": "Zona de horario predeterminada",
-		"default.meter.minimum.value": "Revisión del valor de lectura mínima del medidor predeterminado",
+		"default.language": "Idioma predeterminado",
+		"default.meter.disable.checks": "Desactivar revisiones de medidor predeterminado",
+		"default.meter.maximum.date": "Revisión de la fecha de lectura máxima del medidor predeterminado",
+		"default.meter.maximum.errors": "Número máximo de errores en la lectura del medidor",
 		"default.meter.maximum.value": "Revisión del valor de lectura máxima del medidor predeterminado",
 		"default.meter.minimum.date": "Revisión de la fecha de lectura mínima del medidor predeterminado",
-		"default.meter.maximum.date": "Revisión de la fecha de lectura máxima del medidor predeterminado",
+		"default.meter.minimum.value": "Revisión del valor de lectura mínima del medidor predeterminado",
+		"default.meter.reading.frequency": "Frecuencia de lectura del medidor predeterminada",
 		"default.meter.reading.gap": "Deistancia predeterminada entre lecturas del medidor",
-		"default.meter.maximum.errors": "Número máximo de errores en la lectura del medidor",
-		"default.meter.disable.checks": "Desactivar revisiones de medidor predeterminado",
+		"default.site.title": "Título predeterminado de la página ",
+		"default.time.zone": "Zona de horario predeterminada",
+		"default.warning.file.size": "Advertencia predeterminada de tamaño del archivo",
+		"defaultGraphicUnit": "Unidad del gráfico predeterminada:",
 		"delete.group": "Borrar grupo",
 		"delete.map": "Borrar mapa",
 		"delete.self": "No puedes eliminar tu propia cuenta.",
 		"delete.user": "Borrar usario",
 		"descending": "Descendente",
-		"discard.changes": "Descartar los cambios",
 		"disable": "Desactivar",
+		"discard.changes": "Descartar los cambios",
 		"displayable": "Visualizable:",
-		"DisplayableType.none": "ninguno",
-		"DisplayableType.all": "todo",
 		"DisplayableType.admin": "administrador",
-		"error.bounds": "Debe ser entre {min} y {max}.",
-		"error.displayable": "El elemento visual determinado como falso porque no hay unidad seleccionada.",
-		"error.displayable.meter": "Las unidades de medición determinarán al elemento visual como ninguno.",
-		"error.displayable.suffix.input": "Suffix input will set displayable to none.\u{26A1}",
-		"error.greater": "Debe ser más que {min}.",
-		"error.gps": "Latitud deber ser entre -90 y 90, y longitud de entre -180 y 180.",
-		"error.negative": "No puede ser negativo.",
-		"error.required": "Campo requerido",
-		"error.unknown": "¡Ups! Ha ocurrido un error.",
+		"DisplayableType.all": "todo",
+		"DisplayableType.none": "ninguno",
 		"edit": "Editar",
-		"edited": "editado",
 		"edit.a.group": "Editar un grupo",
 		"edit.a.meter": "Editar un medidor",
 		"edit.group": "Editar grupo",
 		"edit.meter": "Details/Editar medidor\u{26A1}",
 		"edit.unit": "Editar unidad",
 		"edit.user": "Editar Usuario",
+		"edited": "editado",
 		"enable": "Activar",
 		"error.bar": "Mostrar las barras de errores",
+		"error.bounds": "Debe ser entre {min} y {max}.",
+		"error.displayable": "El elemento visual determinado como falso porque no hay unidad seleccionada.",
+		"error.displayable.meter": "Las unidades de medición determinarán al elemento visual como ninguno.",
+		"error.displayable.suffix.input": "Suffix input will set displayable to none.\u{26A1}",
+		"error.gps": "Latitud deber ser entre -90 y 90, y longitud de entre -180 y 180.",
+		"error.greater": "Debe ser más que {min}.",
+		"error.negative": "No puede ser negativo.",
+		"error.required": "Campo requerido",
+		"error.unknown": "¡Ups! Ha ocurrido un error.",
 		"export.graph.data": "Exportar los datos del gráfico",
 		"export.raw.graph.data": "Exportar los datos del medidor del gráfico",
 		"failed.to.create.map": "No se pudo crear el mapa",
@@ -1242,6 +1238,7 @@ const LocaleTranslationData = {
 		"failed.to.link.graph": "No se pudo vincular el gráfico",
 		"failed.to.submit.changes": "No se pudo entregar los cambios",
 		"false": "Falso",
+		"from.1.to.1000": "from 1 to 1000\u{26A1}",
 		"gps": "GPS: latitud, longitud",
 		"graph": "Gráfico",
 		"graph.settings": "Graph Settings\u{26A1}",
@@ -1249,12 +1246,12 @@ const LocaleTranslationData = {
 		"group": "Grupo",
 		"group.all.meters": "Todos los medidores",
 		"group.area.calculate": "Calcular el área del grupo",
-		"group.area.calculate.header": "Área del grupo se establecerá en ",
+		"group.area.calculate.error.group.unit": "No hay unidad de área del grupo",
 		"group.area.calculate.error.header": "Los siguientes medidores fueron excluidos de la suma porque:",
-		"group.area.calculate.error.zero": ": el área no está determinada o es cero",
-		"group.area.calculate.error.unit": ": el área es distinta a cero pero no tiene unidad",
 		"group.area.calculate.error.no.meters": "No hay medidores en el grupo",
-		"group.area.calculate.error.group.unit": "No hay unidad de área del grupo",
+		"group.area.calculate.error.unit": ": el área es distinta a cero pero no tiene unidad",
+		"group.area.calculate.error.zero": ": el área no está determinada o es cero",
+		"group.area.calculate.header": "Área del grupo se establecerá en ",
 		"group.create.nounit": "La unidad predeterminada del gráfico fue cambiado a sin unidad de ",
 		"group.delete.group": "Borrar grupo",
 		"group.delete.issue": "está en los siguientes grupos y no se puede borrar",
@@ -1272,14 +1269,14 @@ const LocaleTranslationData = {
 		"group.hidden": "Hay por lo menos un grupo que no es visible para tí",
 		"group.input.error": "Entrada no válida, por tanto no se creó o editó el grupo",
 		"group.name.error": "Por favor indique un nombre válido: (debe tener por lo menos un carácter que no sea un espacio blanco)",
-		"groups": "Grupos",
 		"group.successfully.create.group": "Grupo creado con éxito.",
 		"group.successfully.edited.group": "Grupo editado con éxito.",
+		"groups": "Grupos",
 		"groups.select": "Seleccionar grupos",
 		"has.no.data": "No hay datos actuales",
 		"has.used": "ha utilizado",
-		"header.pages": "Páginas",
 		"header.options": "Opciones",
+		"header.pages": "Páginas",
 		"help": "Ayuda",
 		"help.admin.conversioncreate": "Esta página permite a los administradores crear conversiones. Por favor visite {link} para más detalles e información.",
 		"help.admin.conversionedit": "Esta página permite a los administradores editar conversiones. Por favor visite {link} para más detalles e información",
@@ -1299,14 +1296,13 @@ const LocaleTranslationData = {
 		"help.admin.users": "Esta página permite a los administradores ver y editar usarios. Por favor, visite {link} para más detalles e información.",
 		"help.csv.meters": "Esta página permite a los administradores cargar medidores a través de un archivo CSV. Visite {enlace} para obtener más detalles e información.",
 		"help.csv.readings": "Esta página permite a ciertos usuarios cargar lecturas a través de un archivo CSV. Visite {link} para obtener más detalles e información.",
+		"help.groups.area.calculate": "Esto sumará el área de todos los medidores en este grupo que tengan un área distinta a cero y una unidad de área. Ignorará cualquier medidor que no tiene área o unidad de área. Si este grupo no tiene unidad de área, no hará nada.",
 		"help.groups.groupdetails": "Esta página muestra información detallada de un grupo. Por favor visite {link} para obtener más detalles e información.",
 		"help.groups.groupview": "Esta página muestra información sobre grupos. Por favor, visite {link} para más detalles e información.",
-		"help.groups.area.calculate": "Esto sumará el área de todos los medidores en este grupo que tengan un área distinta a cero y una unidad de área. Ignorará cualquier medidor que no tiene área o unidad de área. Si este grupo no tiene unidad de área, no hará nada.",
 		"help.home.area.normalize": "Alterna la normalización por área. Medidores/Grupos sin área quedarán escondidos. Por favor visite {link} para obtener más detalles e información.",
 		"help.home.bar.days.tip": "Permite al usuario seleccionar el número de días deseado para cada barra.  Por favor, visite {link} para más detalles e información.",
 		"help.home.bar.interval.tip": "Selecciona el intervalo de tiempo (día, semana o 4 semanas) para cada barra.  Por favor, visite {link} para más detalles e información.",
 		"help.home.bar.stacking.tip": "Apila las barras una encima de la otra. Por favor, visite {link} para obtener más detalles e información.",
-		"help.home.map.interval.tip": "Seleciona el intervalo de tiempo (el último día, semana o 4 semanas) para el mapa correspondiente al intervalo de tiempo de la barra. Por favor visite {link} para mas detalles e información",
 		"help.home.chart.plotly.controls": "Estos controles son proporcionados por Plotly, el paquete de gráficos utilizado por OED. Por lo general no se necesitan pero se proporcionan por si se desea ese nivel de control. Tenga en cuenta que es posible que algunas de estas opciones no interactúen bien con las funciones de OED. Consulte la documentación de Plotly en {link}.",
 		"help.home.chart.redraw.restore": "OED  automáticamente toma el promedio de los datos cuando es necesario para que los gráficos tengan un número razonable de puntos. Si usa los controles debajo del gráfico para desplazarse y / o acercarse, puede encontrar que la resolución en este nivel de promedio no es la que desea. Al hacer clic en el botón \"Redraw\" OED volverá a calcular el promedio y obtendrá una resolución más alta para el número de puntos que muestra. Si desea restaurar el gráfico al rango completo de fechas, haga clic en el botón \"Restore\" button. Por favor visite {link} para obtener más detalles e información.",
 		"help.home.chart.select": "Se puede usar cualquier tipo de gráfico con cualquier combinación de grupos y medidores. Los gráficos de líneas muestran el uso (por ejemplo, kW) con el tiempo. Puede hacer zoom y desplazarse con los controles justo debajo del gráfico. La barra muestra el uso total (por ejemplo, kWh) para el período de tiempo de cada barra donde se puede controlar el período de tiempo. Comparar le permite ver el uso actual comparado con el uso del período anterior durante un día, una semana y cuatro semanas.  Los gráficos del mapa muestran una imagen espacial de cada medidor donde el tamaño del círculo está relacionado con cuatro semanas de uso. Las gráficas 3D muestran el uso por día y el uso por hora del día. Hacer clic en uno de estas opciones las registra en ese gráfico. Por favor visite {link} para obtener más detalles e información.",
@@ -1315,6 +1311,7 @@ const LocaleTranslationData = {
 		"help.home.error.bar": "Alternar barras de error con el valor mínimo y máximo. Por favor, vea {link} para más detalles e información.",
 		"help.home.export.graph.data": "Con el botón \"Exportar datos del gráfico\", uno puede exportar los datos del gráfico al ver una línea o barra el gráfico. La función de zoom y desplazamiento en el gráfico de líneas le permite controlar el período de tiempo de los datos exportados.  El botón \"Exportar data de gráfico\" da los puntos de datos para el gráfico y no los datos originales del medidor. \"Exportar el dato gráfhico de medidor\" proporciona los datos subyacentes del medidor (solo gráficos de líneas). Por favor visite {link} para obtener más detalles e información.",
 		"help.home.history": "Permite al usuario navegar por el historial reciente de gráficos. Por favor visite {link} para obtener más detalles e información.",
+		"help.home.map.interval.tip": "Seleciona el intervalo de tiempo (el último día, semana o 4 semanas) para el mapa correspondiente al intervalo de tiempo de la barra. Por favor visite {link} para mas detalles e información",
 		"help.home.navigation": "El botón \"Gráfico\" va a la página de gráficos, el desplegable \"Páginas\" permite la navigación a las páginas de información, el desplegable \"Opciones\" permite la selección del idioma, opciones de ocultar y de iniciar/cerrar sesión y el botón \"Ayuda\" va a las páginas de ayuda. Busca ayuda en los menús desplegables o las páginas vínculadas para más información.",
 		"help.home.readings.per.day": "El número de lecturas mostrado para cada día en un gráfico 3D. Por favor visite {link} para obtener más detalles e información.",
 		"help.home.select.dateRange": "Seleccione el rango de datos usado en el gráfico mostrado. Para gráficos 3D debe ser un año o menos. Por favor visite {link} para obtener más detalles e información.",
@@ -1357,18 +1354,22 @@ const LocaleTranslationData = {
 		"less.energy": "menos energía",
 		"line": "Línea",
 		"log.in": "Iniciar sesión",
+		"log.limit.required": "Number of logs to display must be within 1 to 1000\u{26A1}",
+		"log.message": "Log Message\u{26A1}",
+		"log.messages": "Log Messages\u{26A1}",
 		"log.out": "Cerrar sesión",
+		"log.time": "Log Time\u{26A1}",
+		"log.type": "Log Type\u{26A1}",
 		"login.failed": "Error al iniciar sesión",
 		"login.success": "Éxito al iniciar sesión",
 		"logo": "Logo",
 		"manage": "Gestionar",
 		"map": "Mapa",
-		"maps": "Mapas",
+		"map.bad.digita": "Mayor a 360, por favor cambiar el angúlo a un número entre 0 a 360",
+		"map.bad.digitb": "Menor a 0, por favor cambiar el angúlo a un número entre 0 a 360",
 		"map.bad.load": "Se necesita el archivo de la imagen del mapa",
 		"map.bad.name": "Se necesita un nombre para el mapa",
 		"map.bad.number": "No es número, por favor cambiar el angúlo a un número entre 0 a 360",
-		"map.bad.digita": "Mayor a 360, por favor cambiar el angúlo a un número entre 0 a 360",
-		"map.bad.digitb": "Menor a 0, por favor cambiar el angúlo a un número entre 0 a 360",
 		"map.calibrate": "Calibrar",
 		"map.calibration": "Estado de calibración",
 		"map.circle.size": "Tamaño del círculo en el mapa",
@@ -1392,39 +1393,35 @@ const LocaleTranslationData = {
 		"map.notify.calibration.needed": "Necesita calibración antes de visualizar",
 		"map.unavailable": "There's not an available map\u{26A1}",
 		"map.upload.new.file": "Rehacer",
+		"maps": "Mapas",
 		"max": "máximo",
 		"menu": "Menú",
 		"meter": "Medidor",
-		"meters": "Medidores",
 		"meter.create": "Crear un medidor",
 		"meter.cumulative": "Cumulativo",
 		"meter.cumulativeReset": "Reinicio cumulativo:",
 		"meter.cumulativeResetEnd": "Final del reinicio cumulativo:",
 		"meter.cumulativeResetStart": "Comienzo del reinicio cumulativo:",
-		"meter.edit.displayable.warning": "is not displayable but is used by the following displayable groups:\u{26A1}",
+		"meter.disableChecks": "Desactivar revisiones",
 		"meter.edit.displayable.verify": "Given the group(s) listed above, do you want to cancel this change (click Cancel) or continue (click OK)?\u{26A1}",
+		"meter.edit.displayable.warning": "is not displayable but is used by the following displayable groups:\u{26A1}",
 		"meter.enabled": "Medidor activado",
 		"meter.endOnlyTime": "Solo tiempos finales.",
 		"meter.endTimeStamp": "Marca de tiempo al final:",
-		"meter.minVal": "Revisión del valor mínimo de lectura",
-		"meter.maxVal": "Revisión del valor máximo de lectura",
-		"meter.minDate": "Revisión de la fecha mínima de lectura",
-		"meter.maxDate": "Revisión de la fecha máxima de lectura",
-		"meter.maxError": "Revisión del número máximo de errores",
-		"meter.disableChecks": "Desactivar revisiones",
 		"meter.failed.to.create.meter": "No se pudo crear un medidor con mensaje: ",
 		"meter.failed.to.edit.meter": "No se pudo editar un medidor con mensaje: ",
 		"meter.hidden": "Al menos un medidor no es visible para tí.",
 		"meter.id": "ID del medidor",
 		"meter.input.error": "Entrada no válida, por tanto no se creó o editó el medidor.",
-		"meter.unit.change.requires": "necesita cambiarse antes de cambiar el tipo de esta unidad",
-		"meter.unitName": "Unidad:",
-		"meter.url": "URL:",
 		"meter.is.displayable": "El medidor es visualizable",
 		"meter.is.enabled": "Actualizaciones activadas",
 		"meter.is.not.displayable": "El medidor no es visualizable",
 		"meter.is.not.enabled": "El medidor no está activado",
-		"meter.unit.is.not.editable": "La unidad de este medidor no puede cambiarse y se mantuvo el valor original porque: ",
+		"meter.maxDate": "Revisión de la fecha máxima de lectura",
+		"meter.maxError": "Revisión del número máximo de errores",
+		"meter.maxVal": "Revisión del valor máximo de lectura",
+		"meter.minDate": "Revisión de la fecha mínima de lectura",
+		"meter.minVal": "Revisión del valor mínimo de lectura",
 		"meter.previousEnd": "Marca de tiempo del final anterior:",
 		"meter.reading": "Lectura:",
 		"meter.readingDuplication": "Duplicación de lectura:",
@@ -1435,19 +1432,26 @@ const LocaleTranslationData = {
 		"meter.startTimeStamp": "Marca de tiempo al inicio:",
 		"meter.successfully.create.meter": "Éxito al crear el medidor.",
 		"meter.successfully.edited.meter": "Éxito al editar el medidor.",
-		"meter.timeSort": "Ordenar por tiempo:",
 		"meter.time.zone": "Zona horaria:",
+		"meter.timeSort": "Ordenar por tiempo:",
 		"meter.type": "Tipo:",
-		"minute": "Minuto",
+		"meter.unit.change.requires": "necesita cambiarse antes de cambiar el tipo de esta unidad",
+		"meter.unit.is.not.editable": "La unidad de este medidor no puede cambiarse y se mantuvo el valor original porque: ",
+		"meter.unitName": "Unidad:",
+		"meter.url": "URL:",
+		"meters": "Medidores",
 		"min": "mínimo",
+		"minute": "Minuto",
 		"more.energy": "más energía",
 		"more.options": "More Options\u{26A1}",
 		"name": "Nombre:",
 		"navigation": "Navegación",
 		"need.more.points": "Nececita más puntos",
 		"no": "no",
-		"note": "Nota: ",
 		"no.data.in.range": "No hay datos para el rango de fechas",
+		"no.logs": "No logs to display. Please select another log type or data range\u{26A1}",
+		"note": "Nota: ",
+		"num.logs.display": "Number of logs to display\u{26A1}",
 		"oed": "Panel de Energía Abierto",
 		"oed.description": "Open Energy Dashboard es un proyecto independiente. ",
 		"oed.version": "Versión OED",
@@ -1470,8 +1474,8 @@ const LocaleTranslationData = {
 		"rate.limit.error.first": "You have been rate limited by your OED site\u{26A1}",
 		"rate.limit.error.second": "We suggest you try these in this order:\u{26A1}",
 		"reading": "Lectura:",
-		"redo.cik.and.refresh.db.views": "Procesando los cambios. Esto tardará un momento.",
 		"readings.per.day": "Lecturas por día",
+		"redo.cik.and.refresh.db.views": "Procesando los cambios. Esto tardará un momento.",
 		"redraw": "Redibujar",
 		"refresh.page.first": "Click the Refresh this page' button below to try again\u{26A1}",
 		"refresh.page.second": "If you keep returning to this page wait longer and click 'Refresh this page' button\u{26A1}",
@@ -1485,11 +1489,12 @@ const LocaleTranslationData = {
 		"save.meter.edits": "Guardar las ediciones al medidor",
 		"save.role.changes": "Guardar los cambios de rol",
 		"second": "Segundo",
+		"select.all": "Select All\u{26A1}",
 		"select.groups": "Seleccionar grupos",
 		"select.map": "Seleccionar mapa",
-		"select.meter.type": "Seleccionar tipo de medidor",
 		"select.meter": "Seleccionar medidor",
 		"select.meter.group": "Seleccionar medidor o grupo para hacer gráfico",
+		"select.meter.type": "Seleccionar tipo de medidor",
 		"select.meters": "Seleccionar medidores",
 		"select.unit": "Seleccionar unidad",
 		"show": "Mostrar",
@@ -1499,12 +1504,11 @@ const LocaleTranslationData = {
 		"site.title": "Site Title\u{26A1}",
 		"sort": "Sort Order\u{26A1}",
 		"submit": "Enviar",
-		"submitting": "Enviando",
 		"submit.changes": "Ingresar los cambios",
 		"submit.new.user": "Ingresar un nuevo usario",
+		"submitting": "Enviando",
 		"the.unit.of.meter": "La unidad del medidor",
 		"this.four.weeks": "Estas cuatro semanas",
-		"timezone.no": "sin zona horaria",
 		"this.week": "Esta semana",
 		"threeD.area.incompatible": "<br>es incompatible<br> con normalización del área",
 		"threeD.date": "Fecha",
@@ -1516,28 +1520,23 @@ const LocaleTranslationData = {
 		"threeD.y.axis.label": "Días del año calendario",
 		"TimeSortTypes.decreasing": "decreciente",
 		"TimeSortTypes.increasing": "creciente",
+		"timezone.no": "sin zona horaria",
 		"today": "Hoy",
 		"toggle.link": "Alternar enlace de gráfico",
-		"toggle.options" : "Alternar opciones",
+		"toggle.options": "Alternar opciones",
 		"total": "total",
 		"true": "Verdad",
 		"TrueFalseType.false": "no",
 		"TrueFalseType.true": "sí",
 		"undefined": "indefinido",
 		"unit": "Unidad",
-		"UnitRepresentType.quantity": "cantidad",
-		"UnitRepresentType.flow": "flujo",
-		"UnitRepresentType.raw": "crudo",
-		"UnitType.unit": "unidad",
-		"UnitType.meter": "medidor",
-		"UnitType.suffix": "sufijo",
 		"unit.delete.failure": "No se pudo borrar la unidad con error: ",
 		"unit.delete.success": "Éxito al borrar la unidad",
 		"unit.delete.unit": "Borrar la unidad",
 		"unit.destination.error": "como la unidad de la destinación",
-		"unit.dropdown.displayable.option.none": "Ninguna",
-		"unit.dropdown.displayable.option.all": "Todo",
 		"unit.dropdown.displayable.option.admin": "administrador",
+		"unit.dropdown.displayable.option.all": "Todo",
+		"unit.dropdown.displayable.option.none": "Ninguna",
 		"unit.failed.to.create.unit": "No se pudo crear la unidad",
 		"unit.failed.to.delete.unit": "No se puede borrar por que esta unidad está siendo usada por lo siguiente",
 		"unit.failed.to.edit.unit": "No se pudo editar la unidad",
@@ -1553,8 +1552,14 @@ const LocaleTranslationData = {
 		"unit.suffix": "Sufijo:",
 		"unit.type.of.unit": "Tipo de unidad:",
 		"unit.type.of.unit.suffix": "El sufijo agregado determina que el tipo de la unidad es sufijo",
+		"UnitRepresentType.flow": "flujo",
+		"UnitRepresentType.quantity": "cantidad",
+		"UnitRepresentType.raw": "crudo",
 		"units": "Unidades",
 		"units.conversion.page.title": "Gráficos Visuales de Unidades y Conversiones",
+		"UnitType.meter": "medidor",
+		"UnitType.suffix": "sufijo",
+		"UnitType.unit": "unidad",
 		"unsaved.failure": "No se pudieron guardar los cambios",
 		"unsaved.success": "Se guardaron los cambios",
 		"unsaved.warning": "Tienes cambios sin guardar. ¿Estás seguro que quieres salir?",
@@ -1586,25 +1591,14 @@ const LocaleTranslationData = {
 		"uses": "uses\u{26A1}",
 		"view.groups": "Ver grupos",
 		"visit": " o visite nuestro ",
-		"visual.unit": "Units Visual Graphics\u{26A1}",
-		"visual.input.units.graphic": "Gráfico Visual de Unidades de Entrada",
 		"visual.analyzed.units.graphic": "Gráfico Visual de Unidades Analizadas",
+		"visual.input.units.graphic": "Gráfico Visual de Unidades de Entrada",
+		"visual.unit": "Units Visual Graphics\u{26A1}",
 		"website": "sitio web",
 		"week": "semana",
 		"yes": "sí",
 		"yesterday": "Ayer",
 		"you.cannot.create.a.cyclic.group": "No se puede crear un grupo cíclico",
-		"log.messages": "Log Messages\u{26A1}",
-		"log.message": "Log Message\u{26A1}",
-		"log.type": "Log Type\u{26A1}",
-		"log.time": "Log Time\u{26A1}",
-		"num.logs.display": "Number of logs to display\u{26A1}",
-		"log.msg.update": "Update\u{26A1}",
-		"from.1.to.1000": "from 1 to 1000\u{26A1}",
-		"show.logs": "Show Log Table\u{26A1}",
-		"select.all": "Select All\u{26A1}",
-		"no.logs": "No logs to display. Please select another log type or data range\u{26A1}",
-		"log.limit.required": "You must enter a valid number of logs to display\u{26A1}"
 	}
 }
 
diff --git a/src/server/log.js b/src/server/log.js
index 9f41f1cb3..efc4dfc07 100644
--- a/src/server/log.js
+++ b/src/server/log.js
@@ -51,8 +51,8 @@ class Logger {
 	 * @param {boolean?} skipMail Don't e-mail this message even if we would normally emit an e-mail for this level.
 	 */
 	log(level, message, error = null, skipMail = false) {
-		let logTime = moment().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
-		let messageToLog = `[${level.name}@${logTime}] ${message}\n`;
+		let logTime = moment();
+		let messageToLog = `[${level.name}@${logTime.format('YYYY-MM-DDTHH:mm:ss.SSSZ')}] ${message}\n`;
 
 		const conn = getConnection();
 
@@ -81,7 +81,7 @@ class Logger {
 
 			// NOTE: for running the first time, uncomment the following code block to write all current logs to the database
 			// after that you can comment out it to write only new logs to the database
-			// TODO: This should be fix later to check whehter it should write new logs or all logs to the database when running
+			// TODO: This should be fix later to check whether it should write new logs or all logs to the database when running
 			// fs.readFile(logFile, 'utf8', async (err, data) => {
 			// 	if (err) {
 			// 		console.error(`Failed to read log file: ${err} (${err.stack})`);
@@ -107,7 +107,7 @@ class Logger {
 			// Comment out the following code block when running the first time to write all logs to the database
 			// then uncomment it to write only new logs to the database later
 			// Write the new log to the database
-			const logMsg = new LogMsg(level.name, message, new Date(logTime));
+			const logMsg = new LogMsg(level.name, message, logTime);
 			(async () => {
 				try {
 					await logMsg.insert(conn);
diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
index 1735f7c58..53be00d44 100644
--- a/src/server/models/LogMsg.js
+++ b/src/server/models/LogMsg.js
@@ -55,48 +55,6 @@ class LogMsg {
 		await conn.none(sqlFile('logmsg/insert_new_log.sql'), logMsg);
 	}
 
-	/**
-	 * Returns a promise to get all of the logs from the database
-	 * @param conn the connection to be used.
-	 * @returns {Promise.<array.<logMsg>>}
-	 */
-	static async getAll(conn) {
-		const rows = await conn.any(sqlFile('logmsg/get_all_logs.sql'));
-		if (rows.length > 0) {
-			return rows.map(LogMsg.mapRow);
-		}
-	}
-
-	/**
-	 * Returns a promise to get all of the logs in between two dates.
-	 * If no startDate is specified, all logs before the endDate are returned.
-	 * If no endDate is specified, all logs after the startDate are returned.
-	 * @param {Date} startDate
-	 * @param {Date} endDate
-	 * @param conn is the connection to use.
-	 * @returns {Promise.<array.<LogMsg>>}
-	 */
-	static async getLogsByDateRange(startDate, endDate, conn) {
-		const rows = await conn.any(sqlFile('logmsg/get_logs_from_dates.sql'), {
-			startDate: startDate,
-			endDate: endDate
-		});
-
-		return rows.map(LogMsg.mapRow);
-	}
-
-	/**
-	 * Returns a promise to get all of the logs of a certain type
-	 * @param logType
-	 * @param conn is the connection to use.
-	 * @returns {Promise.<array.<LogMsg>>}
-	 */
-	static async getLogsByType(logType, conn) {
-		const rows = await conn.any(sqlFile('logmsg/get_logs_from_type.sql'), { logType: logType });
-
-		return rows.map(LogMsg.mapRow);
-	}
-
 	/**
 	 * Returns a promise to get all of the logs in between two dates.
 	 * @param {Date} startDate start date of the range to get logs
diff --git a/src/server/routes/logs.js b/src/server/routes/logs.js
index eef40ae18..9482d21f1 100644
--- a/src/server/routes/logs.js
+++ b/src/server/routes/logs.js
@@ -37,7 +37,7 @@ const validLogMsg = {
 		},
 		logTypes: {
 			type: 'string',
-			pattern: '^(INFO|WARN|ERROR|SILENT)(-(INFO|WARN|ERROR|SILENT))*$'
+			pattern: '^(INFO|WARN|ERROR|SILENT|DEBUG)(-(INFO|WARN|ERROR|SILENT|DEBUG))*$'
 		},
 		logLimit: {
 			type: 'string',
diff --git a/src/server/sql/logmsg/get_all_logs.sql b/src/server/sql/logmsg/get_all_logs.sql
deleted file mode 100644
index b44910172..000000000
--- a/src/server/sql/logmsg/get_all_logs.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
--- gets all logs in the database
-SELECT * FROM logmsg;
\ No newline at end of file
diff --git a/src/server/sql/logmsg/get_logs_from_dates.sql b/src/server/sql/logmsg/get_logs_from_dates.sql
deleted file mode 100644
index d2383fbcf..000000000
--- a/src/server/sql/logmsg/get_logs_from_dates.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
--- Gets logs in table by date range. This is then ordered by time ascending.
-SELECT 
-	log_type, log_message, log_time
-FROM logmsg 
-WHERE log_time >= COALESCE(${startDate}, '-infinity'::TIMESTAMP)
-	AND log_time <= COALESCE(${endDate}, 'infinity'::TIMESTAMP)
-ORDER BY log_time ASC;
\ No newline at end of file
diff --git a/src/server/sql/logmsg/get_logs_from_type.sql b/src/server/sql/logmsg/get_logs_from_type.sql
deleted file mode 100644
index 174dbde8a..000000000
--- a/src/server/sql/logmsg/get_logs_from_type.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
--- Gets logs in table by date range. This is then ordered by time ascending.
-SELECT 
-	log_type, log_message , log_time
-FROM logmsg 
-WHERE log_type = ${logType}
-ORDER BY log_time ASC;
\ No newline at end of file

From 9cc09f91a6834892d01faa239065280258aed668 Mon Sep 17 00:00:00 2001
From: danielshid <danielshi74@gmail.com>
Date: Tue, 3 Dec 2024 09:26:54 -0500
Subject: [PATCH 094/128] tested and removed commented out code

---
 src/client/app/components/RadarChartComponent.tsx | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index 35ff6d34e..24ff30cfc 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -89,11 +89,6 @@ export default function RadarChartComponent() {
 				if (readingsData) {
 					const label = entity.identifier;
 					const colorID = meterID;
-					// TODO If we are sure the data is always defined then remove this commented out code.
-					// Be consistent for all graphing and groups below.
-					// if (readingsData.readings === undefined) {
-					// 	throw new Error('Unacceptable condition: readingsData.readings is undefined.');
-					// }
 					// Create two arrays for the distance (rData) and angle (thetaData) values. Fill the array with the data from the line readings.
 					// HoverText is the popup value show for each reading.
 					const thetaData: string[] = [];
@@ -146,9 +141,6 @@ export default function RadarChartComponent() {
 				if (readingsData) {
 					const label = entity.name;
 					const colorID = groupID;
-					// if (readingsData.readings === undefined) {
-					// 	throw new Error('Unacceptable condition: readingsData.readings is undefined.');
-					// }
 					// Create two arrays for the distance (rData) and angle (thetaData) values. Fill the array with the data from the line readings.
 					// HoverText is the popup value show for each reading.
 					const thetaData: string[] = [];

From eaef31c662dc6c446b709a55506341434fd4a39e Mon Sep 17 00:00:00 2001
From: danielshid <danielshi74@gmail.com>
Date: Tue, 3 Dec 2024 09:36:53 -0500
Subject: [PATCH 095/128] format document

---
 src/client/app/components/RadarChartComponent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/components/RadarChartComponent.tsx b/src/client/app/components/RadarChartComponent.tsx
index 24ff30cfc..2402769b6 100644
--- a/src/client/app/components/RadarChartComponent.tsx
+++ b/src/client/app/components/RadarChartComponent.tsx
@@ -76,7 +76,7 @@ export default function RadarChartComponent() {
 		'resetScale2d'];
 	const advancedButtons: Plotly.ModeBarDefaultButtons[] = ['select2d', 'lasso2d', 'autoScale2d', 'resetScale2d'];
 	// Manage button states with useState
-	const	[listOfButtons, setListOfButtons] = React.useState(defaultButtons);
+	const [listOfButtons, setListOfButtons] = React.useState(defaultButtons);
 
 	// Add all valid data from existing meters to the radar plot
 	for (const meterID of selectedMeters) {

From c5da842941bdcd847a07a21ef4ef3c8f32c65526 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Wed, 4 Dec 2024 16:43:12 -0500
Subject: [PATCH 096/128] refactor LogMsgComponent.tsx and resolved some PR
 comments

---
 .../app/components/admin/LogMsgComponent.tsx  | 81 +++++--------------
 1 file changed, 22 insertions(+), 59 deletions(-)

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index 9e8350cd0..f636aec4d 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -6,6 +6,7 @@
 
 import * as React from 'react';
 import * as moment from 'moment';
+import { orderBy } from 'lodash';
 import {
 	Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle,
 	FormFeedback,
@@ -18,7 +19,6 @@ import { logsApi } from '../../utils/api';
 import translate from '../../utils/translate';
 import { TimeInterval } from '../../../../common/TimeInterval';
 import { dateRangeToTimeInterval, timeIntervalToDateRange } from '../../utils/dateRangeCompatibility';
-import { Value } from '@wojtekmaj/react-daterange-picker/dist/cjs/shared/types';
 
 // number of log messages to display per page
 const PER_PAGE = 20;
@@ -109,11 +109,15 @@ export default function LogMsgComponent() {
 		}
 	};
 
-	// React effect to keep track of the "Select All" checkbox state
+	// React effect to keep track of the "Select All" checkbox state for the update log
 	React.useEffect(() => {
 		selectedUpdateLogTypes.length === logTypes.length ? setSelectAllUpdate(true) : setSelectAllUpdate(false);
+	}, [selectedUpdateLogTypes]);
+
+	// React effect to keep track of the "Select All" checkbox state for the table
+	React.useEffect(() => {
 		selectedTableLogTypes.length === logTypes.length ? setSelectAllTable(true) : setSelectAllTable(false);
-	}, [selectedUpdateLogTypes, selectedTableLogTypes]);
+	}, [selectedTableLogTypes]);
 
 	// Handle "Select All" checkbox change in the table
 	const handleTableSelectAll = () => {
@@ -128,53 +132,21 @@ export default function LogMsgComponent() {
 	// Handle sorting of logs by date
 	const handleDateSort = () => {
 		const newDateSortOrder = dateSortOrder === 'asc' ? 'desc' : 'asc';
-		const sortedLogs = [...logs].sort((a, b) => {
-			const dateA = moment(a.logTime);
-			const dateB = moment(b.logTime);
-
-			if (newDateSortOrder === 'asc') {
-				return dateA.valueOf() - dateB.valueOf();
-			} else {
-				return dateB.valueOf() - dateA.valueOf();
-			}
-		});
+		const sortedLogs = orderBy(logs, ['logTime'], [newDateSortOrder]);
 		setDateSortOrder(newDateSortOrder);
 		setLogs(sortedLogs);
 	};
-	// Handle date range change
-	const handleDateRangeChange = (range: Value) => {
-		setLogDateRange(dateRangeToTimeInterval(range));
-	};
 	// Handle page change for pagination
 	const handlePageChange = (newPage: number) => {
 		setCurrentPage(newPage);
 	};
-	// Toggle dropdown for type in the table
-	const toggleTypeTable = () => {
-		setTypeTableDropdown(!typeTableDropdown);
-	};
-	// Toggle dropdown for type in the update log
-	const toggleUpdateLog = () => {
-		setUpdateLogDropdown(!updateLogDropdown);
-	};
-	// Handle showing all logs instead of paginated
-	const handleShowAllLogs = () => {
-		setShowAllLogs(!showAllLogs);
-	};
 
 	// Filter logs based on selected log types and date range
-	const filteredLogs = logs.filter(log => {
-		const logDate = moment(log.logTime);
-		// Check if log is within the selected date range
-		const isWithinDateRange =
-			(!logDateRange || !logDateRange.getIsBounded() || logDate >= logDateRange.getStartTimestamp()) &&
-			(!logDateRange || !logDateRange.getIsBounded() || logDate <= logDateRange.getEndTimestamp());
-		return selectedTableLogTypes.includes(log.logType) && isWithinDateRange;
-	});
-
-	// Paginate logs if not showing all logs
-	const paginatedLogs = showAllLogs ? filteredLogs : filteredLogs.slice((currentPage - 1) * PER_PAGE, currentPage * PER_PAGE);
-	const totalPages = Math.ceil(filteredLogs.length / PER_PAGE);
+	const paginatedLogs = showAllLogs
+		? logs.filter(log => selectedTableLogTypes.includes(log.logType))
+		: logs.filter(log => selectedTableLogTypes.includes(log.logType))
+			.slice((currentPage - 1) * PER_PAGE, currentPage * PER_PAGE);
+	const totalPages = Math.ceil(logs.length / PER_PAGE);
 
 	/**
 	 * Handle showing the log table by fetching from the server
@@ -198,7 +170,7 @@ export default function LogMsgComponent() {
 
 			{/* Filter log messages by type, date range, and number of logs for fetching */}
 			<div style={logFilterStyle}>
-				<Dropdown isOpen={updateLogDropdown} toggle={toggleUpdateLog}>
+				<Dropdown isOpen={updateLogDropdown} toggle={() => setUpdateLogDropdown(!updateLogDropdown)}>
 					<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
 					<DropdownMenu>
 						<DropdownItem key='selectAll' toggle={false}>
@@ -230,7 +202,7 @@ export default function LogMsgComponent() {
 					<DateRangePicker
 						id="dateRange"
 						value={timeIntervalToDateRange(logDateRange)}
-						onChange={handleDateRangeChange}
+						onChange={e => setLogDateRange(dateRangeToTimeInterval(e))}
 						minDate={new Date(1970, 0, 1)}
 						maxDate={new Date()}
 						// Formats Dates, and Calendar months base on locale
@@ -270,7 +242,7 @@ export default function LogMsgComponent() {
 					<thead style={headerStyle}>
 						<tr>
 							<th>
-								<Dropdown isOpen={typeTableDropdown} toggle={toggleTypeTable}>
+								<Dropdown isOpen={typeTableDropdown} toggle={() => setTypeTableDropdown(!typeTableDropdown)}>
 									<DropdownToggle color='primary' caret>{translate('log.type')}</DropdownToggle>
 									<DropdownMenu>
 										<DropdownItem key='selectAll' toggle={false}>
@@ -308,17 +280,7 @@ export default function LogMsgComponent() {
 									style={{ cursor: 'pointer' }}
 									onClick={() => handleLogMessageModal(log.logType, log.logTime, log.logMessage)}
 								>{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}</td>
-								<td>
-									{new Date(log.logTime).toLocaleString('en-US', {
-										year: 'numeric',
-										month: '2-digit',
-										day: '2-digit',
-										hour: '2-digit',
-										minute: '2-digit',
-										second: '2-digit',
-										fractionalSecondDigits: 2
-									})}
-								</td>
+								<td>{moment(log.logTime).format('MM/DD/YYYY, hh:mm:ss.SS A')}</td>
 							</tr>
 						))}
 					</tbody>
@@ -353,10 +315,11 @@ export default function LogMsgComponent() {
 			</Pagination >}
 
 			{/* Show all logs or in pages button */}
-			{logs.length > 0 && !showAllLogs &&
-				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={handleShowAllLogs}>Show All Logs ({filteredLogs.length})</Button>}
-			{logs.length > 0 && showAllLogs &&
-				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={handleShowAllLogs}>Show in pages</Button>}
+			{logs.length > 0 &&
+				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={() => setShowAllLogs(!showAllLogs)}>
+					{!showAllLogs ? `Show All Logs (${logs.length})` : 'Show in pages'}
+				</Button>}
+
 
 			{/* Modal for displaying full log message */}
 			<Modal isOpen={modalOpen} toggle={() => setModalOpen(!modalOpen)} centered>

From cfc010d7e46146d9c72a01942990c7485bf175d9 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Thu, 5 Dec 2024 00:05:48 -0500
Subject: [PATCH 097/128] resolved PR comments

---
 package.json                                  |  5 ++-
 .../app/components/admin/LogMsgComponent.tsx  | 15 +++++---
 src/client/app/utils/api/LogsApi.ts           |  2 +-
 src/server/log.js                             | 28 --------------
 src/server/models/LogMsg.js                   |  4 +-
 src/server/routes/logs.js                     | 12 ++++--
 src/server/services/addLogMsg.js              | 37 +++++++++++++++++++
 ...ql => get_logmsgs_from_dates_and_type.sql} |  0
 ...sert_new_log.sql => insert_new_logmsg.sql} |  0
 9 files changed, 60 insertions(+), 43 deletions(-)
 create mode 100644 src/server/services/addLogMsg.js
 rename src/server/sql/logmsg/{get_logs_from_dates_and_type.sql => get_logmsgs_from_dates_and_type.sql} (100%)
 rename src/server/sql/logmsg/{insert_new_log.sql => insert_new_logmsg.sql} (100%)

diff --git a/package.json b/package.json
index fa5f6d8de..d4911d3d3 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
 		"generateCosineSquaredTestingData": "node -e 'require(\"./src/server/data/automatedTestingData\").generateCosineSquaredTestingData(2.5)'",
 		"generateTestingData": "node -e 'require(\"./src/server/data/automatedTestingData\").generateTestingData()'",
 		"testData": "node -e 'require(\"./src/server/data/automatedTestingData.js\").insertSpecialUnitsConversionsMetersGroups()'",
-		"webData": "node -e 'require(\"./src/server/data/websiteData.js\").insertWebsiteData()'"
+		"webData": "node -e 'require(\"./src/server/data/websiteData.js\").insertWebsiteData()'",
+		"addLogMsg": "node -e 'require(\"./src/server/services/addLogMsg.js\").addLogMsgToDB()'"
 	},
 	"nodemonConfig": {
 		"watch": [
@@ -135,4 +136,4 @@
 		"webpack": "~5.76.0",
 		"webpack-cli": "~5.1.4"
 	}
-}
+}
\ No newline at end of file
diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index f636aec4d..e3cb26ef1 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -66,12 +66,12 @@ export default function LogMsgComponent() {
 	const [selectedUpdateLogTypes, setSelectedUpdateLogTypes] = React.useState<string[]>(logTypes);
 	// "Select All Logs" button state for update log
 	const [selectAllUpdate, setSelectAllUpdate] = React.useState(true);
+	// Dropdown open state for log type in the update log for filtering
+	const [updateLogDropdown, setUpdateLogDropdown] = React.useState(false);
 	// Dropdown open state for log type in the header for filter
 	const [typeTableDropdown, setTypeTableDropdown] = React.useState(false);
 	// Selected log types for filtering in the table
 	const [selectedTableLogTypes, setSelectedTableLogTypes] = React.useState<string[]>(logTypes);
-	// Dropdown open state for log type in the table for filtering
-	const [updateLogDropdown, setUpdateLogDropdown] = React.useState(false);
 	// "Select All Logs" button state for table log
 	const [selectAllTable, setSelectAllTable] = React.useState(true);
 
@@ -229,7 +229,7 @@ export default function LogMsgComponent() {
 				</FormGroup>
 				<Button
 					color='primary'
-					disabled={buttonAvailable || !logLimit || logLimit < 1 || logLimit > 1000}
+					disabled={buttonAvailable || !logLimit || logLimit < 1 || logLimit > 1000 || selectedUpdateLogTypes.length === 0}
 					onClick={handleShowLogTable}
 				>
 					{translate('update')[0].toUpperCase() + translate('update').slice(1)}
@@ -269,7 +269,9 @@ export default function LogMsgComponent() {
 								</Dropdown>
 							</th>
 							<th>{translate('log.message')}</th>
-							<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>{translate('log.time')} {dateSortOrder === 'asc' ? '↑' : '↓'}</th>
+							<th onClick={handleDateSort} style={{ cursor: 'pointer' }}>
+								{translate('log.time')} {dateSortOrder === 'asc' ? '↑' : '↓'}
+							</th>
 						</tr>
 					</thead>
 					<tbody style={bodyStyle}>
@@ -279,7 +281,9 @@ export default function LogMsgComponent() {
 								<td
 									style={{ cursor: 'pointer' }}
 									onClick={() => handleLogMessageModal(log.logType, log.logTime, log.logMessage)}
-								>{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}</td>
+								>
+									{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}
+								</td>
 								<td>{moment(log.logTime).format('MM/DD/YYYY, hh:mm:ss.SS A')}</td>
 							</tr>
 						))}
@@ -320,7 +324,6 @@ export default function LogMsgComponent() {
 					{!showAllLogs ? `Show All Logs (${logs.length})` : 'Show in pages'}
 				</Button>}
 
-
 			{/* Modal for displaying full log message */}
 			<Modal isOpen={modalOpen} toggle={() => setModalOpen(!modalOpen)} centered>
 				<ModalHeader toggle={() => setModalOpen(!modalOpen)}>{modelHeader}</ModalHeader>
diff --git a/src/client/app/utils/api/LogsApi.ts b/src/client/app/utils/api/LogsApi.ts
index c53611e61..f7c30f633 100644
--- a/src/client/app/utils/api/LogsApi.ts
+++ b/src/client/app/utils/api/LogsApi.ts
@@ -29,7 +29,7 @@ export default class LogsApi {
 
 	public async getLogsByDateRangeAndType(timeInterval: TimeInterval, logTypes: string[], logLimit: string): Promise<LogData[]> {
 		const request = await this.backend.doGetRequest('/api/logs/logsmsg/getLogsByDateRangeAndType',
-			{ timeInterval: timeInterval.toString(), logTypes: logTypes.join('-'), logLimit: logLimit });
+			{ timeInterval: timeInterval.toString(), logTypes: logTypes, logLimit: logLimit });
 		return request as LogData[];
 	}
 
diff --git a/src/server/log.js b/src/server/log.js
index efc4dfc07..838e32f4d 100644
--- a/src/server/log.js
+++ b/src/server/log.js
@@ -79,33 +79,6 @@ class Logger {
 				}
 			});
 
-			// NOTE: for running the first time, uncomment the following code block to write all current logs to the database
-			// after that you can comment out it to write only new logs to the database
-			// TODO: This should be fix later to check whether it should write new logs or all logs to the database when running
-			// fs.readFile(logFile, 'utf8', async (err, data) => {
-			// 	if (err) {
-			// 		console.error(`Failed to read log file: ${err} (${err.stack})`);
-			// 		return;
-			// 	}
-
-			// 	const logEntries = data.split('\n').filter(entry => entry.trim() !== '');
-			// 	for (const entry of logEntries) {
-			// 		const logParts = entry.match(/\[(.*?)@(.*?)\] (.*)/);
-			// 		if (logParts) {
-			// 			const [, logType, logTime, logMessage] = logParts;
-			// 			const logMsg = new LogMsg(logType, logMessage, new Date(logTime));
-			// 			try {
-			// 				await logMsg.insert(conn);
-			// 			} catch (err) {
-			// 				console.error(`Failed to write log to database: ${err} (${err.stack})`);
-			// 			}
-			// 		}
-			// 	}
-			// })
-
-
-			// Comment out the following code block when running the first time to write all logs to the database
-			// then uncomment it to write only new logs to the database later
 			// Write the new log to the database
 			const logMsg = new LogMsg(level.name, message, logTime);
 			(async () => {
@@ -115,7 +88,6 @@ class Logger {
 					console.error(`Failed to write log to database: ${err} (${err.stack})`);
 				}
 			})();
-
 		}
 
 		// Only log elsewhere if given a high enough priority level.
diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
index 53be00d44..98a9ecc9c 100644
--- a/src/server/models/LogMsg.js
+++ b/src/server/models/LogMsg.js
@@ -52,7 +52,7 @@ class LogMsg {
 	 */
 	async insert(conn) {
 		const logMsg = this;
-		await conn.none(sqlFile('logmsg/insert_new_log.sql'), logMsg);
+		await conn.none(sqlFile('logmsg/insert_new_logmsg.sql'), logMsg);
 	}
 
 	/**
@@ -65,7 +65,7 @@ class LogMsg {
 	 * @returns {Promise.<array.<LogMsg>>}
 	 */
 	static async getLogsByDateRangeAndType(startDate = null, endDate = null, logTypes, logLimit = 100, conn) {
-		const rows = await conn.any(sqlFile('logmsg/get_logs_from_dates_and_type.sql'), {
+		const rows = await conn.any(sqlFile('logmsg/get_logmsgs_from_dates_and_type.sql'), {
 			startDate: startDate || '-infinity',
 			endDate: endDate || 'infinity',
 			logTypes: logTypes,
diff --git a/src/server/routes/logs.js b/src/server/routes/logs.js
index 9482d21f1..f941d9b36 100644
--- a/src/server/routes/logs.js
+++ b/src/server/routes/logs.js
@@ -29,6 +29,7 @@ const validLog = {
 const validLogMsg = {
 	type: 'object',
 	required: ['timeInterval', 'logTypes', 'logLimit'],
+	maxProperties: 3,
 	properties: {
 		timeInterval: {
 			// it should check for format: 'date-time' but this won't work for case where time is not provided
@@ -36,8 +37,11 @@ const validLogMsg = {
 			type: 'string',
 		},
 		logTypes: {
-			type: 'string',
-			pattern: '^(INFO|WARN|ERROR|SILENT|DEBUG)(-(INFO|WARN|ERROR|SILENT|DEBUG))*$'
+			type: 'array',
+			items: {
+				type: 'string',
+				enum: ['INFO', 'WARN', 'ERROR', 'SILENT', 'DEBUG']
+			}
 		},
 		logLimit: {
 			type: 'string',
@@ -79,7 +83,6 @@ router.post('/error', async (req, res) => {
 	}
 });
 
-
 router.get('/logsmsg/getLogsByDateRangeAndType', async (req, res) => {
 	const validationResult = validate(req.query, validLogMsg);
 	if (!validationResult.valid) {
@@ -89,8 +92,9 @@ router.get('/logsmsg/getLogsByDateRangeAndType', async (req, res) => {
 		try {
 			const logLimit = parseInt(req.query.logLimit);
 			const timeInterval = TimeInterval.fromString(req.query.timeInterval);
+			const logTypes = req.query.logTypes;
 			const rows = await LogMsg.getLogsByDateRangeAndType(
-				timeInterval.startTimestamp, timeInterval.endTimestamp, req.query.logTypes.split('-'), logLimit, conn);
+				timeInterval.startTimestamp, timeInterval.endTimestamp, logTypes, logLimit, conn);
 			res.json(rows);
 		} catch (err) {
 			console.error(`Failed to fetch logs filter by date range and type: ${err}`);
diff --git a/src/server/services/addLogMsg.js b/src/server/services/addLogMsg.js
new file mode 100644
index 000000000..f90a59a39
--- /dev/null
+++ b/src/server/services/addLogMsg.js
@@ -0,0 +1,37 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+const fs = require('fs');
+const logFile = require('../config').logFile;
+const LogMsg = require('../models/LogMsg');
+const { getConnection } = require('../db');
+const moment = require('moment');
+
+const addLogMsgToDB = async () => {
+    try {
+        const data = await fs.promises.readFile(logFile, 'utf8');
+        const logEntries = data.split('\n').filter(entry => entry.trim() !== '');
+        const conn = getConnection();
+
+        for (const entry of logEntries) {
+            const logParts = entry.match(/\[(.*?)@(.*?)\] (.*)/);
+            if (logParts) {
+                const [, logType, logTime, logMessage] = logParts;
+                const logMsg = new LogMsg(logType, logMessage, moment(logTime));
+                try {
+                    await logMsg.insert(conn);
+                } catch (err) {
+                    console.error(`Failed to write log to database: ${err} (${err.stack})`);
+                }
+            }
+        }
+        console.log('Log migration completed successfully.');
+    } catch (err) {
+        console.error(`Failed to migrate logs to database: ${err} (${err.stack})`);
+    }
+};
+
+module.exports = addLogMsgToDB;
\ No newline at end of file
diff --git a/src/server/sql/logmsg/get_logs_from_dates_and_type.sql b/src/server/sql/logmsg/get_logmsgs_from_dates_and_type.sql
similarity index 100%
rename from src/server/sql/logmsg/get_logs_from_dates_and_type.sql
rename to src/server/sql/logmsg/get_logmsgs_from_dates_and_type.sql
diff --git a/src/server/sql/logmsg/insert_new_log.sql b/src/server/sql/logmsg/insert_new_logmsg.sql
similarity index 100%
rename from src/server/sql/logmsg/insert_new_log.sql
rename to src/server/sql/logmsg/insert_new_logmsg.sql

From b73a2925d48399499fd6cb593fda9ad9b0b327af Mon Sep 17 00:00:00 2001
From: Miller Rosenthal <millerrosenthal@ucmerced.edu>
Date: Fri, 6 Dec 2024 03:02:17 +0000
Subject: [PATCH 098/128] test case cg5

---
 .../test/web/readingsCompareGroupQuantity.js  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index 41b9277de..e04c82196 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -53,10 +53,25 @@ mocha.describe('readings API', () => {
 				});
 
 				// Add CG3 here
-
+				
 				// Add CG4 here
-
-				// Add CG5 here
+				
+				//Put readings with zero until 2022-11-01 15:00:00
+				mocha.it('CG5: 7 day shift end 2022-11-01 15:00:00 (beyond data) for 15 minute reading intervals and quantity units & kWh as kWh ', async () => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh);
+					// Get the unit ID since the DB could use any value.
+					const unitId = await getUnitId('kWh');
+					const expected = [16171.5504445167, 23010.8509932843];
+					// for compare, need the unitID, currentStart, currentEnd, shift
+					const res = await chai.request(app).get(`/api/compareReadings/groups/${GROUP_ID}`)
+						.query({
+							curr_start: '2022-10-30 00:00:00',
+							curr_end: '2022-11-01 15:00:00',
+							shift: 'P7D',
+							graphicUnitId: unitId
+						});
+					expectCompareToEqualExpected(res, expected, GROUP_ID);
+				});
 
 				// Add CG6 here
 

From dd93f6e39f0e5defc8face81e1981a19cf6b6dcc Mon Sep 17 00:00:00 2001
From: Unknown31414652 <67784900+Unknown31414652@users.noreply.github.com>
Date: Fri, 6 Dec 2024 03:48:45 +0000
Subject: [PATCH 099/128] Added test case CG3

---
 .../test/web/readingsCompareGroupQuantity.js     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index 41b9277de..39ab5ab2a 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -53,7 +53,21 @@ mocha.describe('readings API', () => {
 				});
 
 				// Add CG3 here
-
+				mocha.it('CG3: 28 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as kWh ', async () => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh);
+					// Get the unit ID since the DB could use any value.
+					const unitId = await getUnitId('kWh');
+					const expected = [189951.689612281, 190855.90449004];
+					// for compare, need the unitID, currentStart, currentEnd, shift
+					const res = await chai.request(app).get(`/api/compareReadings/groups/${GROUP_ID}`)
+						.query({
+							curr_start: '2022-10-09 00:00:00',
+							curr_end: '2022-10-31 17:00:00',
+							shift: 'P28D',
+							graphicUnitId: unitId
+						});
+					expectCompareToEqualExpected(res, expected, GROUP_ID);
+				});
 				// Add CG4 here
 
 				// Add CG5 here

From 9c3deed29ae0b8ddd2099d5078c1570e9431a205 Mon Sep 17 00:00:00 2001
From: regina <huang.rong@northeastern.edu>
Date: Fri, 6 Dec 2024 14:44:54 -0500
Subject: [PATCH 100/128] add test case for cg6

---
 src/server/test/web/readingsCompareGroupQuantity.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index cf6d3fa85..3a3b8e115 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -58,7 +58,8 @@ mocha.describe('readings API', () => {
 
 				// Add CG5 here
 
-				mocha.it('CG6: 28 day shift end 2022-10-31 17:12:34 for 15 minute reading intervals and quantity units & kWh as kWh ', async () => {
+				// Add CG6 here
+				mocha.it('CG6: 28-day shift end 2022-10-31 17:12:34 for 15-minute reading intervals and quantity units & kWh as kWh', async () => {
 					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh);
 					// Get the unit ID since the DB could use any value.
 					const unitId = await getUnitId('kWh');
@@ -66,14 +67,16 @@ mocha.describe('readings API', () => {
 					// for compare, need the unitID, currentStart, currentEnd, shift
 					const res = await chai.request(app).get(`/api/compareReadings/groups/${GROUP_ID}`)
 						.query({
-							curr_start: '2022-10-09 00:00:00',
-							curr_end: '2022-10-31 17:12:34',
-							shift: 'P28D',
-							graphicUnitId: unitId
+							curr_start: '2022-10-09 00:00:00', 
+							curr_end: '2022-10-31 17:12:34',  
+							shift: 'P28D',                    // 28-day shift
+							graphicUnitId: unitId             // Unit ID for kWh
 						});
+				
 					expectCompareToEqualExpected(res, expected, GROUP_ID);
 				});
 
+
 				// Add CG8 here
 
 				// Add CG9 here

From 0f99ae5196405a39d2889dc8db8397378c080944 Mon Sep 17 00:00:00 2001
From: regina <huang.rong@northeastern.edu>
Date: Fri, 6 Dec 2024 14:50:56 -0500
Subject: [PATCH 101/128] add test for CG6

---
 package-lock.json | 6271 ++++++++++++++++++++++++---------------------
 package.json      |    1 +
 2 files changed, 3391 insertions(+), 2881 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 68bc1cd28..6ce78881d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "1.0.0",
 			"license": "MPL-2.0",
 			"dependencies": {
+				"@plotly/mapbox-gl": "~1.13.4",
 				"@reduxjs/toolkit": "~2.2.5",
 				"@wojtekmaj/react-daterange-picker": "~6.0.0",
 				"axios": "~1.6.2",
@@ -89,72 +90,87 @@
 				"webpack-cli": "~5.1.4"
 			}
 		},
-		"node_modules/@aashutoshrathi/word-wrap": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-			"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-			"dev": true,
+		"node_modules/@babel/code-frame": {
+			"version": "7.26.2",
+			"resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.26.2.tgz",
+			"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
+			},
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/code-frame": {
-			"version": "7.24.6",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
-			"integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==",
+		"node_modules/@babel/generator": {
+			"version": "7.26.3",
+			"resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.26.3.tgz",
+			"integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/highlight": "^7.24.6",
-				"picocolors": "^1.0.0"
+				"@babel/parser": "^7.26.3",
+				"@babel/types": "^7.26.3",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jsesc": "^3.0.2"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-imports": {
-			"version": "7.24.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz",
-			"integrity": "sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.24.6"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.24.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz",
-			"integrity": "sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.24.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz",
-			"integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/highlight": {
-			"version": "7.24.6",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz",
-			"integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==",
+		"node_modules/@babel/parser": {
+			"version": "7.26.3",
+			"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.26.3.tgz",
+			"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.24.6",
-				"chalk": "^2.4.2",
-				"js-tokens": "^4.0.0",
-				"picocolors": "^1.0.0"
+				"@babel/types": "^7.26.3"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
 			},
 			"engines": {
-				"node": ">=6.9.0"
+				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@babel/runtime": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-			"integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz",
+			"integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+			"license": "MIT",
 			"dependencies": {
 				"regenerator-runtime": "^0.14.0"
 			},
@@ -162,14 +178,55 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/template": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.25.9.tgz",
+			"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/types": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.26.4",
+			"resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.26.4.tgz",
+			"integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.26.2",
+				"@babel/generator": "^7.26.3",
+				"@babel/parser": "^7.26.3",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.26.3",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@babel/types": {
-			"version": "7.24.6",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz",
-			"integrity": "sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.26.3.tgz",
+			"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
+			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.24.6",
-				"@babel/helper-validator-identifier": "^7.24.6",
-				"to-fast-properties": "^2.0.0"
+				"@babel/helper-string-parser": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -177,8 +234,9 @@
 		},
 		"node_modules/@choojs/findup": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/@choojs/findup/-/findup-0.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@choojs/findup/-/findup-0.2.1.tgz",
 			"integrity": "sha512-YstAqNb0MCN8PjdLCDfRsBcGVRN41f3vgLvaI0IrIcBp4AqILRSS0DeWNGkicC+f/zRIPJLc+9RURVSepwvfBw==",
+			"license": "MIT",
 			"dependencies": {
 				"commander": "^2.15.1"
 			},
@@ -186,25 +244,33 @@
 				"findup": "bin/findup.js"
 			}
 		},
+		"node_modules/@choojs/findup/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"license": "MIT"
+		},
 		"node_modules/@discoveryjs/json-ext": {
 			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+			"resolved": "https://registry.npmmirror.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
 			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
 		"node_modules/@emotion/babel-plugin": {
-			"version": "11.11.0",
-			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
-			"integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
+			"version": "11.13.5",
+			"resolved": "https://registry.npmmirror.com/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
+			"integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/helper-module-imports": "^7.16.7",
 				"@babel/runtime": "^7.18.3",
-				"@emotion/hash": "^0.9.1",
-				"@emotion/memoize": "^0.8.1",
-				"@emotion/serialize": "^1.1.2",
+				"@emotion/hash": "^0.9.2",
+				"@emotion/memoize": "^0.9.0",
+				"@emotion/serialize": "^1.3.3",
 				"babel-plugin-macros": "^3.1.0",
 				"convert-source-map": "^1.5.0",
 				"escape-string-regexp": "^4.0.0",
@@ -213,51 +279,44 @@
 				"stylis": "4.2.0"
 			}
 		},
-		"node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/@emotion/cache": {
-			"version": "11.11.0",
-			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
-			"integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
-			"dependencies": {
-				"@emotion/memoize": "^0.8.1",
-				"@emotion/sheet": "^1.2.2",
-				"@emotion/utils": "^1.2.1",
-				"@emotion/weak-memoize": "^0.3.1",
+			"version": "11.13.5",
+			"resolved": "https://registry.npmmirror.com/@emotion/cache/-/cache-11.13.5.tgz",
+			"integrity": "sha512-Z3xbtJ+UcK76eWkagZ1onvn/wAVb1GOMuR15s30Fm2wrMgC7jzpnO2JZXr4eujTTqoQFUrZIw/rT0c6Zzjca1g==",
+			"license": "MIT",
+			"dependencies": {
+				"@emotion/memoize": "^0.9.0",
+				"@emotion/sheet": "^1.4.0",
+				"@emotion/utils": "^1.4.2",
+				"@emotion/weak-memoize": "^0.4.0",
 				"stylis": "4.2.0"
 			}
 		},
 		"node_modules/@emotion/hash": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
-			"integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
+			"version": "0.9.2",
+			"resolved": "https://registry.npmmirror.com/@emotion/hash/-/hash-0.9.2.tgz",
+			"integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
+			"license": "MIT"
 		},
 		"node_modules/@emotion/memoize": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
-			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+			"version": "0.9.0",
+			"resolved": "https://registry.npmmirror.com/@emotion/memoize/-/memoize-0.9.0.tgz",
+			"integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
+			"license": "MIT"
 		},
 		"node_modules/@emotion/react": {
-			"version": "11.11.1",
-			"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.1.tgz",
-			"integrity": "sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==",
+			"version": "11.13.5",
+			"resolved": "https://registry.npmmirror.com/@emotion/react/-/react-11.13.5.tgz",
+			"integrity": "sha512-6zeCUxUH+EPF1s+YF/2hPVODeV/7V07YU5x+2tfuRL8MdW6rv5vb2+CBEGTGwBdux0OIERcOS+RzxeK80k2DsQ==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
-				"@emotion/babel-plugin": "^11.11.0",
-				"@emotion/cache": "^11.11.0",
-				"@emotion/serialize": "^1.1.2",
-				"@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
-				"@emotion/utils": "^1.2.1",
-				"@emotion/weak-memoize": "^0.3.1",
+				"@emotion/babel-plugin": "^11.13.5",
+				"@emotion/cache": "^11.13.5",
+				"@emotion/serialize": "^1.3.3",
+				"@emotion/use-insertion-effect-with-fallbacks": "^1.1.0",
+				"@emotion/utils": "^1.4.2",
+				"@emotion/weak-memoize": "^0.4.0",
 				"hoist-non-react-statics": "^3.3.1"
 			},
 			"peerDependencies": {
@@ -270,51 +329,61 @@
 			}
 		},
 		"node_modules/@emotion/serialize": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz",
-			"integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==",
-			"dependencies": {
-				"@emotion/hash": "^0.9.1",
-				"@emotion/memoize": "^0.8.1",
-				"@emotion/unitless": "^0.8.1",
-				"@emotion/utils": "^1.2.1",
+			"version": "1.3.3",
+			"resolved": "https://registry.npmmirror.com/@emotion/serialize/-/serialize-1.3.3.tgz",
+			"integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==",
+			"license": "MIT",
+			"dependencies": {
+				"@emotion/hash": "^0.9.2",
+				"@emotion/memoize": "^0.9.0",
+				"@emotion/unitless": "^0.10.0",
+				"@emotion/utils": "^1.4.2",
 				"csstype": "^3.0.2"
 			}
 		},
 		"node_modules/@emotion/sheet": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
-			"integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="
+			"version": "1.4.0",
+			"resolved": "https://registry.npmmirror.com/@emotion/sheet/-/sheet-1.4.0.tgz",
+			"integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==",
+			"license": "MIT"
 		},
 		"node_modules/@emotion/unitless": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
-			"integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
+			"version": "0.10.0",
+			"resolved": "https://registry.npmmirror.com/@emotion/unitless/-/unitless-0.10.0.tgz",
+			"integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==",
+			"license": "MIT"
 		},
 		"node_modules/@emotion/use-insertion-effect-with-fallbacks": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
-			"integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz",
+			"integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==",
+			"license": "MIT",
 			"peerDependencies": {
 				"react": ">=16.8.0"
 			}
 		},
 		"node_modules/@emotion/utils": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
-			"integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
+			"version": "1.4.2",
+			"resolved": "https://registry.npmmirror.com/@emotion/utils/-/utils-1.4.2.tgz",
+			"integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==",
+			"license": "MIT"
 		},
 		"node_modules/@emotion/weak-memoize": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
-			"integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
+			"version": "0.4.0",
+			"resolved": "https://registry.npmmirror.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",
+			"integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
+			"license": "MIT"
 		},
 		"node_modules/@es-joy/jsdoccomment": {
-			"version": "0.42.0",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.42.0.tgz",
-			"integrity": "sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==",
+			"version": "0.43.1",
+			"resolved": "https://registry.npmmirror.com/@es-joy/jsdoccomment/-/jsdoccomment-0.43.1.tgz",
+			"integrity": "sha512-I238eDtOolvCuvtxrnqtlBaw0BwdQuYqK7eA6XIonicMdOOOb75mqdIzkGDUbS04+1Di007rgm9snFRNeVrOog==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
+				"@types/eslint": "^8.56.5",
+				"@types/estree": "^1.0.5",
+				"@typescript-eslint/types": "^7.2.0",
 				"comment-parser": "1.4.1",
 				"esquery": "^1.5.0",
 				"jsdoc-type-pratt-parser": "~4.0.0"
@@ -323,35 +392,55 @@
 				"node": ">=16"
 			}
 		},
+		"node_modules/@es-joy/jsdoccomment/node_modules/@typescript-eslint/types": {
+			"version": "7.18.0",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-7.18.0.tgz",
+			"integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.18.0 || >=20.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
 		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+			"version": "4.4.1",
+			"resolved": "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+			"integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"eslint-visitor-keys": "^3.3.0"
+				"eslint-visitor-keys": "^3.4.3"
 			},
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			},
 			"peerDependencies": {
 				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
 			}
 		},
 		"node_modules/@eslint-community/regexpp": {
-			"version": "4.10.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-			"integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+			"version": "4.12.1",
+			"resolved": "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+			"integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
 			}
 		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
-			"integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
+			"version": "2.1.4",
+			"resolved": "https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+			"integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
@@ -370,64 +459,110 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/@eslint/eslintrc/node_modules/globals": {
-			"version": "13.23.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-			"integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+		"node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"type-fest": "^0.20.2"
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
 			},
 			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": "*"
 			}
 		},
 		"node_modules/@eslint/js": {
 			"version": "8.48.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@eslint/js/-/js-8.48.0.tgz",
 			"integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
 		"node_modules/@floating-ui/core": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz",
-			"integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==",
+			"version": "1.6.8",
+			"resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.8.tgz",
+			"integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+			"license": "MIT",
 			"dependencies": {
-				"@floating-ui/utils": "^0.1.3"
+				"@floating-ui/utils": "^0.2.8"
 			}
 		},
 		"node_modules/@floating-ui/dom": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz",
-			"integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==",
+			"version": "1.6.12",
+			"resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.6.12.tgz",
+			"integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==",
+			"license": "MIT",
 			"dependencies": {
-				"@floating-ui/core": "^1.4.2",
-				"@floating-ui/utils": "^0.1.3"
+				"@floating-ui/core": "^1.6.0",
+				"@floating-ui/utils": "^0.2.8"
 			}
 		},
 		"node_modules/@floating-ui/utils": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz",
-			"integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
+			"version": "0.2.8",
+			"resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.8.tgz",
+			"integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
+			"license": "MIT"
+		},
+		"node_modules/@formatjs/ecma402-abstract": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmmirror.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
+			"license": "MIT",
+			"dependencies": {
+				"@formatjs/intl-localematcher": "0.5.4",
+				"tslib": "^2.4.0"
+			}
 		},
 		"node_modules/@formatjs/fast-memoize": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz",
 			"integrity": "sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==",
+			"license": "MIT",
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
 		},
+		"node_modules/@formatjs/icu-messageformat-parser": {
+			"version": "2.7.8",
+			"resolved": "https://registry.npmmirror.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
+			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
+			"license": "MIT",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"@formatjs/icu-skeleton-parser": "1.8.2",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@formatjs/icu-skeleton-parser": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmmirror.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
+			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/@formatjs/intl": {
 			"version": "2.10.4",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.4.tgz",
+			"resolved": "https://registry.npmmirror.com/@formatjs/intl/-/intl-2.10.4.tgz",
 			"integrity": "sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==",
+			"license": "MIT",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/fast-memoize": "2.2.0",
@@ -448,113 +583,81 @@
 		},
 		"node_modules/@formatjs/intl-displaynames": {
 			"version": "6.6.8",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz",
+			"resolved": "https://registry.npmmirror.com/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz",
 			"integrity": "sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==",
+			"license": "MIT",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/intl-localematcher": "0.5.4",
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/ecma402-abstract": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
-			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
-			"dependencies": {
-				"@formatjs/intl-localematcher": "0.5.4",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/intl-localematcher": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
-			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
-			"dependencies": {
-				"tslib": "^2.4.0"
-			}
-		},
 		"node_modules/@formatjs/intl-listformat": {
 			"version": "7.5.7",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz",
+			"resolved": "https://registry.npmmirror.com/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz",
 			"integrity": "sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==",
+			"license": "MIT",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/intl-localematcher": "0.5.4",
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@formatjs/intl-listformat/node_modules/@formatjs/ecma402-abstract": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
-			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
-			"dependencies": {
-				"@formatjs/intl-localematcher": "0.5.4",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@formatjs/intl-listformat/node_modules/@formatjs/intl-localematcher": {
+		"node_modules/@formatjs/intl-localematcher": {
 			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+			"resolved": "https://registry.npmmirror.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
 			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
+			"license": "MIT",
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@formatjs/intl/node_modules/@formatjs/ecma402-abstract": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
-			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
-			"dependencies": {
-				"@formatjs/intl-localematcher": "0.5.4",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@formatjs/intl/node_modules/@formatjs/icu-messageformat-parser": {
-			"version": "2.7.8",
-			"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
-			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
-			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"@formatjs/icu-skeleton-parser": "1.8.2",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@formatjs/intl/node_modules/@formatjs/icu-skeleton-parser": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
-			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.11.14",
+			"resolved": "https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+			"integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+			"deprecated": "Use @eslint/config-array instead",
+			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"tslib": "^2.4.0"
+				"@humanwhocodes/object-schema": "^2.0.2",
+				"debug": "^4.3.1",
+				"minimatch": "^3.0.5"
+			},
+			"engines": {
+				"node": ">=10.10.0"
 			}
 		},
-		"node_modules/@formatjs/intl/node_modules/@formatjs/intl-localematcher": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
-			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
+		"node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"tslib": "^2.4.0"
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
 			}
 		},
-		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.11.13",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-			"integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+		"node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"@humanwhocodes/object-schema": "^2.0.1",
-				"debug": "^4.1.1",
-				"minimatch": "^3.0.5"
+				"brace-expansion": "^1.1.7"
 			},
 			"engines": {
-				"node": ">=10.10.0"
+				"node": "*"
 			}
 		},
 		"node_modules/@humanwhocodes/module-importer": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
 			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"engines": {
 				"node": ">=12.22"
 			},
@@ -564,16 +667,18 @@
 			}
 		},
 		"node_modules/@humanwhocodes/object-schema": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-			"integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
-			"dev": true
+			"version": "2.0.3",
+			"resolved": "https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+			"integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+			"deprecated": "Use @eslint/object-schema instead",
+			"dev": true,
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/@jridgewell/gen-mapping": {
 			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
 			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/set-array": "^1.2.1",
 				"@jridgewell/sourcemap-codec": "^1.4.10",
@@ -584,44 +689,45 @@
 			}
 		},
 		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-			"integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
-			"dev": true,
+			"version": "3.1.2",
+			"resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/set-array": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz",
 			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+			"version": "0.3.6",
+			"resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-			"dev": true
+			"version": "1.5.0",
+			"resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
 			"version": "0.3.25",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
 			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/resolve-uri": "^3.1.0",
 				"@jridgewell/sourcemap-codec": "^1.4.14"
@@ -629,8 +735,9 @@
 		},
 		"node_modules/@mapbox/geojson-rewind": {
 			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
 			"integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
+			"license": "ISC",
 			"dependencies": {
 				"get-stream": "^6.0.1",
 				"minimist": "^1.2.6"
@@ -641,12 +748,13 @@
 		},
 		"node_modules/@mapbox/geojson-types": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz",
-			"integrity": "sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw=="
+			"resolved": "https://registry.npmmirror.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz",
+			"integrity": "sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw==",
+			"license": "ISC"
 		},
 		"node_modules/@mapbox/jsonlint-lines-primitives": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
 			"integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==",
 			"engines": {
 				"node": ">= 0.6"
@@ -654,48 +762,55 @@
 		},
 		"node_modules/@mapbox/mapbox-gl-supported": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz",
 			"integrity": "sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==",
+			"license": "BSD-3-Clause",
 			"peerDependencies": {
 				"mapbox-gl": ">=0.32.1 <2.0.0"
 			}
 		},
 		"node_modules/@mapbox/point-geometry": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
-			"integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ=="
+			"resolved": "https://registry.npmmirror.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
+			"integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==",
+			"license": "ISC"
 		},
 		"node_modules/@mapbox/tiny-sdf": {
 			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz",
-			"integrity": "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw=="
+			"resolved": "https://registry.npmmirror.com/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz",
+			"integrity": "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==",
+			"license": "BSD-2-Clause"
 		},
 		"node_modules/@mapbox/unitbezier": {
 			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz",
-			"integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA=="
+			"resolved": "https://registry.npmmirror.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz",
+			"integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==",
+			"license": "BSD-2-Clause"
 		},
 		"node_modules/@mapbox/vector-tile": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
 			"integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@mapbox/point-geometry": "~0.1.0"
 			}
 		},
 		"node_modules/@mapbox/whoots-js": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
 			"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==",
+			"license": "ISC",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
 			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.stat": "2.0.5",
 				"run-parallel": "^1.1.9"
@@ -706,18 +821,20 @@
 		},
 		"node_modules/@nodelib/fs.stat": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
 			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 8"
 			}
 		},
 		"node_modules/@nodelib/fs.walk": {
 			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
 			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.scandir": "2.1.5",
 				"fastq": "^1.6.0"
@@ -728,13 +845,15 @@
 		},
 		"node_modules/@plotly/d3": {
 			"version": "3.8.1",
-			"resolved": "https://registry.npmjs.org/@plotly/d3/-/d3-3.8.1.tgz",
-			"integrity": "sha512-x49ThEu1FRA00kTso4Jdfyf2byaCPLBGmLjAYQz5OzaPyLUhHesX3/Nfv2OHEhynhdy2UB39DLXq6thYe2L2kg=="
+			"resolved": "https://registry.npmmirror.com/@plotly/d3/-/d3-3.8.1.tgz",
+			"integrity": "sha512-x49ThEu1FRA00kTso4Jdfyf2byaCPLBGmLjAYQz5OzaPyLUhHesX3/Nfv2OHEhynhdy2UB39DLXq6thYe2L2kg==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/@plotly/d3-sankey": {
 			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/@plotly/d3-sankey/-/d3-sankey-0.7.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@plotly/d3-sankey/-/d3-sankey-0.7.2.tgz",
 			"integrity": "sha512-2jdVos1N3mMp3QW0k2q1ph7Gd6j5PY1YihBrwpkFnKqO+cqtZq3AdEYUeSGXMeLsBDQYiqTVcihYfk8vr5tqhw==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"d3-array": "1",
 				"d3-collection": "1",
@@ -743,8 +862,9 @@
 		},
 		"node_modules/@plotly/d3-sankey-circular": {
 			"version": "0.33.1",
-			"resolved": "https://registry.npmjs.org/@plotly/d3-sankey-circular/-/d3-sankey-circular-0.33.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@plotly/d3-sankey-circular/-/d3-sankey-circular-0.33.1.tgz",
 			"integrity": "sha512-FgBV1HEvCr3DV7RHhDsPXyryknucxtfnLwPtCKKxdolKyTFYoLX/ibEfX39iFYIL7DYbVeRtP43dbFcrHNE+KQ==",
+			"license": "MIT",
 			"dependencies": {
 				"d3-array": "^1.2.1",
 				"d3-collection": "^1.0.4",
@@ -752,10 +872,53 @@
 				"elementary-circuits-directed-graph": "^1.0.4"
 			}
 		},
+		"node_modules/@plotly/d3-sankey-circular/node_modules/d3-array": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
+			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/@plotly/d3-sankey-circular/node_modules/d3-path": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-1.0.9.tgz",
+			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/@plotly/d3-sankey-circular/node_modules/d3-shape": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-1.3.7.tgz",
+			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-path": "1"
+			}
+		},
+		"node_modules/@plotly/d3-sankey/node_modules/d3-array": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
+			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/@plotly/d3-sankey/node_modules/d3-path": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-1.0.9.tgz",
+			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/@plotly/d3-sankey/node_modules/d3-shape": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-1.3.7.tgz",
+			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-path": "1"
+			}
+		},
 		"node_modules/@plotly/mapbox-gl": {
 			"version": "1.13.4",
-			"resolved": "https://registry.npmjs.org/@plotly/mapbox-gl/-/mapbox-gl-1.13.4.tgz",
+			"resolved": "https://registry.npmmirror.com/@plotly/mapbox-gl/-/mapbox-gl-1.13.4.tgz",
 			"integrity": "sha512-sR3/Pe5LqT/fhYgp4rT4aSFf1rTsxMbGiH6Hojc7PH36ny5Bn17iVFUjpzycafETURuFbLZUfjODO8LvSI+5zQ==",
+			"license": "SEE LICENSE IN LICENSE.txt",
 			"dependencies": {
 				"@mapbox/geojson-rewind": "^0.5.2",
 				"@mapbox/geojson-types": "^1.0.2",
@@ -786,8 +949,9 @@
 		},
 		"node_modules/@plotly/point-cluster": {
 			"version": "3.1.9",
-			"resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz",
+			"resolved": "https://registry.npmmirror.com/@plotly/point-cluster/-/point-cluster-3.1.9.tgz",
 			"integrity": "sha512-MwaI6g9scKf68Orpr1pHZ597pYx9uP8UEFXLPbsCmuw3a84obwz6pnMXGc90VhgDNeNiLEdlmuK7CPo+5PIxXw==",
+			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"binary-search-bounds": "^2.0.4",
@@ -803,8 +967,9 @@
 		},
 		"node_modules/@popperjs/core": {
 			"version": "2.11.8",
-			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+			"resolved": "https://registry.npmmirror.com/@popperjs/core/-/core-2.11.8.tgz",
 			"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+			"license": "MIT",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/popperjs"
@@ -812,9 +977,10 @@
 		},
 		"node_modules/@redux-devtools/extension": {
 			"version": "3.2.6",
-			"resolved": "https://registry.npmjs.org/@redux-devtools/extension/-/extension-3.2.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@redux-devtools/extension/-/extension-3.2.6.tgz",
 			"integrity": "sha512-fWrqYAoFFKc5+78P/xWj+3NcoiJ07ak5qdiPTbO5CAuM5vE3dKk5fajpJyuOab+hLNEUJMTklCBYm+WTFcWWxA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.23.2",
 				"immutable": "^4.3.4"
@@ -824,9 +990,10 @@
 			}
 		},
 		"node_modules/@reduxjs/toolkit": {
-			"version": "2.2.5",
-			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.5.tgz",
-			"integrity": "sha512-aeFA/s5NCG7NoJe/MhmwREJxRkDs0ZaSqt0MxhWUrwCf1UQXpwR87RROJEql0uAkLI6U7snBOYOcKw83ew3FPg==",
+			"version": "2.2.8",
+			"resolved": "https://registry.npmmirror.com/@reduxjs/toolkit/-/toolkit-2.2.8.tgz",
+			"integrity": "sha512-eK/ieXftPRQfaBSmzsamXEyDwkntMTY0e9SG5ETsEOv5JIPKhu3mj992t6B8FJjlnSrZBAAqdT8oMkPe4j+P9g==",
+			"license": "MIT",
 			"dependencies": {
 				"immer": "^10.0.3",
 				"redux": "^5.0.1",
@@ -848,73 +1015,82 @@
 		},
 		"node_modules/@reduxjs/toolkit/node_modules/redux": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
-			"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
+			"resolved": "https://registry.npmmirror.com/redux/-/redux-5.0.1.tgz",
+			"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+			"license": "MIT"
 		},
 		"node_modules/@reduxjs/toolkit/node_modules/redux-thunk": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/redux-thunk/-/redux-thunk-3.1.0.tgz",
 			"integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+			"license": "MIT",
 			"peerDependencies": {
 				"redux": "^5.0.0"
 			}
 		},
 		"node_modules/@remix-run/router": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.1.tgz",
-			"integrity": "sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==",
+			"version": "1.14.2",
+			"resolved": "https://registry.npmmirror.com/@remix-run/router/-/router-1.14.2.tgz",
+			"integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=14.0.0"
 			}
 		},
 		"node_modules/@sinonjs/commons": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-3.0.1.tgz",
 			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"type-detect": "4.0.8"
 			}
 		},
+		"node_modules/@sinonjs/commons/node_modules/type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmmirror.com/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/@sinonjs/fake-timers": {
 			"version": "11.2.2",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
 			"integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@sinonjs/commons": "^3.0.0"
 			}
 		},
 		"node_modules/@sinonjs/samsam": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz",
-			"integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==",
+			"version": "8.0.2",
+			"resolved": "https://registry.npmmirror.com/@sinonjs/samsam/-/samsam-8.0.2.tgz",
+			"integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"@sinonjs/commons": "^2.0.0",
+				"@sinonjs/commons": "^3.0.1",
 				"lodash.get": "^4.4.2",
-				"type-detect": "^4.0.8"
-			}
-		},
-		"node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-			"integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
-			"dev": true,
-			"dependencies": {
-				"type-detect": "4.0.8"
+				"type-detect": "^4.1.0"
 			}
 		},
 		"node_modules/@sinonjs/text-encoding": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-			"integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
-			"dev": true
+			"version": "0.7.3",
+			"resolved": "https://registry.npmmirror.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
+			"integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
+			"dev": true,
+			"license": "(Unlicense OR Apache-2.0)"
 		},
 		"node_modules/@turf/area": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@turf/area/-/area-6.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@turf/area/-/area-6.5.0.tgz",
 			"integrity": "sha512-xCZdiuojokLbQ+29qR6qoMD89hv+JAgWjLrwSEWL+3JV8IXKeNFl6XkEJz9HGkVpnXvQKJoRz4/liT+8ZZ5Jyg==",
+			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0",
 				"@turf/meta": "^6.5.0"
@@ -925,8 +1101,9 @@
 		},
 		"node_modules/@turf/bbox": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-6.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@turf/bbox/-/bbox-6.5.0.tgz",
 			"integrity": "sha512-RBbLaao5hXTYyyg577iuMtDB8ehxMlUqHEJiMs8jT1GHkFhr6sYre3lmLsPeYEi/ZKj5TP5tt7fkzNdJ4GIVyw==",
+			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0",
 				"@turf/meta": "^6.5.0"
@@ -937,8 +1114,9 @@
 		},
 		"node_modules/@turf/centroid": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@turf/centroid/-/centroid-6.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@turf/centroid/-/centroid-6.5.0.tgz",
 			"integrity": "sha512-MwE1oq5E3isewPprEClbfU5pXljIK/GUOMbn22UM3IFPDJX0KeoyLNwghszkdmFp/qMGL/M13MMWvU+GNLXP/A==",
+			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0",
 				"@turf/meta": "^6.5.0"
@@ -949,16 +1127,18 @@
 		},
 		"node_modules/@turf/helpers": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@turf/helpers/-/helpers-6.5.0.tgz",
 			"integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://opencollective.com/turf"
 			}
 		},
 		"node_modules/@turf/meta": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@turf/meta/-/meta-6.5.0.tgz",
 			"integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==",
+			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0"
 			},
@@ -967,22 +1147,25 @@
 			}
 		},
 		"node_modules/@types/chai": {
-			"version": "4.3.10",
-			"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz",
-			"integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==",
-			"dev": true
+			"version": "4.3.20",
+			"resolved": "https://registry.npmmirror.com/@types/chai/-/chai-4.3.20.tgz",
+			"integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/cookiejar": {
 			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/cookiejar/-/cookiejar-2.1.5.tgz",
 			"integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3": {
 			"version": "7.4.3",
-			"resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3/-/d3-7.4.3.tgz",
 			"integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-array": "*",
 				"@types/d3-axis": "*",
@@ -1018,45 +1201,51 @@
 		},
 		"node_modules/@types/d3-array": {
 			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-array/-/d3-array-3.2.1.tgz",
 			"integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-axis": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-axis/-/d3-axis-3.0.6.tgz",
 			"integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-brush": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-brush/-/d3-brush-3.0.6.tgz",
 			"integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-chord": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-chord/-/d3-chord-3.0.6.tgz",
 			"integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-color": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-color/-/d3-color-3.1.3.tgz",
 			"integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-contour": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-contour/-/d3-contour-3.0.6.tgz",
 			"integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-array": "*",
 				"@types/geojson": "*"
@@ -1064,178 +1253,203 @@
 		},
 		"node_modules/@types/d3-delaunay": {
 			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
 			"integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-dispatch": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
 			"integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-drag": {
 			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-drag/-/d3-drag-3.0.7.tgz",
 			"integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-dsv": {
 			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
 			"integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-ease": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-ease/-/d3-ease-3.0.2.tgz",
 			"integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-fetch": {
 			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
 			"integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-dsv": "*"
 			}
 		},
 		"node_modules/@types/d3-force": {
 			"version": "3.0.10",
-			"resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-force/-/d3-force-3.0.10.tgz",
 			"integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-format": {
 			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-format/-/d3-format-3.0.4.tgz",
 			"integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-geo": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-geo/-/d3-geo-3.1.0.tgz",
 			"integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/geojson": "*"
 			}
 		},
 		"node_modules/@types/d3-hierarchy": {
 			"version": "3.1.7",
-			"resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
 			"integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-interpolate": {
 			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
 			"integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-color": "*"
 			}
 		},
 		"node_modules/@types/d3-path": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-path/-/d3-path-3.1.0.tgz",
 			"integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-polygon": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
 			"integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-quadtree": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
 			"integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-random": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-random/-/d3-random-3.0.3.tgz",
 			"integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-scale": {
 			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-scale/-/d3-scale-4.0.8.tgz",
 			"integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-time": "*"
 			}
 		},
 		"node_modules/@types/d3-scale-chromatic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
-			"integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==",
-			"dev": true
+			"version": "3.1.0",
+			"resolved": "https://registry.npmmirror.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+			"integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-selection": {
-			"version": "3.0.10",
-			"resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz",
-			"integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==",
-			"dev": true
+			"version": "3.0.11",
+			"resolved": "https://registry.npmmirror.com/@types/d3-selection/-/d3-selection-3.0.11.tgz",
+			"integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-shape": {
 			"version": "3.1.6",
-			"resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-shape/-/d3-shape-3.1.6.tgz",
 			"integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-path": "*"
 			}
 		},
 		"node_modules/@types/d3-time": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
-			"integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==",
-			"dev": true
+			"version": "3.0.4",
+			"resolved": "https://registry.npmmirror.com/@types/d3-time/-/d3-time-3.0.4.tgz",
+			"integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-time-format": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
 			"integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-timer": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-timer/-/d3-timer-3.0.2.tgz",
 			"integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/d3-transition": {
-			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz",
-			"integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==",
+			"version": "3.0.9",
+			"resolved": "https://registry.npmmirror.com/@types/d3-transition/-/d3-transition-3.0.9.tgz",
+			"integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-zoom": {
 			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
 			"integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/d3-interpolate": "*",
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/eslint": {
-			"version": "8.44.7",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz",
-			"integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==",
+			"version": "8.56.12",
+			"resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.12.tgz",
+			"integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/estree": "*",
 				"@types/json-schema": "*"
@@ -1243,30 +1457,34 @@
 		},
 		"node_modules/@types/eslint-scope": {
 			"version": "3.7.7",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
 			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/eslint": "*",
 				"@types/estree": "*"
 			}
 		},
 		"node_modules/@types/estree": {
-			"version": "0.0.51",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-			"dev": true
+			"version": "1.0.6",
+			"resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.6.tgz",
+			"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/geojson": {
 			"version": "7946.0.14",
-			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/geojson/-/geojson-7946.0.14.tgz",
 			"integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/hoist-non-react-statics": {
-			"version": "3.3.5",
-			"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
-			"integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+			"version": "3.3.6",
+			"resolved": "https://registry.npmmirror.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
+			"integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
+			"license": "MIT",
 			"dependencies": {
 				"@types/react": "*",
 				"hoist-non-react-statics": "^3.3.0"
@@ -1274,74 +1492,84 @@
 		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.15",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz",
 			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/lodash": {
-			"version": "4.17.4",
-			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
-			"integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==",
-			"dev": true
+			"version": "4.17.13",
+			"resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.13.tgz",
+			"integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "20.14.10",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
-			"integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
+			"version": "20.14.15",
+			"resolved": "https://registry.npmmirror.com/@types/node/-/node-20.14.15.tgz",
+			"integrity": "sha512-Fz1xDMCF/B00/tYSVMlmK7hVeLh7jE5f3B7X1/hmV0MJBwE27KlS7EvD/Yp+z1lm8mVhwV5w+n8jOZG8AfTlKw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"undici-types": "~5.26.4"
 			}
 		},
 		"node_modules/@types/parse-json": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
-			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
+			"resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.2.tgz",
+			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+			"license": "MIT"
 		},
 		"node_modules/@types/plotly.js": {
-			"version": "2.29.2",
-			"resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.29.2.tgz",
-			"integrity": "sha512-tJqUVa6CmNHrzTANWO/ZLNmdvjZ6zHOAnM9iQUORVnnLvWmcO9DPdQCsrNumNvHD1aqGNxQJ8pla8CK/NUiZgA==",
-			"dev": true
+			"version": "2.29.5",
+			"resolved": "https://registry.npmmirror.com/@types/plotly.js/-/plotly.js-2.29.5.tgz",
+			"integrity": "sha512-VPaCOCUTHLbtQxur7o7RqKL7/hEDtgYZcXL41o4xe9mqZ4HVxbC70j0lTsCdiVp2SI+BYsER4oPO+ck17jtnkg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/prop-types": {
-			"version": "15.7.10",
-			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz",
-			"integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A=="
+			"version": "15.7.14",
+			"resolved": "https://registry.npmmirror.com/@types/prop-types/-/prop-types-15.7.14.tgz",
+			"integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
+			"license": "MIT"
 		},
 		"node_modules/@types/react": {
-			"version": "18.3.3",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
-			"integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
+			"version": "18.3.14",
+			"resolved": "https://registry.npmmirror.com/@types/react/-/react-18.3.14.tgz",
+			"integrity": "sha512-NzahNKvjNhVjuPBQ+2G7WlxstQ+47kXZNHlUvFakDViuIEfGY926GqhMueQFZ7woG+sPiQKlF36XfrIUVSUfFg==",
+			"license": "MIT",
 			"dependencies": {
 				"@types/prop-types": "*",
 				"csstype": "^3.0.2"
 			}
 		},
 		"node_modules/@types/react-dom": {
-			"version": "18.2.24",
-			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.24.tgz",
-			"integrity": "sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==",
+			"version": "18.2.25",
+			"resolved": "https://registry.npmmirror.com/@types/react-dom/-/react-dom-18.2.25.tgz",
+			"integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==",
 			"devOptional": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/react": "*"
 			}
 		},
 		"node_modules/@types/react-plotly.js": {
 			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/@types/react-plotly.js/-/react-plotly.js-2.6.3.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/react-plotly.js/-/react-plotly.js-2.6.3.tgz",
 			"integrity": "sha512-HBQwyGuu/dGXDsWhnQrhH+xcJSsHvjkwfSRjP+YpOsCCWryIuXF78ZCBjpfgO3sCc0Jo8sYp4NOGtqT7Cn3epQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/plotly.js": "*",
 				"@types/react": "*"
 			}
 		},
 		"node_modules/@types/react-redux": {
-			"version": "7.1.30",
-			"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.30.tgz",
-			"integrity": "sha512-i2kqM6YaUwFKduamV6QM/uHbb0eCP8f8ZQ/0yWf+BsAVVsZPRYJ9eeGWZ3uxLfWwwA0SrPRMTPTqsPFkY3HZdA==",
+			"version": "7.1.34",
+			"resolved": "https://registry.npmmirror.com/@types/react-redux/-/react-redux-7.1.34.tgz",
+			"integrity": "sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/hoist-non-react-statics": "^3.3.0",
 				"@types/react": "*",
@@ -1350,24 +1578,27 @@
 			}
 		},
 		"node_modules/@types/react-transition-group": {
-			"version": "4.4.9",
-			"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.9.tgz",
-			"integrity": "sha512-ZVNmWumUIh5NhH8aMD9CR2hdW0fNuYInlocZHaZ+dgk/1K49j1w/HoAuK1ki+pgscQrOFRTlXeoURtuzEkV3dg==",
+			"version": "4.4.11",
+			"resolved": "https://registry.npmmirror.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz",
+			"integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==",
+			"license": "MIT",
 			"dependencies": {
 				"@types/react": "*"
 			}
 		},
 		"node_modules/@types/semver": {
 			"version": "7.5.8",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/semver/-/semver-7.5.8.tgz",
 			"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/superagent": {
 			"version": "4.1.13",
-			"resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.13.tgz",
+			"resolved": "https://registry.npmmirror.com/@types/superagent/-/superagent-4.1.13.tgz",
 			"integrity": "sha512-YIGelp3ZyMiH0/A09PMAORO0EBGlF5xIKfDpK74wdYvWUs2o96b5CItJcWPdH409b7SAXIIG6p8NdU/4U2Maww==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/cookiejar": "*",
 				"@types/node": "*"
@@ -1375,14 +1606,16 @@
 		},
 		"node_modules/@types/use-sync-external-store": {
 			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
-			"integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA=="
+			"resolved": "https://registry.npmmirror.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
+			"integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==",
+			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
 			"integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.5.1",
 				"@typescript-eslint/scope-manager": "6.21.0",
@@ -1415,9 +1648,10 @@
 		},
 		"node_modules/@typescript-eslint/parser": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-6.21.0.tgz",
 			"integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"@typescript-eslint/scope-manager": "6.21.0",
 				"@typescript-eslint/types": "6.21.0",
@@ -1443,9 +1677,10 @@
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
 			"integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@typescript-eslint/types": "6.21.0",
 				"@typescript-eslint/visitor-keys": "6.21.0"
@@ -1460,9 +1695,10 @@
 		},
 		"node_modules/@typescript-eslint/type-utils": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
 			"integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@typescript-eslint/typescript-estree": "6.21.0",
 				"@typescript-eslint/utils": "6.21.0",
@@ -1487,9 +1723,10 @@
 		},
 		"node_modules/@typescript-eslint/types": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.21.0.tgz",
 			"integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "^16.0.0 || >=18.0.0"
 			},
@@ -1500,9 +1737,10 @@
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
 			"integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"@typescript-eslint/types": "6.21.0",
 				"@typescript-eslint/visitor-keys": "6.21.0",
@@ -1526,35 +1764,12 @@
 				}
 			}
 		},
-		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-			"dev": true,
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-			"dev": true,
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@typescript-eslint/utils": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-6.21.0.tgz",
 			"integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
 				"@types/json-schema": "^7.0.12",
@@ -1577,9 +1792,10 @@
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
 			"integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@typescript-eslint/types": "6.21.0",
 				"eslint-visitor-keys": "^3.4.1"
@@ -1594,9 +1810,10 @@
 		},
 		"node_modules/@webassemblyjs/ast": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.1.tgz",
 			"integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/helper-numbers": "1.11.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -1604,27 +1821,31 @@
 		},
 		"node_modules/@webassemblyjs/floating-point-hex-parser": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
 			"integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-api-error": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
 			"integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
 			"integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
 			"integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/floating-point-hex-parser": "1.11.1",
 				"@webassemblyjs/helper-api-error": "1.11.1",
@@ -1633,15 +1854,17 @@
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
 			"integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
 			"integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/helper-buffer": "1.11.1",
@@ -1651,33 +1874,37 @@
 		},
 		"node_modules/@webassemblyjs/ieee754": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
 			"integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@xtuc/ieee754": "^1.2.0"
 			}
 		},
 		"node_modules/@webassemblyjs/leb128": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
 			"integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webassemblyjs/utf8": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
 			"integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
 			"integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/helper-buffer": "1.11.1",
@@ -1691,9 +1918,10 @@
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
 			"integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -1704,9 +1932,10 @@
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
 			"integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/helper-buffer": "1.11.1",
@@ -1716,9 +1945,10 @@
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
 			"integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/ast": "1.11.1",
 				"@webassemblyjs/helper-api-error": "1.11.1",
@@ -1730,9 +1960,10 @@
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
 			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
 			"integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@webassemblyjs/ast": "1.11.1",
 				"@xtuc/long": "4.2.2"
@@ -1740,9 +1971,10 @@
 		},
 		"node_modules/@webpack-cli/configtest": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
 			"integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -1753,9 +1985,10 @@
 		},
 		"node_modules/@webpack-cli/info": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@webpack-cli/info/-/info-2.0.2.tgz",
 			"integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -1766,9 +1999,10 @@
 		},
 		"node_modules/@webpack-cli/serve": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/@webpack-cli/serve/-/serve-2.0.5.tgz",
 			"integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -1784,16 +2018,18 @@
 		},
 		"node_modules/@wojtekmaj/date-utils": {
 			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/@wojtekmaj/date-utils/-/date-utils-1.5.1.tgz",
+			"resolved": "https://registry.npmmirror.com/@wojtekmaj/date-utils/-/date-utils-1.5.1.tgz",
 			"integrity": "sha512-+i7+JmNiE/3c9FKxzWFi2IjRJ+KzZl1QPu6QNrsgaa2MuBgXvUy4gA1TVzf/JMdIIloB76xSKikTWuyYAIVLww==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/date-utils?sponsor=1"
 			}
 		},
 		"node_modules/@wojtekmaj/react-daterange-picker": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/@wojtekmaj/react-daterange-picker/-/react-daterange-picker-6.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@wojtekmaj/react-daterange-picker/-/react-daterange-picker-6.0.0.tgz",
 			"integrity": "sha512-bKITvR/sjjXYXWXqQtPaJ8tPIjkuMfXOrQvVDG7q6WUnODI4FC9k7+YbctVhOnYKcg2hxTWCZ/ChJKzKpwXfzg==",
+			"license": "MIT",
 			"dependencies": {
 				"clsx": "^2.0.0",
 				"make-event-props": "^1.6.0",
@@ -1815,47 +2051,31 @@
 				}
 			}
 		},
-		"node_modules/@wojtekmaj/react-daterange-picker/node_modules/clsx": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
-			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/@xtuc/ieee754": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
 			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true
+			"dev": true,
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/@xtuc/long": {
 			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+			"resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"dev": true
-		},
-		"node_modules/abab": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-			"dev": true
-		},
-		"node_modules/abbrev": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-			"dev": true
+			"dev": true,
+			"license": "Apache-2.0"
 		},
 		"node_modules/abs-svg-path": {
 			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz",
-			"integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA=="
+			"resolved": "https://registry.npmmirror.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz",
+			"integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==",
+			"license": "MIT"
 		},
 		"node_modules/accepts": {
 			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+			"resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
 			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+			"license": "MIT",
 			"dependencies": {
 				"mime-types": "~2.1.34",
 				"negotiator": "0.6.3"
@@ -1865,10 +2085,11 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.11.2",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-			"integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+			"version": "8.14.0",
+			"resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.0.tgz",
+			"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -1878,27 +2099,31 @@
 		},
 		"node_modules/acorn-import-assertions": {
 			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+			"resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
 			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+			"deprecated": "package has been renamed to acorn-import-attributes",
 			"dev": true,
+			"license": "MIT",
 			"peerDependencies": {
 				"acorn": "^8"
 			}
 		},
 		"node_modules/acorn-jsx": {
 			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
 			"dev": true,
+			"license": "MIT",
 			"peerDependencies": {
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -1912,52 +2137,62 @@
 		},
 		"node_modules/ajv-keywords": {
 			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
 			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
 			"dev": true,
+			"license": "MIT",
 			"peerDependencies": {
 				"ajv": "^6.9.1"
 			}
 		},
 		"node_modules/almost-equal": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/almost-equal/-/almost-equal-1.1.0.tgz",
-			"integrity": "sha512-0V/PkoculFl5+0Lp47JoxUcO0xSxhIBvm+BxHdD/OgXNmdRpRHCFnKVuUoWyS9EzQP+otSGv0m9Lb4yVkQBn2A=="
+			"resolved": "https://registry.npmmirror.com/almost-equal/-/almost-equal-1.1.0.tgz",
+			"integrity": "sha512-0V/PkoculFl5+0Lp47JoxUcO0xSxhIBvm+BxHdD/OgXNmdRpRHCFnKVuUoWyS9EzQP+otSGv0m9Lb4yVkQBn2A==",
+			"license": "MIT"
 		},
 		"node_modules/ansi-colors": {
 			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.1.tgz",
 			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/ansi-regex": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
 			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"color-convert": "^1.9.0"
+				"color-convert": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
 		"node_modules/anymatch": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
 			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"normalize-path": "^3.0.0",
 				"picomatch": "^2.0.4"
@@ -1968,98 +2203,111 @@
 		},
 		"node_modules/append-field": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
-			"integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="
+			"resolved": "https://registry.npmmirror.com/append-field/-/append-field-1.0.0.tgz",
+			"integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
+			"license": "MIT"
 		},
 		"node_modules/are-docs-informative": {
 			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
 			"integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=14"
 			}
 		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz",
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"dev": true,
+			"license": "Python-2.0"
 		},
 		"node_modules/array-bounds": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array-bounds/-/array-bounds-1.0.1.tgz",
-			"integrity": "sha512-8wdW3ZGk6UjMPJx/glyEt0sLzzwAE1bhToPsO1W2pbpR2gULyxe3BjSiuJFheP50T/GgODVPz2fuMUmIywt8cQ=="
+			"resolved": "https://registry.npmmirror.com/array-bounds/-/array-bounds-1.0.1.tgz",
+			"integrity": "sha512-8wdW3ZGk6UjMPJx/glyEt0sLzzwAE1bhToPsO1W2pbpR2gULyxe3BjSiuJFheP50T/GgODVPz2fuMUmIywt8cQ==",
+			"license": "MIT"
 		},
 		"node_modules/array-find-index": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/array-find-index/-/array-find-index-1.0.2.tgz",
 			"integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/array-flatten": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+			"resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+			"license": "MIT"
 		},
 		"node_modules/array-normalize": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/array-normalize/-/array-normalize-1.1.4.tgz",
+			"resolved": "https://registry.npmmirror.com/array-normalize/-/array-normalize-1.1.4.tgz",
 			"integrity": "sha512-fCp0wKFLjvSPmCn4F5Tiw4M3lpMZoHlCjfcs7nNzuj3vqQQ1/a8cgB9DXcpDSn18c+coLnaW7rqfcYCvKbyJXg==",
+			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.0"
 			}
 		},
 		"node_modules/array-range": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array-range/-/array-range-1.0.1.tgz",
-			"integrity": "sha512-shdaI1zT3CVNL2hnx9c0JMc0ZogGaxDs5e85akgHWKYa0yVbIyp06Ind3dVkTj/uuFrzaHBOyqFzo+VV6aXgtA=="
+			"resolved": "https://registry.npmmirror.com/array-range/-/array-range-1.0.1.tgz",
+			"integrity": "sha512-shdaI1zT3CVNL2hnx9c0JMc0ZogGaxDs5e85akgHWKYa0yVbIyp06Ind3dVkTj/uuFrzaHBOyqFzo+VV6aXgtA==",
+			"license": "MIT"
 		},
 		"node_modules/array-rearrange": {
 			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/array-rearrange/-/array-rearrange-2.2.2.tgz",
-			"integrity": "sha512-UfobP5N12Qm4Qu4fwLDIi2v6+wZsSf6snYSxAMeKhrh37YGnNWZPRmVEKc/2wfms53TLQnzfpG8wCx2Y/6NG1w=="
+			"resolved": "https://registry.npmmirror.com/array-rearrange/-/array-rearrange-2.2.2.tgz",
+			"integrity": "sha512-UfobP5N12Qm4Qu4fwLDIi2v6+wZsSf6snYSxAMeKhrh37YGnNWZPRmVEKc/2wfms53TLQnzfpG8wCx2Y/6NG1w==",
+			"license": "MIT"
 		},
 		"node_modules/array-union": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz",
 			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/asap": {
 			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/asap/-/asap-2.0.6.tgz",
 			"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/asn1.js": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+			"version": "4.10.1",
+			"resolved": "https://registry.npmmirror.com/asn1.js/-/asn1.js-4.10.1.tgz",
+			"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.0.0",
 				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"safer-buffer": "^2.1.0"
+				"minimalistic-assert": "^1.0.0"
 			}
 		},
 		"node_modules/asn1.js/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true
+			"version": "4.12.1",
+			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/assert": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/assert/-/assert-2.1.0.tgz",
 			"integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"is-nan": "^1.3.2",
@@ -2070,31 +2318,38 @@
 		},
 		"node_modules/assert-options": {
 			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.8.1.tgz",
+			"resolved": "https://registry.npmmirror.com/assert-options/-/assert-options-0.8.1.tgz",
 			"integrity": "sha512-5lNGRB5g5i2bGIzb+J1QQE1iKU/WEMVBReFIc5pPDWjcPj23otPL0eI6PB2v7QPi0qU6Mhym5D3y0ZiSIOf3GA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
 		"node_modules/assertion-error": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/assertion-error/-/assertion-error-1.1.0.tgz",
 			"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/asynckit": {
 			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+			"resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+			"license": "MIT"
 		},
 		"node_modules/available-typed-arrays": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+			"integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"possible-typed-array-names": "^1.0.0"
+			},
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -2103,19 +2358,21 @@
 			}
 		},
 		"node_modules/axios": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-			"integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+			"version": "1.6.8",
+			"resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.8.tgz",
+			"integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+			"license": "MIT",
 			"dependencies": {
-				"follow-redirects": "^1.15.0",
+				"follow-redirects": "^1.15.6",
 				"form-data": "^4.0.0",
 				"proxy-from-env": "^1.1.0"
 			}
 		},
 		"node_modules/babel-plugin-macros": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
 			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.12.5",
 				"cosmiconfig": "^7.0.0",
@@ -2128,21 +2385,23 @@
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/base64-arraybuffer": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
 			"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6.0"
 			}
 		},
 		"node_modules/base64-js": {
 			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
 			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
 			"dev": true,
 			"funding": [
@@ -2158,12 +2417,14 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			]
+			],
+			"license": "MIT"
 		},
 		"node_modules/basic-auth": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/basic-auth/-/basic-auth-2.0.1.tgz",
 			"integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "5.1.2"
 			},
@@ -2173,89 +2434,69 @@
 		},
 		"node_modules/basic-auth/node_modules/safe-buffer": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"license": "MIT"
 		},
 		"node_modules/bcryptjs": {
 			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
-			"integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="
+			"resolved": "https://registry.npmmirror.com/bcryptjs/-/bcryptjs-2.4.3.tgz",
+			"integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==",
+			"license": "MIT"
 		},
 		"node_modules/binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/binary-search-bounds": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz",
-			"integrity": "sha512-H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA=="
+			"resolved": "https://registry.npmmirror.com/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz",
+			"integrity": "sha512-H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA==",
+			"license": "MIT"
 		},
 		"node_modules/bit-twiddle": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bit-twiddle/-/bit-twiddle-1.0.2.tgz",
-			"integrity": "sha512-B9UhK0DKFZhoTFcfvAzhqsjStvGJp9vYWf3+6SNTtdSQnvIgfkHbgHrg/e4+TH71N2GDu8tpmCVoyfrL1d7ntA=="
+			"resolved": "https://registry.npmmirror.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz",
+			"integrity": "sha512-B9UhK0DKFZhoTFcfvAzhqsjStvGJp9vYWf3+6SNTtdSQnvIgfkHbgHrg/e4+TH71N2GDu8tpmCVoyfrL1d7ntA==",
+			"license": "MIT"
 		},
 		"node_modules/bitmap-sdf": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/bitmap-sdf/-/bitmap-sdf-1.0.4.tgz",
-			"integrity": "sha512-1G3U4n5JE6RAiALMxu0p1XmeZkTeCwGKykzsLTCqVzfSDaN6S7fKnkIkfejogz+iwqBWc0UYAIKnKHNN7pSfDg=="
+			"resolved": "https://registry.npmmirror.com/bitmap-sdf/-/bitmap-sdf-1.0.4.tgz",
+			"integrity": "sha512-1G3U4n5JE6RAiALMxu0p1XmeZkTeCwGKykzsLTCqVzfSDaN6S7fKnkIkfejogz+iwqBWc0UYAIKnKHNN7pSfDg==",
+			"license": "MIT"
 		},
 		"node_modules/bl": {
 			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/bl/-/bl-2.2.1.tgz",
 			"integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
+			"license": "MIT",
 			"dependencies": {
 				"readable-stream": "^2.3.5",
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"node_modules/bl/node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-		},
-		"node_modules/bl/node_modules/readable-stream": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"node_modules/bl/node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
-		"node_modules/bl/node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
 		"node_modules/bn.js": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-5.2.1.tgz",
 			"integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/body-parser": {
-			"version": "1.20.2",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-			"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+			"version": "1.20.3",
+			"resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.3.tgz",
+			"integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+			"license": "MIT",
 			"dependencies": {
 				"bytes": "3.1.2",
 				"content-type": "~1.0.5",
@@ -2265,7 +2506,7 @@
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"on-finished": "2.4.1",
-				"qs": "6.11.0",
+				"qs": "6.13.0",
 				"raw-body": "2.5.2",
 				"type-is": "~1.6.18",
 				"unpipe": "1.0.0"
@@ -2277,20 +2518,22 @@
 		},
 		"node_modules/body-parser/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/body-parser/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/bootstrap": {
 			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+			"resolved": "https://registry.npmmirror.com/bootstrap/-/bootstrap-5.3.3.tgz",
 			"integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
 			"funding": [
 				{
@@ -2302,25 +2545,27 @@
 					"url": "https://opencollective.com/bootstrap"
 				}
 			],
+			"license": "MIT",
 			"peerDependencies": {
 				"@popperjs/core": "^2.11.8"
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
+				"balanced-match": "^1.0.0"
 			}
 		},
 		"node_modules/braces": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
 			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"fill-range": "^7.1.1"
 			},
@@ -2330,21 +2575,24 @@
 		},
 		"node_modules/brorand": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/brorand/-/brorand-1.1.0.tgz",
 			"integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/browser-stdout": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/browser-stdout/-/browser-stdout-1.3.1.tgz",
 			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/browserify-aes": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/browserify-aes/-/browserify-aes-1.2.0.tgz",
 			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"buffer-xor": "^1.0.3",
 				"cipher-base": "^1.0.0",
@@ -2356,9 +2604,10 @@
 		},
 		"node_modules/browserify-cipher": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
 			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"browserify-aes": "^1.0.4",
 				"browserify-des": "^1.0.0",
@@ -2367,9 +2616,10 @@
 		},
 		"node_modules/browserify-des": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/browserify-des/-/browserify-des-1.0.2.tgz",
 			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"cipher-base": "^1.0.1",
 				"des.js": "^1.0.0",
@@ -2378,62 +2628,56 @@
 			}
 		},
 		"node_modules/browserify-rsa": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmmirror.com/browserify-rsa/-/browserify-rsa-4.1.1.tgz",
+			"integrity": "sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"bn.js": "^5.0.0",
-				"randombytes": "^2.0.1"
+				"bn.js": "^5.2.1",
+				"randombytes": "^2.1.0",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/browserify-sign": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
-			"integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+			"version": "4.2.3",
+			"resolved": "https://registry.npmmirror.com/browserify-sign/-/browserify-sign-4.2.3.tgz",
+			"integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"bn.js": "^5.2.1",
 				"browserify-rsa": "^4.1.0",
 				"create-hash": "^1.2.0",
 				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.4",
+				"elliptic": "^6.5.5",
+				"hash-base": "~3.0",
 				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.6",
-				"readable-stream": "^3.6.2",
+				"parse-asn1": "^5.1.7",
+				"readable-stream": "^2.3.8",
 				"safe-buffer": "^5.2.1"
 			},
 			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/browserify-sign/node_modules/readable-stream": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
+				"node": ">= 0.12"
 			}
 		},
 		"node_modules/browserify-zlib": {
 			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
 			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"pako": "~1.0.5"
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.23.0",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+			"version": "4.24.2",
+			"resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.24.2.tgz",
+			"integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
 			"dev": true,
 			"funding": [
 				{
@@ -2449,11 +2693,12 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001587",
-				"electron-to-chromium": "^1.4.668",
-				"node-releases": "^2.0.14",
-				"update-browserslist-db": "^1.0.13"
+				"caniuse-lite": "^1.0.30001669",
+				"electron-to-chromium": "^1.5.41",
+				"node-releases": "^2.0.18",
+				"update-browserslist-db": "^1.1.1"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -2464,7 +2709,7 @@
 		},
 		"node_modules/buffer": {
 			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz",
 			"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
 			"dev": true,
 			"funding": [
@@ -2481,6 +2726,7 @@
 					"url": "https://feross.org/support"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
 				"base64-js": "^1.3.1",
 				"ieee754": "^1.2.1"
@@ -2488,41 +2734,33 @@
 		},
 		"node_modules/buffer-equal-constant-time": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+			"resolved": "https://registry.npmmirror.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/buffer-from": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+			"resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"license": "MIT"
 		},
 		"node_modules/buffer-xor": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/buffer-xor/-/buffer-xor-1.0.3.tgz",
 			"integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-			"dev": true
-		},
-		"node_modules/builtin-modules": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
 			"dev": true,
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
+			"license": "MIT"
 		},
 		"node_modules/builtin-status-codes": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
 			"integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/busboy": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
+			"resolved": "https://registry.npmmirror.com/busboy/-/busboy-1.6.0.tgz",
 			"integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
 			"dependencies": {
 				"streamsearch": "^1.1.0"
@@ -2533,22 +2771,23 @@
 		},
 		"node_modules/bytes": {
 			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
 			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+			"version": "1.0.8",
+			"resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz",
+			"integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+			"license": "MIT",
 			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.0",
 				"es-define-property": "^1.0.0",
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2",
 				"get-intrinsic": "^1.2.4",
-				"set-function-length": "^1.2.1"
+				"set-function-length": "^1.2.2"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -2557,19 +2796,34 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/call-bind-apply-helpers": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.0.tgz",
+			"integrity": "sha512-CCKAP2tkPau7D3GE8+V8R6sQubA9R5foIzGp+85EXCVSCivuxBNAWqcpn72PKYiIcqoViv/kcUDpaEIMBVi1lQ==",
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/callsites": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
 			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/camelcase": {
 			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
 			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -2578,9 +2832,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001621",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz",
-			"integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==",
+			"version": "1.0.30001686",
+			"resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz",
+			"integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==",
 			"dev": true,
 			"funding": [
 				{
@@ -2595,21 +2849,24 @@
 					"type": "github",
 					"url": "https://github.com/sponsors/ai"
 				}
-			]
+			],
+			"license": "CC-BY-4.0"
 		},
 		"node_modules/canvas-fit": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/canvas-fit/-/canvas-fit-1.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/canvas-fit/-/canvas-fit-1.5.0.tgz",
 			"integrity": "sha512-onIcjRpz69/Hx5bB5HGbYKUF2uC6QT6Gp+pfpGm3A7mPfcluSLV5v4Zu+oflDUwLdUw0rLIBhUbi0v8hM4FJQQ==",
+			"license": "MIT",
 			"dependencies": {
 				"element-size": "^1.1.1"
 			}
 		},
 		"node_modules/chai": {
 			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/chai/-/chai-4.4.1.tgz",
 			"integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"assertion-error": "^1.1.0",
 				"check-error": "^1.0.3",
@@ -2624,22 +2881,24 @@
 			}
 		},
 		"node_modules/chai-as-promised": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
-			"integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmmirror.com/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
+			"integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
 			"dev": true,
+			"license": "WTFPL",
 			"dependencies": {
 				"check-error": "^1.0.2"
 			},
 			"peerDependencies": {
-				"chai": ">= 2.1.2 < 5"
+				"chai": ">= 2.1.2 < 6"
 			}
 		},
 		"node_modules/chai-http": {
 			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/chai-http/-/chai-http-4.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/chai-http/-/chai-http-4.4.0.tgz",
 			"integrity": "sha512-uswN3rZpawlRaa5NiDUHcDZ3v2dw5QgLyAwnQ2tnVNuP7CwIsOFuYJ0xR1WiR7ymD4roBnJIzOUep7w9jQMFJA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/chai": "4",
 				"@types/superagent": "4.1.13",
@@ -2654,56 +2913,48 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/chai-http/node_modules/qs": {
-			"version": "6.12.1",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
-			"integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
+		"node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"side-channel": "^1.0.6"
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			},
 			"engines": {
-				"node": ">=0.6"
+				"node": ">=10"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
 		"node_modules/charenc": {
 			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz",
 			"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/charset": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/charset/-/charset-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/charset/-/charset-1.0.1.tgz",
 			"integrity": "sha512-6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=4.0.0"
 			}
 		},
 		"node_modules/check-error": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/check-error/-/check-error-1.0.3.tgz",
 			"integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"get-func-name": "^2.0.2"
 			},
@@ -2713,7 +2964,7 @@
 		},
 		"node_modules/chokidar": {
 			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+			"resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
 			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
 			"dev": true,
 			"funding": [
@@ -2722,6 +2973,7 @@
 					"url": "https://paulmillr.com/funding/"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
 				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
@@ -2740,9 +2992,10 @@
 		},
 		"node_modules/chokidar/node_modules/glob-parent": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -2751,39 +3004,47 @@
 			}
 		},
 		"node_modules/chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.0"
 			}
 		},
 		"node_modules/cipher-base": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmmirror.com/cipher-base/-/cipher-base-1.0.6.tgz",
+			"integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+				"inherits": "^2.0.4",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/clamp": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
-			"integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
+			"resolved": "https://registry.npmmirror.com/clamp/-/clamp-1.0.1.tgz",
+			"integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==",
+			"license": "MIT"
 		},
 		"node_modules/classnames": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-			"integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
+			"version": "2.5.1",
+			"resolved": "https://registry.npmmirror.com/classnames/-/classnames-2.5.1.tgz",
+			"integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
+			"license": "MIT"
 		},
 		"node_modules/cliui": {
 			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz",
 			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"string-width": "^4.2.0",
 				"strip-ansi": "^6.0.0",
@@ -2792,9 +3053,10 @@
 		},
 		"node_modules/clone-deep": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz",
 			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"is-plain-object": "^2.0.4",
 				"kind-of": "^6.0.2",
@@ -2805,46 +3067,56 @@
 			}
 		},
 		"node_modules/clsx": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-			"integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmmirror.com/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/color-alpha": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/color-alpha/-/color-alpha-1.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/color-alpha/-/color-alpha-1.0.4.tgz",
 			"integrity": "sha512-lr8/t5NPozTSqli+duAN+x+no/2WaKTeWvxhHGN+aXT6AJ8vPlzLa7UriyjWak0pSC2jHol9JgjBYnnHsGha9A==",
+			"license": "MIT",
 			"dependencies": {
 				"color-parse": "^1.3.8"
 			}
 		},
 		"node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"color-name": "1.1.3"
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
 		"node_modules/color-id": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/color-id/-/color-id-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/color-id/-/color-id-1.1.0.tgz",
 			"integrity": "sha512-2iRtAn6dC/6/G7bBIo0uupVrIne1NsQJvJxZOBCzQOfk7jRq97feaDZ3RdzuHakRXXnHGNwglto3pqtRx1sX0g==",
+			"license": "MIT",
 			"dependencies": {
 				"clamp": "^1.0.1"
 			}
 		},
 		"node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+			"version": "1.1.4",
+			"resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"license": "MIT"
 		},
 		"node_modules/color-normalize": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/color-normalize/-/color-normalize-1.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/color-normalize/-/color-normalize-1.5.0.tgz",
 			"integrity": "sha512-rUT/HDXMr6RFffrR53oX3HGWkDOP9goSAQGBkUaAYKjOE2JxozccdGyufageWDlInRAjm/jYPrf/Y38oa+7obw==",
+			"license": "MIT",
 			"dependencies": {
 				"clamp": "^1.0.1",
 				"color-rgba": "^2.1.1",
@@ -2853,8 +3125,9 @@
 		},
 		"node_modules/color-parse": {
 			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/color-parse/-/color-parse-1.3.8.tgz",
+			"resolved": "https://registry.npmmirror.com/color-parse/-/color-parse-1.3.8.tgz",
 			"integrity": "sha512-1Y79qFv0n1xair3lNMTNeoFvmc3nirMVBij24zbs1f13+7fPpQClMg5b4AuKXLt3szj7BRlHMCXHplkce6XlmA==",
+			"license": "MIT",
 			"dependencies": {
 				"color-name": "^1.0.0",
 				"defined": "^1.0.0",
@@ -2863,8 +3136,9 @@
 		},
 		"node_modules/color-rgba": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/color-rgba/-/color-rgba-2.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/color-rgba/-/color-rgba-2.1.1.tgz",
 			"integrity": "sha512-VaX97wsqrMwLSOR6H7rU1Doa2zyVdmShabKrPEIFywLlHoibgD3QW9Dw6fSqM4+H/LfjprDNAUUW31qEQcGzNw==",
+			"license": "MIT",
 			"dependencies": {
 				"clamp": "^1.0.1",
 				"color-parse": "^1.3.8",
@@ -2873,8 +3147,9 @@
 		},
 		"node_modules/color-space": {
 			"version": "1.16.0",
-			"resolved": "https://registry.npmjs.org/color-space/-/color-space-1.16.0.tgz",
+			"resolved": "https://registry.npmmirror.com/color-space/-/color-space-1.16.0.tgz",
 			"integrity": "sha512-A6WMiFzunQ8KEPFmj02OnnoUnqhmSaHaZ/0LVFcPTdlvm8+3aMJ5x1HRHy3bDHPkovkf4sS0f4wsVvwk71fKkg==",
+			"license": "MIT",
 			"dependencies": {
 				"hsluv": "^0.0.3",
 				"mumath": "^3.3.4"
@@ -2882,14 +3157,16 @@
 		},
 		"node_modules/colorette": {
 			"version": "2.0.20",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+			"resolved": "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz",
 			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"license": "MIT",
 			"dependencies": {
 				"delayed-stream": "~1.0.0"
 			},
@@ -2898,41 +3175,49 @@
 			}
 		},
 		"node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+			"version": "7.2.0",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 10"
+			}
 		},
 		"node_modules/comment-parser": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/comment-parser/-/comment-parser-1.4.1.tgz",
 			"integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 12.0.0"
 			}
 		},
 		"node_modules/component-emitter": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz",
 			"integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
 			"dev": true,
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
 			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/concat-stream": {
 			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+			"resolved": "https://registry.npmmirror.com/concat-stream/-/concat-stream-1.6.2.tgz",
 			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
 			"engines": [
 				"node >= 0.8"
 			],
+			"license": "MIT",
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"inherits": "^2.0.3",
@@ -2940,54 +3225,24 @@
 				"typedarray": "^0.0.6"
 			}
 		},
-		"node_modules/concat-stream/node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-		},
-		"node_modules/concat-stream/node_modules/readable-stream": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"node_modules/concat-stream/node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
-		"node_modules/concat-stream/node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
-		"node_modules/console-browserify": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-			"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-			"dev": true
+		"node_modules/console-browserify": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmmirror.com/console-browserify/-/console-browserify-1.2.0.tgz",
+			"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+			"dev": true
 		},
 		"node_modules/constants-browserify": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/constants-browserify/-/constants-browserify-1.0.0.tgz",
 			"integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/content-disposition": {
 			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+			"resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
 			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "5.2.1"
 			},
@@ -2997,45 +3252,52 @@
 		},
 		"node_modules/content-type": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
 			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/convert-source-map": {
 			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+			"resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+			"license": "MIT"
 		},
 		"node_modules/cookie": {
 			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+			"resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.6.0.tgz",
 			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/cookie-signature": {
 			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+			"resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+			"license": "MIT"
 		},
 		"node_modules/cookiejar": {
 			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+			"resolved": "https://registry.npmmirror.com/cookiejar/-/cookiejar-2.1.4.tgz",
 			"integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/core-util-is": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+			"resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+			"license": "MIT"
 		},
 		"node_modules/cosmiconfig": {
 			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
 			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+			"license": "MIT",
 			"dependencies": {
 				"@types/parse-json": "^4.0.0",
 				"import-fresh": "^3.2.1",
@@ -3049,30 +3311,34 @@
 		},
 		"node_modules/country-regex": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/country-regex/-/country-regex-1.1.0.tgz",
-			"integrity": "sha512-iSPlClZP8vX7MC3/u6s3lrDuoQyhQukh5LyABJ3hvfzbQ3Yyayd4fp04zjLnfi267B/B2FkumcWWgrbban7sSA=="
+			"resolved": "https://registry.npmmirror.com/country-regex/-/country-regex-1.1.0.tgz",
+			"integrity": "sha512-iSPlClZP8vX7MC3/u6s3lrDuoQyhQukh5LyABJ3hvfzbQ3Yyayd4fp04zjLnfi267B/B2FkumcWWgrbban7sSA==",
+			"license": "MIT"
 		},
 		"node_modules/create-ecdh": {
 			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz",
 			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.1.0",
 				"elliptic": "^6.5.3"
 			}
 		},
 		"node_modules/create-ecdh/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true
+			"version": "4.12.1",
+			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/create-hash": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/create-hash/-/create-hash-1.2.0.tgz",
 			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"cipher-base": "^1.0.1",
 				"inherits": "^2.0.1",
@@ -3083,9 +3349,10 @@
 		},
 		"node_modules/create-hmac": {
 			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+			"resolved": "https://registry.npmmirror.com/create-hmac/-/create-hmac-1.1.7.tgz",
 			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"cipher-base": "^1.0.3",
 				"create-hash": "^1.1.0",
@@ -3096,10 +3363,11 @@
 			}
 		},
 		"node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"version": "7.0.6",
+			"resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz",
+			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -3111,38 +3379,45 @@
 		},
 		"node_modules/crypt": {
 			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz",
 			"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/crypto-browserify": {
-			"version": "3.12.0",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+			"version": "3.12.1",
+			"resolved": "https://registry.npmmirror.com/crypto-browserify/-/crypto-browserify-3.12.1.tgz",
+			"integrity": "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserify-cipher": "^1.0.0",
-				"browserify-sign": "^4.0.0",
-				"create-ecdh": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"create-hmac": "^1.1.0",
-				"diffie-hellman": "^5.0.0",
-				"inherits": "^2.0.1",
-				"pbkdf2": "^3.0.3",
-				"public-encrypt": "^4.0.0",
-				"randombytes": "^2.0.0",
-				"randomfill": "^1.0.3"
+				"browserify-cipher": "^1.0.1",
+				"browserify-sign": "^4.2.3",
+				"create-ecdh": "^4.0.4",
+				"create-hash": "^1.2.0",
+				"create-hmac": "^1.1.7",
+				"diffie-hellman": "^5.0.3",
+				"hash-base": "~3.0.4",
+				"inherits": "^2.0.4",
+				"pbkdf2": "^3.1.2",
+				"public-encrypt": "^4.0.3",
+				"randombytes": "^2.1.0",
+				"randomfill": "^1.0.4"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">= 0.10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/css-font": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/css-font/-/css-font-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/css-font/-/css-font-1.2.0.tgz",
 			"integrity": "sha512-V4U4Wps4dPDACJ4WpgofJ2RT5Yqwe1lEH6wlOOaIxMi0gTjdIijsc5FmxQlZ7ZZyKQkkutqqvULOp07l9c7ssA==",
+			"license": "MIT",
 			"dependencies": {
 				"css-font-size-keywords": "^1.0.0",
 				"css-font-stretch-keywords": "^1.0.1",
@@ -3157,34 +3432,40 @@
 		},
 		"node_modules/css-font-size-keywords": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz",
-			"integrity": "sha512-Q+svMDbMlelgCfH/RVDKtTDaf5021O486ZThQPIpahnIjUkMUslC+WuOQSWTgGSrNCH08Y7tYNEmmy0hkfMI8Q=="
+			"resolved": "https://registry.npmmirror.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz",
+			"integrity": "sha512-Q+svMDbMlelgCfH/RVDKtTDaf5021O486ZThQPIpahnIjUkMUslC+WuOQSWTgGSrNCH08Y7tYNEmmy0hkfMI8Q==",
+			"license": "MIT"
 		},
 		"node_modules/css-font-stretch-keywords": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz",
-			"integrity": "sha512-KmugPO2BNqoyp9zmBIUGwt58UQSfyk1X5DbOlkb2pckDXFSAfjsD5wenb88fNrD6fvS+vu90a/tsPpb9vb0SLg=="
+			"resolved": "https://registry.npmmirror.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz",
+			"integrity": "sha512-KmugPO2BNqoyp9zmBIUGwt58UQSfyk1X5DbOlkb2pckDXFSAfjsD5wenb88fNrD6fvS+vu90a/tsPpb9vb0SLg==",
+			"license": "MIT"
 		},
 		"node_modules/css-font-style-keywords": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz",
-			"integrity": "sha512-0Fn0aTpcDktnR1RzaBYorIxQily85M2KXRpzmxQPgh8pxUN9Fcn00I8u9I3grNr1QXVgCl9T5Imx0ZwKU973Vg=="
+			"resolved": "https://registry.npmmirror.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz",
+			"integrity": "sha512-0Fn0aTpcDktnR1RzaBYorIxQily85M2KXRpzmxQPgh8pxUN9Fcn00I8u9I3grNr1QXVgCl9T5Imx0ZwKU973Vg==",
+			"license": "MIT"
 		},
 		"node_modules/css-font-weight-keywords": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz",
-			"integrity": "sha512-5So8/NH+oDD+EzsnF4iaG4ZFHQ3vaViePkL1ZbZ5iC/KrsCY+WHq/lvOgrtmuOQ9pBBZ1ADGpaf+A4lj1Z9eYA=="
+			"resolved": "https://registry.npmmirror.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz",
+			"integrity": "sha512-5So8/NH+oDD+EzsnF4iaG4ZFHQ3vaViePkL1ZbZ5iC/KrsCY+WHq/lvOgrtmuOQ9pBBZ1ADGpaf+A4lj1Z9eYA==",
+			"license": "MIT"
 		},
 		"node_modules/css-global-keywords": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/css-global-keywords/-/css-global-keywords-1.0.1.tgz",
-			"integrity": "sha512-X1xgQhkZ9n94WDwntqst5D/FKkmiU0GlJSFZSV3kLvyJ1WC5VeyoXDOuleUD+SIuH9C7W05is++0Woh0CGfKjQ=="
+			"resolved": "https://registry.npmmirror.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz",
+			"integrity": "sha512-X1xgQhkZ9n94WDwntqst5D/FKkmiU0GlJSFZSV3kLvyJ1WC5VeyoXDOuleUD+SIuH9C7W05is++0Woh0CGfKjQ==",
+			"license": "MIT"
 		},
 		"node_modules/css-loader": {
 			"version": "6.8.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
+			"resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-6.8.1.tgz",
 			"integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"icss-utils": "^5.1.0",
 				"postcss": "^8.4.21",
@@ -3208,19 +3489,22 @@
 		},
 		"node_modules/css-system-font-keywords": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz",
-			"integrity": "sha512-1umTtVd/fXS25ftfjB71eASCrYhilmEsvDEI6wG/QplnmlfmVM5HkZ/ZX46DT5K3eblFPgLUHt5BRCb0YXkSFA=="
+			"resolved": "https://registry.npmmirror.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz",
+			"integrity": "sha512-1umTtVd/fXS25ftfjB71eASCrYhilmEsvDEI6wG/QplnmlfmVM5HkZ/ZX46DT5K3eblFPgLUHt5BRCb0YXkSFA==",
+			"license": "MIT"
 		},
 		"node_modules/csscolorparser": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
-			"integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w=="
+			"resolved": "https://registry.npmmirror.com/csscolorparser/-/csscolorparser-1.0.3.tgz",
+			"integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w==",
+			"license": "MIT"
 		},
 		"node_modules/cssesc": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz",
 			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"cssesc": "bin/cssesc"
 			},
@@ -3229,14 +3513,16 @@
 			}
 		},
 		"node_modules/csstype": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+			"version": "3.1.3",
+			"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+			"license": "MIT"
 		},
 		"node_modules/csv": {
 			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/csv/-/csv-5.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/csv/-/csv-5.3.2.tgz",
 			"integrity": "sha512-odDyucr9OgJTdGM2wrMbJXbOkJx3nnUX3Pt8SFOwlAMOpsUQlz1dywvLMXJWX/4Ib0rjfOsaawuuwfI5ucqBGQ==",
+			"license": "MIT",
 			"dependencies": {
 				"csv-generate": "^3.2.4",
 				"csv-parse": "^4.8.8",
@@ -3249,32 +3535,40 @@
 		},
 		"node_modules/csv-generate": {
 			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/csv-generate/-/csv-generate-3.4.3.tgz",
-			"integrity": "sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw=="
+			"resolved": "https://registry.npmmirror.com/csv-generate/-/csv-generate-3.4.3.tgz",
+			"integrity": "sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==",
+			"license": "MIT"
 		},
 		"node_modules/csv-parse": {
 			"version": "4.16.3",
-			"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz",
-			"integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg=="
+			"resolved": "https://registry.npmmirror.com/csv-parse/-/csv-parse-4.16.3.tgz",
+			"integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==",
+			"license": "MIT"
 		},
 		"node_modules/csv-stringify": {
 			"version": "5.6.5",
-			"resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.6.5.tgz",
-			"integrity": "sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A=="
+			"resolved": "https://registry.npmmirror.com/csv-stringify/-/csv-stringify-5.6.5.tgz",
+			"integrity": "sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==",
+			"license": "MIT"
 		},
 		"node_modules/d": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-			"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/d/-/d-1.0.2.tgz",
+			"integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
+			"license": "ISC",
 			"dependencies": {
-				"es5-ext": "^0.10.50",
-				"type": "^1.0.1"
+				"es5-ext": "^0.10.64",
+				"type": "^2.7.2"
+			},
+			"engines": {
+				"node": ">=0.12"
 			}
 		},
 		"node_modules/d3": {
 			"version": "7.8.5",
-			"resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
+			"resolved": "https://registry.npmmirror.com/d3/-/d3-7.8.5.tgz",
 			"integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-array": "3",
 				"d3-axis": "3",
@@ -3312,22 +3606,31 @@
 			}
 		},
 		"node_modules/d3-array": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
-			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
+			"version": "3.2.4",
+			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-3.2.4.tgz",
+			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+			"license": "ISC",
+			"dependencies": {
+				"internmap": "1 - 2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/d3-axis": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-axis/-/d3-axis-3.0.0.tgz",
 			"integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-brush": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-brush/-/d3-brush-3.0.0.tgz",
 			"integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-dispatch": "1 - 3",
 				"d3-drag": "2 - 3",
@@ -3341,8 +3644,9 @@
 		},
 		"node_modules/d3-chord": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-chord/-/d3-chord-3.0.1.tgz",
 			"integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-path": "1 - 3"
 			},
@@ -3352,21 +3656,24 @@
 		},
 		"node_modules/d3-collection": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
-			"integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
+			"resolved": "https://registry.npmmirror.com/d3-collection/-/d3-collection-1.0.7.tgz",
+			"integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/d3-color": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-color/-/d3-color-3.1.0.tgz",
 			"integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-contour": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-contour/-/d3-contour-4.0.2.tgz",
 			"integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-array": "^3.2.0"
 			},
@@ -3374,21 +3681,11 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-contour/node_modules/d3-array": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
-			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-			"dependencies": {
-				"internmap": "1 - 2"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/d3-delaunay": {
 			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
 			"integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+			"license": "ISC",
 			"dependencies": {
 				"delaunator": "5"
 			},
@@ -3397,14 +3694,19 @@
 			}
 		},
 		"node_modules/d3-dispatch": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
-			"integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
+			"version": "3.0.1",
+			"resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+			"integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/d3-drag": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-drag/-/d3-drag-3.0.0.tgz",
 			"integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-dispatch": "1 - 3",
 				"d3-selection": "3"
@@ -3415,8 +3717,9 @@
 		},
 		"node_modules/d3-dsv": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-dsv/-/d3-dsv-3.0.1.tgz",
 			"integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+			"license": "ISC",
 			"dependencies": {
 				"commander": "7",
 				"iconv-lite": "0.6",
@@ -3437,18 +3740,11 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-dsv/node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"engines": {
-				"node": ">= 10"
-			}
-		},
 		"node_modules/d3-dsv/node_modules/iconv-lite": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
 			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"license": "MIT",
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3.0.0"
 			},
@@ -3458,16 +3754,18 @@
 		},
 		"node_modules/d3-ease": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-ease/-/d3-ease-3.0.1.tgz",
 			"integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-fetch": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-fetch/-/d3-fetch-3.0.1.tgz",
 			"integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-dsv": "1 - 3"
 			},
@@ -3476,33 +3774,45 @@
 			}
 		},
 		"node_modules/d3-force": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
-			"integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/d3-force/-/d3-force-3.0.0.tgz",
+			"integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+			"license": "ISC",
 			"dependencies": {
-				"d3-collection": "1",
-				"d3-dispatch": "1",
-				"d3-quadtree": "1",
-				"d3-timer": "1"
+				"d3-dispatch": "1 - 3",
+				"d3-quadtree": "1 - 3",
+				"d3-timer": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
 		"node_modules/d3-format": {
-			"version": "1.4.5",
-			"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
-			"integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
+			"version": "3.1.0",
+			"resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-3.1.0.tgz",
+			"integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/d3-geo": {
-			"version": "1.12.1",
-			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
-			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-3.1.1.tgz",
+			"integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+			"license": "ISC",
 			"dependencies": {
-				"d3-array": "1"
+				"d3-array": "2.5.0 - 3"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
 		"node_modules/d3-geo-projection": {
 			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.9.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-geo-projection/-/d3-geo-projection-2.9.0.tgz",
 			"integrity": "sha512-ZULvK/zBn87of5rWAfFMc9mJOipeSo57O+BBitsKIXmU4rTVAnX1kSsJkE0R+TxY8pGNoM1nbyRRE7GYHhdOEQ==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"commander": "2",
 				"d3-array": "1",
@@ -3517,15 +3827,41 @@
 				"geostitch": "bin/geostitch"
 			}
 		},
+		"node_modules/d3-geo-projection/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"license": "MIT"
+		},
+		"node_modules/d3-geo-projection/node_modules/d3-array": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
+			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/d3-geo-projection/node_modules/d3-geo": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-1.12.1.tgz",
+			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-array": "1"
+			}
+		},
 		"node_modules/d3-hierarchy": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
-			"integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
+			"version": "3.1.2",
+			"resolved": "https://registry.npmmirror.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+			"integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/d3-interpolate": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
 			"integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-color": "1 - 3"
 			},
@@ -3534,35 +3870,46 @@
 			}
 		},
 		"node_modules/d3-path": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
-			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
+			"version": "3.1.0",
+			"resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-3.1.0.tgz",
+			"integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/d3-polygon": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-polygon/-/d3-polygon-3.0.1.tgz",
 			"integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-quadtree": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
-			"integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
+			"version": "3.0.1",
+			"resolved": "https://registry.npmmirror.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+			"integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/d3-random": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-random/-/d3-random-3.0.1.tgz",
 			"integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-scale": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-scale/-/d3-scale-4.0.2.tgz",
 			"integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-array": "2.10.0 - 3",
 				"d3-format": "1 - 3",
@@ -3576,8 +3923,9 @@
 		},
 		"node_modules/d3-scale-chromatic": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
 			"integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-color": "1 - 3",
 				"d3-interpolate": "1 - 3"
@@ -3586,21 +3934,32 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-scale/node_modules/d3-array": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
-			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+		"node_modules/d3-selection": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
+			"integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-shape": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-3.2.0.tgz",
+			"integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+			"license": "ISC",
 			"dependencies": {
-				"internmap": "1 - 2"
+				"d3-path": "^3.1.0"
 			},
 			"engines": {
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-scale/node_modules/d3-time": {
+		"node_modules/d3-time": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-3.1.0.tgz",
 			"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-array": "2 - 3"
 			},
@@ -3608,44 +3967,32 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-selection": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
-			"integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3-shape": {
-			"version": "1.3.7",
-			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
-			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
-			"dependencies": {
-				"d3-path": "1"
-			}
-		},
-		"node_modules/d3-time": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
-			"integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
-		},
 		"node_modules/d3-time-format": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
-			"integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-4.1.0.tgz",
+			"integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+			"license": "ISC",
 			"dependencies": {
-				"d3-time": "1"
+				"d3-time": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
 		"node_modules/d3-timer": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
-			"integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
+			"version": "3.0.1",
+			"resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-3.0.1.tgz",
+			"integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
 		},
 		"node_modules/d3-transition": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-transition/-/d3-transition-3.0.1.tgz",
 			"integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-color": "1 - 3",
 				"d3-dispatch": "1 - 3",
@@ -3662,8 +4009,9 @@
 		},
 		"node_modules/d3-zoom": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/d3-zoom/-/d3-zoom-3.0.0.tgz",
 			"integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+			"license": "ISC",
 			"dependencies": {
 				"d3-dispatch": "1 - 3",
 				"d3-drag": "2 - 3",
@@ -3675,129 +4023,13 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3/node_modules/d3-array": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
-			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-			"dependencies": {
-				"internmap": "1 - 2"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-dispatch": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-			"integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-force": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
-			"integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-			"dependencies": {
-				"d3-dispatch": "1 - 3",
-				"d3-quadtree": "1 - 3",
-				"d3-timer": "1 - 3"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-format": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-			"integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-geo": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
-			"integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
-			"dependencies": {
-				"d3-array": "2.5.0 - 3"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-hierarchy": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-			"integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-path": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
-			"integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-quadtree": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-			"integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-shape": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
-			"integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-			"dependencies": {
-				"d3-path": "^3.1.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-time": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-			"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-			"dependencies": {
-				"d3-array": "2 - 3"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-time-format": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-			"integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-			"dependencies": {
-				"d3-time": "1 - 3"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3/node_modules/d3-timer": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-			"integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-			"dev": true,
+			"version": "4.3.7",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
+			"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+			"license": "MIT",
 			"dependencies": {
-				"ms": "2.1.2"
+				"ms": "^2.1.3"
 			},
 			"engines": {
 				"node": ">=6.0"
@@ -3810,9 +4042,10 @@
 		},
 		"node_modules/decamelize": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-4.0.0.tgz",
 			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -3822,17 +4055,19 @@
 		},
 		"node_modules/decode-uri-component": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
 			"integrity": "sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
 			}
 		},
 		"node_modules/deep-eql": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-			"integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+			"version": "4.1.4",
+			"resolved": "https://registry.npmmirror.com/deep-eql/-/deep-eql-4.1.4.tgz",
+			"integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"type-detect": "^4.0.0"
 			},
@@ -3842,13 +4077,16 @@
 		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+			"resolved": "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/define-data-property": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz",
 			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+			"license": "MIT",
 			"dependencies": {
 				"es-define-property": "^1.0.0",
 				"es-errors": "^1.3.0",
@@ -3863,9 +4101,10 @@
 		},
 		"node_modules/define-properties": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz",
 			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"define-data-property": "^1.0.1",
 				"has-property-descriptors": "^1.0.0",
@@ -3880,41 +4119,46 @@
 		},
 		"node_modules/defined": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/defined/-/defined-1.0.1.tgz",
 			"integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/delaunator": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/delaunator/-/delaunator-5.0.1.tgz",
 			"integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+			"license": "ISC",
 			"dependencies": {
 				"robust-predicates": "^3.0.2"
 			}
 		},
 		"node_modules/delayed-stream": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
 			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.4.0"
 			}
 		},
 		"node_modules/depd": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
 			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/des.js": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/des.js/-/des.js-1.1.0.tgz",
 			"integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"minimalistic-assert": "^1.0.0"
@@ -3922,8 +4166,9 @@
 		},
 		"node_modules/destroy": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
 			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8",
 				"npm": "1.2.8000 || >= 1.4.16"
@@ -3931,22 +4176,25 @@
 		},
 		"node_modules/detect-element-overflow": {
 			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/detect-element-overflow/-/detect-element-overflow-1.4.2.tgz",
+			"resolved": "https://registry.npmmirror.com/detect-element-overflow/-/detect-element-overflow-1.4.2.tgz",
 			"integrity": "sha512-4m6cVOtvm/GJLjo7WFkPfwXoEIIbM7GQwIh4WEa4g7IsNi1YzwUsGL5ApNLrrHL29bHeNeQ+/iZhw+YHqgE2Fw==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/detect-element-overflow?sponsor=1"
 			}
 		},
 		"node_modules/detect-kerning": {
 			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/detect-kerning/-/detect-kerning-2.1.2.tgz",
-			"integrity": "sha512-I3JIbrnKPAntNLl1I6TpSQQdQ4AutYzv/sKMFKbepawV/hlH0GmYKhUoOEMd4xqaUHT+Bm0f4127lh5qs1m1tw=="
+			"resolved": "https://registry.npmmirror.com/detect-kerning/-/detect-kerning-2.1.2.tgz",
+			"integrity": "sha512-I3JIbrnKPAntNLl1I6TpSQQdQ4AutYzv/sKMFKbepawV/hlH0GmYKhUoOEMd4xqaUHT+Bm0f4127lh5qs1m1tw==",
+			"license": "MIT"
 		},
 		"node_modules/dezalgo": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/dezalgo/-/dezalgo-1.0.4.tgz",
 			"integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"asap": "^2.0.0",
 				"wrappy": "1"
@@ -3954,18 +4202,20 @@
 		},
 		"node_modules/diff": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/diff/-/diff-5.0.0.tgz",
 			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.3.1"
 			}
 		},
 		"node_modules/diffie-hellman": {
 			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
 			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.1.0",
 				"miller-rabin": "^4.0.0",
@@ -3973,16 +4223,18 @@
 			}
 		},
 		"node_modules/diffie-hellman/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true
+			"version": "4.12.1",
+			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/dir-glob": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz",
 			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"path-type": "^4.0.0"
 			},
@@ -3992,9 +4244,10 @@
 		},
 		"node_modules/doctrine": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz",
 			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
 				"esutils": "^2.0.2"
 			},
@@ -4004,8 +4257,9 @@
 		},
 		"node_modules/dom-helpers": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/dom-helpers/-/dom-helpers-5.2.1.tgz",
 			"integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.8.7",
 				"csstype": "^3.0.2"
@@ -4013,9 +4267,10 @@
 		},
 		"node_modules/domain-browser": {
 			"version": "4.23.0",
-			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.23.0.tgz",
+			"resolved": "https://registry.npmmirror.com/domain-browser/-/domain-browser-4.23.0.tgz",
 			"integrity": "sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA==",
 			"dev": true,
+			"license": "Artistic-2.0",
 			"engines": {
 				"node": ">=10"
 			},
@@ -4024,9 +4279,10 @@
 			}
 		},
 		"node_modules/dotenv": {
-			"version": "16.4.5",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
-			"integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+			"version": "16.4.7",
+			"resolved": "https://registry.npmmirror.com/dotenv/-/dotenv-16.4.7.tgz",
+			"integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">=12"
 			},
@@ -4036,8 +4292,9 @@
 		},
 		"node_modules/draw-svg-path": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/draw-svg-path/-/draw-svg-path-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/draw-svg-path/-/draw-svg-path-1.0.0.tgz",
 			"integrity": "sha512-P8j3IHxcgRMcY6sDzr0QvJDLzBnJJqpTG33UZ2Pvp8rw0apCHhJCWqYprqrXjrgHnJ6tuhP1iTJSAodPDHxwkg==",
+			"license": "MIT",
 			"dependencies": {
 				"abs-svg-path": "~0.1.1",
 				"normalize-svg-path": "~0.1.0"
@@ -4045,21 +4302,24 @@
 		},
 		"node_modules/dtype": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/dtype/-/dtype-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/dtype/-/dtype-2.0.0.tgz",
 			"integrity": "sha512-s2YVcLKdFGS0hpFqJaTwscsyt0E8nNFdmo73Ocd81xNPj4URI4rj6D60A+vFMIw7BXWlb4yRkEwfBqcZzPGiZg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8.0"
 			}
 		},
 		"node_modules/dup": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dup/-/dup-1.0.0.tgz",
-			"integrity": "sha512-Bz5jxMMC0wgp23Zm15ip1x8IhYRqJvF3nFC0UInJUDkN1z4uNPk9jTnfCUJXbOGiQ1JbXLQsiV41Fb+HXcj5BA=="
+			"resolved": "https://registry.npmmirror.com/dup/-/dup-1.0.0.tgz",
+			"integrity": "sha512-Bz5jxMMC0wgp23Zm15ip1x8IhYRqJvF3nFC0UInJUDkN1z4uNPk9jTnfCUJXbOGiQ1JbXLQsiV41Fb+HXcj5BA==",
+			"license": "MIT"
 		},
 		"node_modules/duplexify": {
 			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+			"resolved": "https://registry.npmmirror.com/duplexify/-/duplexify-3.7.1.tgz",
 			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
@@ -4067,80 +4327,55 @@
 				"stream-shift": "^1.0.0"
 			}
 		},
-		"node_modules/duplexify/node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-		},
-		"node_modules/duplexify/node_modules/readable-stream": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"node_modules/duplexify/node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
-		"node_modules/duplexify/node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
 		"node_modules/earcut": {
 			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
-			"integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
+			"resolved": "https://registry.npmmirror.com/earcut/-/earcut-2.2.4.tgz",
+			"integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==",
+			"license": "ISC"
 		},
 		"node_modules/ecdsa-sig-formatter": {
 			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+			"resolved": "https://registry.npmmirror.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
 			"integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+			"license": "Apache-2.0",
 			"dependencies": {
 				"safe-buffer": "^5.0.1"
 			}
 		},
 		"node_modules/ee-first": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+			"resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
+			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+			"license": "MIT"
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.782",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.782.tgz",
-			"integrity": "sha512-JUfU61e8tr+i5Y1FKXcKs+Xe+rJ+CEqm4cgv1kMihPE2EvYHmYyVr3Im/+1+Z5B29Be2EEGCZCwAc6Tazdl1Yg==",
-			"dev": true
+			"version": "1.5.71",
+			"resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz",
+			"integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==",
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/element-size": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/element-size/-/element-size-1.1.1.tgz",
-			"integrity": "sha512-eaN+GMOq/Q+BIWy0ybsgpcYImjGIdNLyjLFJU4XsLHXYQao5jCNb36GyN6C2qwmDDYSfIBmKpPpr4VnBdLCsPQ=="
+			"resolved": "https://registry.npmmirror.com/element-size/-/element-size-1.1.1.tgz",
+			"integrity": "sha512-eaN+GMOq/Q+BIWy0ybsgpcYImjGIdNLyjLFJU4XsLHXYQao5jCNb36GyN6C2qwmDDYSfIBmKpPpr4VnBdLCsPQ==",
+			"license": "MIT"
 		},
 		"node_modules/elementary-circuits-directed-graph": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/elementary-circuits-directed-graph/-/elementary-circuits-directed-graph-1.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/elementary-circuits-directed-graph/-/elementary-circuits-directed-graph-1.3.1.tgz",
 			"integrity": "sha512-ZEiB5qkn2adYmpXGnJKkxT8uJHlW/mxmBpmeqawEHzPxh9HkLD4/1mFYX5l0On+f6rcPIt8/EWlRU2Vo3fX6dQ==",
+			"license": "MIT",
 			"dependencies": {
 				"strongly-connected-components": "^1.0.1"
 			}
 		},
 		"node_modules/elliptic": {
-			"version": "6.5.4",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+			"version": "6.6.1",
+			"resolved": "https://registry.npmmirror.com/elliptic/-/elliptic-6.6.1.tgz",
+			"integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.11.9",
 				"brorand": "^1.1.0",
@@ -4152,38 +4387,43 @@
 			}
 		},
 		"node_modules/elliptic/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true
+			"version": "4.12.1",
+			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
 			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/encodeurl": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
 			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/end-of-stream": {
 			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz",
 			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"license": "MIT",
 			"dependencies": {
 				"once": "^1.4.0"
 			}
 		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+			"version": "5.17.1",
+			"resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
 				"tapable": "^2.2.0"
@@ -4193,10 +4433,11 @@
 			}
 		},
 		"node_modules/envinfo": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz",
-			"integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==",
+			"version": "7.14.0",
+			"resolved": "https://registry.npmmirror.com/envinfo/-/envinfo-7.14.0.tgz",
+			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"envinfo": "dist/cli.js"
 			},
@@ -4206,16 +4447,18 @@
 		},
 		"node_modules/error-ex": {
 			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
 			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"license": "MIT",
 			"dependencies": {
 				"is-arrayish": "^0.2.1"
 			}
 		},
 		"node_modules/es-define-property": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.0.tgz",
 			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+			"license": "MIT",
 			"dependencies": {
 				"get-intrinsic": "^1.2.4"
 			},
@@ -4225,23 +4468,26 @@
 		},
 		"node_modules/es-errors": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
 			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			}
 		},
 		"node_modules/es-module-lexer": {
 			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+			"resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
 			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/es5-ext": {
 			"version": "0.10.64",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
+			"resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.64.tgz",
 			"integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
 			"hasInstallScript": true,
+			"license": "ISC",
 			"dependencies": {
 				"es6-iterator": "^2.0.3",
 				"es6-symbol": "^3.1.3",
@@ -4254,8 +4500,9 @@
 		},
 		"node_modules/es6-iterator": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz",
 			"integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+			"license": "MIT",
 			"dependencies": {
 				"d": "1",
 				"es5-ext": "^0.10.35",
@@ -4263,18 +4510,23 @@
 			}
 		},
 		"node_modules/es6-symbol": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-			"integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+			"version": "3.1.4",
+			"resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz",
+			"integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
+			"license": "ISC",
 			"dependencies": {
-				"d": "^1.0.1",
-				"ext": "^1.1.2"
+				"d": "^1.0.2",
+				"ext": "^1.7.0"
+			},
+			"engines": {
+				"node": ">=0.12"
 			}
 		},
 		"node_modules/es6-weak-map": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
 			"integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+			"license": "ISC",
 			"dependencies": {
 				"d": "1",
 				"es5-ext": "^0.10.46",
@@ -4283,117 +4535,71 @@
 			}
 		},
 		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/escape-html": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+			"resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
+			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+			"license": "MIT"
 		},
 		"node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.8.0"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/escodegen": {
-			"version": "1.14.3",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-			"integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmmirror.com/escodegen/-/escodegen-2.1.0.tgz",
+			"integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"esprima": "^4.0.1",
-				"estraverse": "^4.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1"
+				"estraverse": "^5.2.0",
+				"esutils": "^2.0.2"
 			},
 			"bin": {
 				"escodegen": "bin/escodegen.js",
 				"esgenerate": "bin/esgenerate.js"
 			},
 			"engines": {
-				"node": ">=4.0"
+				"node": ">=6.0"
 			},
 			"optionalDependencies": {
 				"source-map": "~0.6.1"
 			}
 		},
-		"node_modules/escodegen/node_modules/estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/escodegen/node_modules/levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-			"dependencies": {
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/escodegen/node_modules/optionator": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-			"dependencies": {
-				"deep-is": "~0.1.3",
-				"fast-levenshtein": "~2.0.6",
-				"levn": "~0.3.0",
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2",
-				"word-wrap": "~1.2.3"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/escodegen/node_modules/prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
 		"node_modules/escodegen/node_modules/source-map": {
 			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"license": "BSD-3-Clause",
 			"optional": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/escodegen/node_modules/type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-			"dependencies": {
-				"prelude-ls": "~1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
 		"node_modules/eslint": {
 			"version": "8.48.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+			"resolved": "https://registry.npmmirror.com/eslint/-/eslint-8.48.0.tgz",
 			"integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
+			"deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.6.1",
@@ -4437,176 +4643,94 @@
 				"eslint": "bin/eslint.js"
 			},
 			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-plugin-jsdoc": {
-			"version": "48.2.3",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.3.tgz",
-			"integrity": "sha512-r9DMAmFs66VNvNqRLLjHejdnJtILrt3xGi+Qx0op0oRfFGVpOR1Hb3BC++MacseHx93d8SKYPhyrC9BS7Os2QA==",
-			"dev": true,
-			"dependencies": {
-				"@es-joy/jsdoccomment": "~0.42.0",
-				"are-docs-informative": "^0.0.2",
-				"comment-parser": "1.4.1",
-				"debug": "^4.3.4",
-				"escape-string-regexp": "^4.0.0",
-				"esquery": "^1.5.0",
-				"is-builtin-module": "^3.2.1",
-				"semver": "^7.6.0",
-				"spdx-expression-parse": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"peerDependencies": {
-				"eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
-			}
-		},
-		"node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/eslint-scope": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-			"dev": true,
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/eslint/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/eslint/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+		"node_modules/eslint-plugin-jsdoc": {
+			"version": "48.2.15",
+			"resolved": "https://registry.npmmirror.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.15.tgz",
+			"integrity": "sha512-ScHhf9thOoJQ4dXpS+nJXTfNfslG8NBtzQ165PiXWIyGlJcAmkiEeTIEAlIcLA7uztJF7zRiuiKIqOBX4JpVzw==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"color-name": "~1.1.4"
+				"@es-joy/jsdoccomment": "~0.43.1",
+				"are-docs-informative": "^0.0.2",
+				"comment-parser": "1.4.1",
+				"debug": "^4.3.4",
+				"escape-string-regexp": "^4.0.0",
+				"esquery": "^1.5.0",
+				"semver": "^7.6.2",
+				"spdx-expression-parse": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=7.0.0"
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
 			}
 		},
-		"node_modules/eslint/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/eslint/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+		"node_modules/eslint-scope": {
+			"version": "7.2.2",
+			"resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.2.tgz",
+			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
 			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
 			"engines": {
-				"node": ">=10"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/eslint/node_modules/globals": {
-			"version": "13.23.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-			"integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+		"node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
-			"dependencies": {
-				"type-fest": "^0.20.2"
-			},
+			"license": "Apache-2.0",
 			"engines": {
-				"node": ">=8"
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/eslint/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+		"node_modules/eslint/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
-			"engines": {
-				"node": ">=8"
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
 			}
 		},
-		"node_modules/eslint/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+		"node_modules/eslint/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"has-flag": "^4.0.0"
+				"brace-expansion": "^1.1.7"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": "*"
 			}
 		},
 		"node_modules/esniff": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/esniff/-/esniff-2.0.1.tgz",
 			"integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+			"license": "ISC",
 			"dependencies": {
 				"d": "^1.0.1",
 				"es5-ext": "^0.10.62",
@@ -4617,16 +4741,12 @@
 				"node": ">=0.10"
 			}
 		},
-		"node_modules/esniff/node_modules/type": {
-			"version": "2.7.2",
-			"resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
-		},
 		"node_modules/espree": {
 			"version": "9.6.1",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+			"resolved": "https://registry.npmmirror.com/espree/-/espree-9.6.1.tgz",
 			"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"acorn": "^8.9.0",
 				"acorn-jsx": "^5.3.2",
@@ -4641,8 +4761,9 @@
 		},
 		"node_modules/esprima": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz",
 			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"license": "BSD-2-Clause",
 			"bin": {
 				"esparse": "bin/esparse.js",
 				"esvalidate": "bin/esvalidate.js"
@@ -4652,10 +4773,11 @@
 			}
 		},
 		"node_modules/esquery": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-			"integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmmirror.com/esquery/-/esquery-1.6.0.tgz",
+			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"estraverse": "^5.1.0"
 			},
@@ -4665,9 +4787,10 @@
 		},
 		"node_modules/esrecurse": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
 			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"estraverse": "^5.2.0"
 			},
@@ -4677,33 +4800,36 @@
 		},
 		"node_modules/estraverse": {
 			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
+			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
 		"node_modules/esutils": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz",
 			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/etag": {
 			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
 			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/event-emitter": {
 			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+			"resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz",
 			"integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+			"license": "MIT",
 			"dependencies": {
 				"d": "1",
 				"es5-ext": "~0.10.14"
@@ -4711,17 +4837,19 @@
 		},
 		"node_modules/events": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
 			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.8.x"
 			}
 		},
 		"node_modules/evp_bytestokey": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
 			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"md5.js": "^1.3.4",
 				"safe-buffer": "^5.1.1"
@@ -4729,8 +4857,9 @@
 		},
 		"node_modules/express": {
 			"version": "4.19.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+			"resolved": "https://registry.npmmirror.com/express/-/express-4.19.2.tgz",
 			"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+			"license": "MIT",
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
@@ -4770,8 +4899,9 @@
 		},
 		"node_modules/express-rate-limit": {
 			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/express-rate-limit/-/express-rate-limit-7.2.0.tgz",
 			"integrity": "sha512-T7nul1t4TNyfZMJ7pKRKkdeVJWa2CqB8NA1P8BwYaoDI5QSBZARv5oMS43J7b7I5P+4asjVXjb7ONuwDKucahg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 16"
 			},
@@ -4782,36 +4912,74 @@
 				"express": "4 || 5 || ^5.0.0-beta.1"
 			}
 		},
+		"node_modules/express/node_modules/body-parser": {
+			"version": "1.20.2",
+			"resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.2.tgz",
+			"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+			"license": "MIT",
+			"dependencies": {
+				"bytes": "3.1.2",
+				"content-type": "~1.0.5",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "1.2.0",
+				"http-errors": "2.0.0",
+				"iconv-lite": "0.4.24",
+				"on-finished": "2.4.1",
+				"qs": "6.11.0",
+				"raw-body": "2.5.2",
+				"type-is": "~1.6.18",
+				"unpipe": "1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
+			}
+		},
 		"node_modules/express/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/express/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
+		},
+		"node_modules/express/node_modules/qs": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/ext": {
 			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+			"resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
 			"integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+			"license": "ISC",
 			"dependencies": {
 				"type": "^2.7.2"
 			}
 		},
-		"node_modules/ext/node_modules/type": {
-			"version": "2.7.2",
-			"resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
-		},
 		"node_modules/falafel": {
 			"version": "2.2.5",
-			"resolved": "https://registry.npmjs.org/falafel/-/falafel-2.2.5.tgz",
+			"resolved": "https://registry.npmmirror.com/falafel/-/falafel-2.2.5.tgz",
 			"integrity": "sha512-HuC1qF9iTnHDnML9YZAdCDQwT0yKl/U55K4XSUXqGAA2GLoafFgWRqdAbhWJxXaYD4pyoVxAJ8wH670jMpI9DQ==",
+			"license": "MIT",
 			"dependencies": {
 				"acorn": "^7.1.1",
 				"isarray": "^2.0.1"
@@ -4822,8 +4990,9 @@
 		},
 		"node_modules/falafel/node_modules/acorn": {
 			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
 			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -4833,15 +5002,17 @@
 		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
 			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/fast-glob": {
 			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.2.tgz",
 			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -4855,9 +5026,10 @@
 		},
 		"node_modules/fast-glob/node_modules/glob-parent": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -4867,52 +5039,60 @@
 		},
 		"node_modules/fast-isnumeric": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/fast-isnumeric/-/fast-isnumeric-1.1.4.tgz",
+			"resolved": "https://registry.npmmirror.com/fast-isnumeric/-/fast-isnumeric-1.1.4.tgz",
 			"integrity": "sha512-1mM8qOr2LYz8zGaUdmiqRDiuue00Dxjgcb1NQR7TnhLVh6sQyngP9xvLo7Sl7LZpP/sk5eb+bcyWXw530NTBZw==",
+			"license": "MIT",
 			"dependencies": {
 				"is-string-blank": "^1.0.1"
 			}
 		},
 		"node_modules/fast-json-stable-stringify": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
 			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/fast-levenshtein": {
 			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+			"resolved": "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/fast-safe-stringify": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
 			"integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/fastest-levenshtein": {
 			"version": "1.0.16",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+			"resolved": "https://registry.npmmirror.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
 			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 4.9.1"
 			}
 		},
 		"node_modules/fastq": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-			"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+			"version": "1.17.1",
+			"resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.17.1.tgz",
+			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"reusify": "^1.0.4"
 			}
 		},
 		"node_modules/file-entry-cache": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
 			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"flat-cache": "^3.0.4"
 			},
@@ -4922,9 +5102,10 @@
 		},
 		"node_modules/fill-range": {
 			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
 			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
 			},
@@ -4934,17 +5115,19 @@
 		},
 		"node_modules/filter-obj": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/filter-obj/-/filter-obj-2.0.2.tgz",
 			"integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/finalhandler": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz",
 			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+			"license": "MIT",
 			"dependencies": {
 				"debug": "2.6.9",
 				"encodeurl": "~1.0.2",
@@ -4960,27 +5143,31 @@
 		},
 		"node_modules/finalhandler/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/finalhandler/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/find-root": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-			"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+			"resolved": "https://registry.npmmirror.com/find-root/-/find-root-1.1.0.tgz",
+			"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+			"license": "MIT"
 		},
 		"node_modules/find-up": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/find-up/-/find-up-5.0.0.tgz",
 			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"locate-path": "^6.0.0",
 				"path-exists": "^4.0.0"
@@ -4994,51 +5181,56 @@
 		},
 		"node_modules/flat": {
 			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/flat/-/flat-5.0.2.tgz",
 			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"bin": {
 				"flat": "cli.js"
 			}
 		},
 		"node_modules/flat-cache": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
-			"integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmmirror.com/flat-cache/-/flat-cache-3.2.0.tgz",
+			"integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"flatted": "^3.2.9",
 				"keyv": "^4.5.3",
 				"rimraf": "^3.0.2"
 			},
 			"engines": {
-				"node": ">=12.0.0"
+				"node": "^10.12.0 || >=12.0.0"
 			}
 		},
 		"node_modules/flatted": {
-			"version": "3.2.9",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-			"integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-			"dev": true
+			"version": "3.3.2",
+			"resolved": "https://registry.npmmirror.com/flatted/-/flatted-3.3.2.tgz",
+			"integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/flatten-vertex-data": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/flatten-vertex-data/-/flatten-vertex-data-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/flatten-vertex-data/-/flatten-vertex-data-1.0.2.tgz",
 			"integrity": "sha512-BvCBFK2NZqerFTdMDgqfHBwxYWnxeCkwONsw6PvBMcUXqo8U/KDWwmXhqx1x2kLIg7DqIsJfOaJFOmlua3Lxuw==",
+			"license": "MIT",
 			"dependencies": {
 				"dtype": "^2.0.0"
 			}
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.6",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+			"version": "1.15.9",
+			"resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
+			"integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
 			"funding": [
 				{
 					"type": "individual",
 					"url": "https://github.com/sponsors/RubenVerborgh"
 				}
 			],
+			"license": "MIT",
 			"engines": {
 				"node": ">=4.0"
 			},
@@ -5050,33 +5242,37 @@
 		},
 		"node_modules/font-atlas": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/font-atlas/-/font-atlas-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/font-atlas/-/font-atlas-2.1.0.tgz",
 			"integrity": "sha512-kP3AmvX+HJpW4w3d+PiPR2X6E1yvsBXt2yhuCw+yReO9F1WYhvZwx3c95DGZGwg9xYzDGrgJYa885xmVA+28Cg==",
+			"license": "MIT",
 			"dependencies": {
 				"css-font": "^1.0.0"
 			}
 		},
 		"node_modules/font-measure": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/font-measure/-/font-measure-1.2.2.tgz",
+			"resolved": "https://registry.npmmirror.com/font-measure/-/font-measure-1.2.2.tgz",
 			"integrity": "sha512-mRLEpdrWzKe9hbfaF3Qpr06TAjquuBVP5cHy4b3hyeNdjc9i0PO6HniGsX5vjL5OWv7+Bd++NiooNpT/s8BvIA==",
+			"license": "MIT",
 			"dependencies": {
 				"css-font": "^1.2.0"
 			}
 		},
 		"node_modules/for-each": {
 			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.3.tgz",
 			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"is-callable": "^1.1.3"
 			}
 		},
 		"node_modules/form-data": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.1.tgz",
+			"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+			"license": "MIT",
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",
@@ -5088,9 +5284,10 @@
 		},
 		"node_modules/formidable": {
 			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/formidable/-/formidable-2.1.2.tgz",
 			"integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"dezalgo": "^1.0.4",
 				"hexoid": "^1.0.0",
@@ -5103,73 +5300,46 @@
 		},
 		"node_modules/forwarded": {
 			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz",
 			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/fresh": {
 			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+			"resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz",
 			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/from2": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/from2/-/from2-2.3.0.tgz",
 			"integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
 			}
 		},
-		"node_modules/from2/node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-		},
-		"node_modules/from2/node_modules/readable-stream": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"node_modules/from2/node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
-		"node_modules/from2/node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
 			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/fsevents": {
 			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
 			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
 			"dev": true,
 			"hasInstallScript": true,
+			"license": "MIT",
 			"optional": true,
 			"os": [
 				"darwin"
@@ -5180,44 +5350,50 @@
 		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
 			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/geojson-vt": {
 			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
-			"integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="
+			"resolved": "https://registry.npmmirror.com/geojson-vt/-/geojson-vt-3.2.1.tgz",
+			"integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==",
+			"license": "ISC"
 		},
 		"node_modules/get-caller-file": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": "6.* || 8.* || >= 10.*"
 			}
 		},
 		"node_modules/get-canvas-context": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/get-canvas-context/-/get-canvas-context-1.0.2.tgz",
-			"integrity": "sha512-LnpfLf/TNzr9zVOGiIY6aKCz8EKuXmlYNV7CM2pUjBa/B+c2I15tS7KLySep75+FuerJdmArvJLcsAXWEy2H0A=="
+			"resolved": "https://registry.npmmirror.com/get-canvas-context/-/get-canvas-context-1.0.2.tgz",
+			"integrity": "sha512-LnpfLf/TNzr9zVOGiIY6aKCz8EKuXmlYNV7CM2pUjBa/B+c2I15tS7KLySep75+FuerJdmArvJLcsAXWEy2H0A==",
+			"license": "MIT"
 		},
 		"node_modules/get-func-name": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/get-func-name/-/get-func-name-2.0.2.tgz",
 			"integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/get-intrinsic": {
 			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
 			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+			"license": "MIT",
 			"dependencies": {
 				"es-errors": "^1.3.0",
 				"function-bind": "^1.1.2",
@@ -5234,8 +5410,9 @@
 		},
 		"node_modules/get-stream": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
 			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -5245,8 +5422,9 @@
 		},
 		"node_modules/get-user-locale": {
 			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/get-user-locale/-/get-user-locale-2.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/get-user-locale/-/get-user-locale-2.3.2.tgz",
 			"integrity": "sha512-O2GWvQkhnbDoWFUJfaBlDIKUEdND8ATpBXD6KXcbhxlfktyD/d8w6mkzM/IlQEqGZAMz/PW6j6Hv53BiigKLUQ==",
+			"license": "MIT",
 			"dependencies": {
 				"mem": "^8.0.0"
 			},
@@ -5256,18 +5434,21 @@
 		},
 		"node_modules/gl-mat4": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/gl-mat4/-/gl-mat4-1.2.0.tgz",
-			"integrity": "sha512-sT5C0pwB1/e9G9AvAoLsoaJtbMGjfd/jfxo8jMCKqYYEnjZuFvqV5rehqar0538EmssjdDeiEWnKyBSTw7quoA=="
+			"resolved": "https://registry.npmmirror.com/gl-mat4/-/gl-mat4-1.2.0.tgz",
+			"integrity": "sha512-sT5C0pwB1/e9G9AvAoLsoaJtbMGjfd/jfxo8jMCKqYYEnjZuFvqV5rehqar0538EmssjdDeiEWnKyBSTw7quoA==",
+			"license": "Zlib"
 		},
 		"node_modules/gl-matrix": {
 			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
-			"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="
+			"resolved": "https://registry.npmmirror.com/gl-matrix/-/gl-matrix-3.4.3.tgz",
+			"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==",
+			"license": "MIT"
 		},
 		"node_modules/gl-text": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/gl-text/-/gl-text-1.3.1.tgz",
-			"integrity": "sha512-/f5gcEMiZd+UTBJLTl3D+CkCB/0UFGTx3nflH8ZmyWcLkZhsZ1+Xx5YYkw2rgWAzgPeE35xCqBuHSoMKQVsR+w==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmmirror.com/gl-text/-/gl-text-1.4.0.tgz",
+			"integrity": "sha512-o47+XBqLCj1efmuNyCHt7/UEJmB9l66ql7pnobD6p+sgmBUdzfMZXIF0zD2+KRfpd99DJN+QXdvTFAGCKCVSmQ==",
+			"license": "MIT",
 			"dependencies": {
 				"bit-twiddle": "^1.0.2",
 				"color-normalize": "^1.5.0",
@@ -5290,8 +5471,9 @@
 		},
 		"node_modules/gl-util": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/gl-util/-/gl-util-3.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/gl-util/-/gl-util-3.1.3.tgz",
 			"integrity": "sha512-dvRTggw5MSkJnCbh74jZzSoTOGnVYK+Bt+Ckqm39CVcl6+zSsxqWk4lr5NKhkqXHL6qvZAU9h17ZF8mIskY9mA==",
+			"license": "MIT",
 			"dependencies": {
 				"is-browser": "^2.0.1",
 				"is-firefox": "^1.0.3",
@@ -5303,20 +5485,21 @@
 			}
 		},
 		"node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"version": "8.1.0",
+			"resolved": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz",
+			"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
 				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
+				"minimatch": "^5.0.1",
+				"once": "^1.3.0"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">=12"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
@@ -5324,9 +5507,10 @@
 		},
 		"node_modules/glob-parent": {
 			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz",
 			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"is-glob": "^4.0.3"
 			},
@@ -5336,15 +5520,46 @@
 		},
 		"node_modules/glob-to-regexp": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
 			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-			"dev": true
+			"dev": true,
+			"license": "BSD-2-Clause"
+		},
+		"node_modules/glob/node_modules/minimatch": {
+			"version": "5.1.6",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz",
+			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/globals": {
+			"version": "13.24.0",
+			"resolved": "https://registry.npmmirror.com/globals/-/globals-13.24.0.tgz",
+			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/globby": {
 			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/globby/-/globby-11.1.0.tgz",
 			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"array-union": "^2.1.0",
 				"dir-glob": "^3.0.1",
@@ -5362,8 +5577,9 @@
 		},
 		"node_modules/glsl-inject-defines": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/glsl-inject-defines/-/glsl-inject-defines-1.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/glsl-inject-defines/-/glsl-inject-defines-1.0.3.tgz",
 			"integrity": "sha512-W49jIhuDtF6w+7wCMcClk27a2hq8znvHtlGnrYkSWEr8tHe9eA2dcnohlcAmxLYBSpSSdzOkRdyPTrx9fw49+A==",
+			"license": "MIT",
 			"dependencies": {
 				"glsl-token-inject-block": "^1.0.0",
 				"glsl-token-string": "^1.0.1",
@@ -5372,8 +5588,9 @@
 		},
 		"node_modules/glsl-resolve": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/glsl-resolve/-/glsl-resolve-0.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/glsl-resolve/-/glsl-resolve-0.0.1.tgz",
 			"integrity": "sha512-xxFNsfnhZTK9NBhzJjSBGX6IOqYpvBHxxmo+4vapiljyGNCY0Bekzn0firQkQrazK59c1hYxMDxYS8MDlhw4gA==",
+			"license": "MIT",
 			"dependencies": {
 				"resolve": "^0.6.1",
 				"xtend": "^2.1.2"
@@ -5381,12 +5598,13 @@
 		},
 		"node_modules/glsl-resolve/node_modules/resolve": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
-			"integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg=="
+			"resolved": "https://registry.npmmirror.com/resolve/-/resolve-0.6.3.tgz",
+			"integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-resolve/node_modules/xtend": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/xtend/-/xtend-2.2.0.tgz",
 			"integrity": "sha512-SLt5uylT+4aoXxXuwtQp5ZnMMzhDb1Xkg4pEqc00WUJCQifPfV9Ub1VrNhp9kXkrjZD2I2Hl8WnjP37jzZLPZw==",
 			"engines": {
 				"node": ">=0.4"
@@ -5394,26 +5612,30 @@
 		},
 		"node_modules/glsl-token-assignments": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/glsl-token-assignments/-/glsl-token-assignments-2.0.2.tgz",
-			"integrity": "sha512-OwXrxixCyHzzA0U2g4btSNAyB2Dx8XrztY5aVUCjRSh4/D0WoJn8Qdps7Xub3sz6zE73W3szLrmWtQ7QMpeHEQ=="
+			"resolved": "https://registry.npmmirror.com/glsl-token-assignments/-/glsl-token-assignments-2.0.2.tgz",
+			"integrity": "sha512-OwXrxixCyHzzA0U2g4btSNAyB2Dx8XrztY5aVUCjRSh4/D0WoJn8Qdps7Xub3sz6zE73W3szLrmWtQ7QMpeHEQ==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-token-defines": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/glsl-token-defines/-/glsl-token-defines-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/glsl-token-defines/-/glsl-token-defines-1.0.0.tgz",
 			"integrity": "sha512-Vb5QMVeLjmOwvvOJuPNg3vnRlffscq2/qvIuTpMzuO/7s5kT+63iL6Dfo2FYLWbzuiycWpbC0/KV0biqFwHxaQ==",
+			"license": "MIT",
 			"dependencies": {
 				"glsl-tokenizer": "^2.0.0"
 			}
 		},
 		"node_modules/glsl-token-depth": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/glsl-token-depth/-/glsl-token-depth-1.1.2.tgz",
-			"integrity": "sha512-eQnIBLc7vFf8axF9aoi/xW37LSWd2hCQr/3sZui8aBJnksq9C7zMeUYHVJWMhFzXrBU7fgIqni4EhXVW4/krpg=="
+			"resolved": "https://registry.npmmirror.com/glsl-token-depth/-/glsl-token-depth-1.1.2.tgz",
+			"integrity": "sha512-eQnIBLc7vFf8axF9aoi/xW37LSWd2hCQr/3sZui8aBJnksq9C7zMeUYHVJWMhFzXrBU7fgIqni4EhXVW4/krpg==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-token-descope": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/glsl-token-descope/-/glsl-token-descope-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/glsl-token-descope/-/glsl-token-descope-1.0.2.tgz",
 			"integrity": "sha512-kS2PTWkvi/YOeicVjXGgX5j7+8N7e56srNDEHDTVZ1dcESmbmpmgrnpjPcjxJjMxh56mSXYoFdZqb90gXkGjQw==",
+			"license": "MIT",
 			"dependencies": {
 				"glsl-token-assignments": "^2.0.0",
 				"glsl-token-depth": "^1.1.0",
@@ -5423,46 +5645,54 @@
 		},
 		"node_modules/glsl-token-inject-block": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/glsl-token-inject-block/-/glsl-token-inject-block-1.1.0.tgz",
-			"integrity": "sha512-q/m+ukdUBuHCOtLhSr0uFb/qYQr4/oKrPSdIK2C4TD+qLaJvqM9wfXIF/OOBjuSA3pUoYHurVRNao6LTVVUPWA=="
+			"resolved": "https://registry.npmmirror.com/glsl-token-inject-block/-/glsl-token-inject-block-1.1.0.tgz",
+			"integrity": "sha512-q/m+ukdUBuHCOtLhSr0uFb/qYQr4/oKrPSdIK2C4TD+qLaJvqM9wfXIF/OOBjuSA3pUoYHurVRNao6LTVVUPWA==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-token-properties": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/glsl-token-properties/-/glsl-token-properties-1.0.1.tgz",
-			"integrity": "sha512-dSeW1cOIzbuUoYH0y+nxzwK9S9O3wsjttkq5ij9ZGw0OS41BirKJzzH48VLm8qLg+au6b0sINxGC0IrGwtQUcA=="
+			"resolved": "https://registry.npmmirror.com/glsl-token-properties/-/glsl-token-properties-1.0.1.tgz",
+			"integrity": "sha512-dSeW1cOIzbuUoYH0y+nxzwK9S9O3wsjttkq5ij9ZGw0OS41BirKJzzH48VLm8qLg+au6b0sINxGC0IrGwtQUcA==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-token-scope": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/glsl-token-scope/-/glsl-token-scope-1.1.2.tgz",
-			"integrity": "sha512-YKyOMk1B/tz9BwYUdfDoHvMIYTGtVv2vbDSLh94PT4+f87z21FVdou1KNKgF+nECBTo0fJ20dpm0B1vZB1Q03A=="
+			"resolved": "https://registry.npmmirror.com/glsl-token-scope/-/glsl-token-scope-1.1.2.tgz",
+			"integrity": "sha512-YKyOMk1B/tz9BwYUdfDoHvMIYTGtVv2vbDSLh94PT4+f87z21FVdou1KNKgF+nECBTo0fJ20dpm0B1vZB1Q03A==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-token-string": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/glsl-token-string/-/glsl-token-string-1.0.1.tgz",
-			"integrity": "sha512-1mtQ47Uxd47wrovl+T6RshKGkRRCYWhnELmkEcUAPALWGTFe2XZpH3r45XAwL2B6v+l0KNsCnoaZCSnhzKEksg=="
+			"resolved": "https://registry.npmmirror.com/glsl-token-string/-/glsl-token-string-1.0.1.tgz",
+			"integrity": "sha512-1mtQ47Uxd47wrovl+T6RshKGkRRCYWhnELmkEcUAPALWGTFe2XZpH3r45XAwL2B6v+l0KNsCnoaZCSnhzKEksg==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-token-whitespace-trim": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/glsl-token-whitespace-trim/-/glsl-token-whitespace-trim-1.0.0.tgz",
-			"integrity": "sha512-ZJtsPut/aDaUdLUNtmBYhaCmhIjpKNg7IgZSfX5wFReMc2vnj8zok+gB/3Quqs0TsBSX/fGnqUUYZDqyuc2xLQ=="
+			"resolved": "https://registry.npmmirror.com/glsl-token-whitespace-trim/-/glsl-token-whitespace-trim-1.0.0.tgz",
+			"integrity": "sha512-ZJtsPut/aDaUdLUNtmBYhaCmhIjpKNg7IgZSfX5wFReMc2vnj8zok+gB/3Quqs0TsBSX/fGnqUUYZDqyuc2xLQ==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-tokenizer": {
 			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/glsl-tokenizer/-/glsl-tokenizer-2.1.5.tgz",
+			"resolved": "https://registry.npmmirror.com/glsl-tokenizer/-/glsl-tokenizer-2.1.5.tgz",
 			"integrity": "sha512-XSZEJ/i4dmz3Pmbnpsy3cKh7cotvFlBiZnDOwnj/05EwNp2XrhQ4XKJxT7/pDt4kp4YcpRSKz8eTV7S+mwV6MA==",
+			"license": "MIT",
 			"dependencies": {
 				"through2": "^0.6.3"
 			}
 		},
 		"node_modules/glsl-tokenizer/node_modules/isarray": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+			"resolved": "https://registry.npmmirror.com/isarray/-/isarray-0.0.1.tgz",
+			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-tokenizer/node_modules/readable-stream": {
 			"version": "1.0.34",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-1.0.34.tgz",
 			"integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+			"license": "MIT",
 			"dependencies": {
 				"core-util-is": "~1.0.0",
 				"inherits": "~2.0.1",
@@ -5472,13 +5702,15 @@
 		},
 		"node_modules/glsl-tokenizer/node_modules/string_decoder": {
 			"version": "0.10.31",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-			"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
+			"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-0.10.31.tgz",
+			"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+			"license": "MIT"
 		},
 		"node_modules/glsl-tokenizer/node_modules/through2": {
 			"version": "0.6.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+			"resolved": "https://registry.npmmirror.com/through2/-/through2-0.6.5.tgz",
 			"integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+			"license": "MIT",
 			"dependencies": {
 				"readable-stream": ">=1.0.33-1 <1.1.0-0",
 				"xtend": ">=4.0.0 <4.1.0-0"
@@ -5486,8 +5718,9 @@
 		},
 		"node_modules/glslify": {
 			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/glslify/-/glslify-7.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/glslify/-/glslify-7.1.1.tgz",
 			"integrity": "sha512-bud98CJ6kGZcP9Yxcsi7Iz647wuDz3oN+IZsjCRi5X1PI7t/xPKeL0mOwXJjo+CRZMqvq0CkSJiywCcY7kVYog==",
+			"license": "MIT",
 			"dependencies": {
 				"bl": "^2.2.1",
 				"concat-stream": "^1.5.2",
@@ -5511,8 +5744,9 @@
 		},
 		"node_modules/glslify-bundle": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/glslify-bundle/-/glslify-bundle-5.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/glslify-bundle/-/glslify-bundle-5.1.1.tgz",
 			"integrity": "sha512-plaAOQPv62M1r3OsWf2UbjN0hUYAB7Aph5bfH58VxJZJhloRNbxOL9tl/7H71K7OLJoSJ2ZqWOKk3ttQ6wy24A==",
+			"license": "MIT",
 			"dependencies": {
 				"glsl-inject-defines": "^1.0.1",
 				"glsl-token-defines": "^1.0.0",
@@ -5528,8 +5762,9 @@
 		},
 		"node_modules/glslify-deps": {
 			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/glslify-deps/-/glslify-deps-1.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/glslify-deps/-/glslify-deps-1.3.2.tgz",
 			"integrity": "sha512-7S7IkHWygJRjcawveXQjRXLO2FTjijPDYC7QfZyAQanY+yGLCFHYnPtsGT9bdyHiwPTw/5a1m1M9hamT2aBpag==",
+			"license": "ISC",
 			"dependencies": {
 				"@choojs/findup": "^0.2.0",
 				"events": "^3.2.0",
@@ -5542,11 +5777,12 @@
 			}
 		},
 		"node_modules/gopd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-			"dependencies": {
-				"get-intrinsic": "^1.1.3"
+			"version": "1.2.0",
+			"resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
+			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -5554,48 +5790,56 @@
 		},
 		"node_modules/graceful-fs": {
 			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+			"resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+			"license": "ISC"
 		},
 		"node_modules/graphemer": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/graphemer/-/graphemer-1.4.0.tgz",
 			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/grid-index": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
-			"integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="
+			"resolved": "https://registry.npmmirror.com/grid-index/-/grid-index-1.1.0.tgz",
+			"integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==",
+			"license": "ISC"
 		},
 		"node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=4"
+				"node": ">=8"
 			}
 		},
 		"node_modules/has-hover": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-hover/-/has-hover-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/has-hover/-/has-hover-1.0.1.tgz",
 			"integrity": "sha512-0G6w7LnlcpyDzpeGUTuT0CEw05+QlMuGVk1IHNAlHrGJITGodjZu3x8BNDUMfKJSZXNB2ZAclqc1bvrd+uUpfg==",
+			"license": "MIT",
 			"dependencies": {
 				"is-browser": "^2.0.1"
 			}
 		},
 		"node_modules/has-passive-events": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-passive-events/-/has-passive-events-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/has-passive-events/-/has-passive-events-1.0.0.tgz",
 			"integrity": "sha512-2vSj6IeIsgvsRMyeQ0JaCX5Q3lX4zMn5HpoVc7MEhQ6pv8Iq9rsXjsp+E5ZwaT7T0xhMT0KmU8gtt1EFVdbJiw==",
+			"license": "MIT",
 			"dependencies": {
 				"is-browser": "^2.0.1"
 			}
 		},
 		"node_modules/has-property-descriptors": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
 			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+			"license": "MIT",
 			"dependencies": {
 				"es-define-property": "^1.0.0"
 			},
@@ -5604,9 +5848,13 @@
 			}
 		},
 		"node_modules/has-proto": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.1.0.tgz",
+			"integrity": "sha512-QLdzI9IIO1Jg7f9GT1gXpPpXArAn6cS31R1eEZqz08Gc+uQ8/XiqHWt17Fiw+2p6oTTIq5GXEpQkAlA88YRl/Q==",
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7"
+			},
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -5615,9 +5863,10 @@
 			}
 		},
 		"node_modules/has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
+			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -5626,12 +5875,13 @@
 			}
 		},
 		"node_modules/has-tostringtag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+			"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"has-symbols": "^1.0.2"
+				"has-symbols": "^1.0.3"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -5641,47 +5891,35 @@
 			}
 		},
 		"node_modules/hash-base": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+			"version": "3.0.5",
+			"resolved": "https://registry.npmmirror.com/hash-base/-/hash-base-3.0.5.tgz",
+			"integrity": "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/hash-base/node_modules/readable-stream": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"dev": true,
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
+				"safe-buffer": "^5.2.1"
 			},
 			"engines": {
-				"node": ">= 6"
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/hash.js": {
 			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"resolved": "https://registry.npmmirror.com/hash.js/-/hash.js-1.1.7.tgz",
 			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"minimalistic-assert": "^1.0.1"
 			}
 		},
 		"node_modules/hasown": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-			"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"license": "MIT",
 			"dependencies": {
 				"function-bind": "^1.1.2"
 			},
@@ -5691,35 +5929,39 @@
 		},
 		"node_modules/he": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"he": "bin/he"
 			}
 		},
 		"node_modules/hexoid": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/hexoid/-/hexoid-1.0.0.tgz",
 			"integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/history": {
 			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/history/-/history-5.3.0.tgz",
 			"integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.7.6"
 			}
 		},
 		"node_modules/hmac-drbg": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
 			"integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"hash.js": "^1.0.3",
 				"minimalistic-assert": "^1.0.0",
@@ -5728,21 +5970,24 @@
 		},
 		"node_modules/hoist-non-react-statics": {
 			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
 			"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"react-is": "^16.7.0"
 			}
 		},
 		"node_modules/hsluv": {
 			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/hsluv/-/hsluv-0.0.3.tgz",
-			"integrity": "sha512-08iL2VyCRbkQKBySkSh6m8zMUa3sADAxGVWs3Z1aPcUkTJeK0ETG4Fc27tEmQBGUAXZjIsXOZqBvacuVNSC/fQ=="
+			"resolved": "https://registry.npmmirror.com/hsluv/-/hsluv-0.0.3.tgz",
+			"integrity": "sha512-08iL2VyCRbkQKBySkSh6m8zMUa3sADAxGVWs3Z1aPcUkTJeK0ETG4Fc27tEmQBGUAXZjIsXOZqBvacuVNSC/fQ==",
+			"license": "MIT"
 		},
 		"node_modules/http-errors": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz",
 			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+			"license": "MIT",
 			"dependencies": {
 				"depd": "2.0.0",
 				"inherits": "2.0.4",
@@ -5756,14 +6001,16 @@
 		},
 		"node_modules/https-browserify": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/https-browserify/-/https-browserify-1.0.0.tgz",
 			"integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/iconv-lite": {
 			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"license": "MIT",
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			},
@@ -5773,9 +6020,10 @@
 		},
 		"node_modules/icss-utils": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz",
 			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
 			},
@@ -5785,7 +6033,7 @@
 		},
 		"node_modules/ieee754": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
 			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
 			"funding": [
 				{
@@ -5800,42 +6048,48 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			]
+			],
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/ignore": {
-			"version": "5.2.4",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+			"version": "5.3.2",
+			"resolved": "https://registry.npmmirror.com/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 4"
 			}
 		},
 		"node_modules/ignore-by-default": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
 			"integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/immer": {
-			"version": "10.0.3",
-			"resolved": "https://registry.npmjs.org/immer/-/immer-10.0.3.tgz",
-			"integrity": "sha512-pwupu3eWfouuaowscykeckFmVTpqbzW+rXFCX8rQLkZzM9ftBmU/++Ra+o+L27mz03zJTlyV4UUr+fdKNffo4A==",
+			"version": "10.1.1",
+			"resolved": "https://registry.npmmirror.com/immer/-/immer-10.1.1.tgz",
+			"integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+			"license": "MIT",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/immer"
 			}
 		},
 		"node_modules/immutable": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
-			"integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
-			"dev": true
+			"version": "4.3.7",
+			"resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
+			"integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/import-fresh": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz",
 			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"license": "MIT",
 			"dependencies": {
 				"parent-module": "^1.0.0",
 				"resolve-from": "^4.0.0"
@@ -5848,10 +6102,11 @@
 			}
 		},
 		"node_modules/import-local": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmmirror.com/import-local/-/import-local-3.2.0.tgz",
+			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"pkg-dir": "^4.2.0",
 				"resolve-cwd": "^3.0.0"
@@ -5868,18 +6123,21 @@
 		},
 		"node_modules/imurmurhash": {
 			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"resolved": "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz",
 			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.8.19"
 			}
 		},
 		"node_modules/inflight": {
 			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz",
 			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"once": "^1.3.0",
 				"wrappy": "1"
@@ -5887,103 +6145,75 @@
 		},
 		"node_modules/inherits": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+			"resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"license": "ISC"
 		},
 		"node_modules/ini": {
 			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/ini/-/ini-4.1.3.tgz",
 			"integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
+			"license": "ISC",
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
 		"node_modules/internmap": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/internmap/-/internmap-2.0.3.tgz",
 			"integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/interpret": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/intl-messageformat": {
-			"version": "10.5.14",
-			"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.5.14.tgz",
-			"integrity": "sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==",
-			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"@formatjs/fast-memoize": "2.2.0",
-				"@formatjs/icu-messageformat-parser": "2.7.8",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/intl-messageformat/node_modules/@formatjs/ecma402-abstract": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
-			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
-			"dependencies": {
-				"@formatjs/intl-localematcher": "0.5.4",
-				"tslib": "^2.4.0"
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"node_modules/intl-messageformat/node_modules/@formatjs/icu-messageformat-parser": {
-			"version": "2.7.8",
-			"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
-			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
-			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"@formatjs/icu-skeleton-parser": "1.8.2",
-				"tslib": "^2.4.0"
+		"node_modules/interpret": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmmirror.com/interpret/-/interpret-3.1.1.tgz",
+			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/intl-messageformat/node_modules/@formatjs/icu-skeleton-parser": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
-			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
+		"node_modules/intl-messageformat": {
+			"version": "10.5.14",
+			"resolved": "https://registry.npmmirror.com/intl-messageformat/-/intl-messageformat-10.5.14.tgz",
+			"integrity": "sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/intl-messageformat/node_modules/@formatjs/intl-localematcher": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
-			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
-			"dependencies": {
+				"@formatjs/fast-memoize": "2.2.0",
+				"@formatjs/icu-messageformat-parser": "2.7.8",
 				"tslib": "^2.4.0"
 			}
 		},
 		"node_modules/ip-regex": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/ip-regex/-/ip-regex-2.1.0.tgz",
 			"integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/ipaddr.js": {
 			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
 			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.10"
 			}
 		},
 		"node_modules/is-arguments": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz",
 			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -5997,14 +6227,16 @@
 		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+			"resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+			"license": "MIT"
 		},
 		"node_modules/is-binary-path": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
 			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"binary-extensions": "^2.0.0"
 			},
@@ -6014,34 +6246,22 @@
 		},
 		"node_modules/is-browser": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-browser/-/is-browser-2.1.0.tgz",
-			"integrity": "sha512-F5rTJxDQ2sW81fcfOR1GnCXT6sVJC104fCyfj+mjpwNEwaPYSn5fte5jiHmBg3DHsIoL/l8Kvw5VN5SsTRcRFQ=="
+			"resolved": "https://registry.npmmirror.com/is-browser/-/is-browser-2.1.0.tgz",
+			"integrity": "sha512-F5rTJxDQ2sW81fcfOR1GnCXT6sVJC104fCyfj+mjpwNEwaPYSn5fte5jiHmBg3DHsIoL/l8Kvw5VN5SsTRcRFQ==",
+			"license": "MIT"
 		},
 		"node_modules/is-buffer": {
 			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-		},
-		"node_modules/is-builtin-module": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
-			"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-			"dev": true,
-			"dependencies": {
-				"builtin-modules": "^3.3.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
+			"resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+			"license": "MIT"
 		},
 		"node_modules/is-callable": {
 			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+			"resolved": "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz",
 			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -6050,11 +6270,15 @@
 			}
 		},
 		"node_modules/is-core-module": {
-			"version": "2.13.1",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-			"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+			"version": "2.15.1",
+			"resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.15.1.tgz",
+			"integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+			"license": "MIT",
 			"dependencies": {
-				"hasown": "^2.0.0"
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -6062,17 +6286,19 @@
 		},
 		"node_modules/is-extglob": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
 			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-finite": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-finite/-/is-finite-1.1.0.tgz",
 			"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			},
@@ -6082,26 +6308,29 @@
 		},
 		"node_modules/is-firefox": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-firefox/-/is-firefox-1.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/is-firefox/-/is-firefox-1.0.3.tgz",
 			"integrity": "sha512-6Q9ITjvWIm0Xdqv+5U12wgOKEM2KoBw4Y926m0OFkvlCxnbG94HKAsVz8w3fWcfAS5YA2fJORXX1dLrkprCCxA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/is-generator-function": {
 			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+			"resolved": "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.0.10.tgz",
 			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"has-tostringtag": "^1.0.0"
 			},
@@ -6114,9 +6343,10 @@
 		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
 			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"is-extglob": "^2.1.1"
 			},
@@ -6126,17 +6356,19 @@
 		},
 		"node_modules/is-iexplorer": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-iexplorer/-/is-iexplorer-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-iexplorer/-/is-iexplorer-1.0.0.tgz",
 			"integrity": "sha512-YeLzceuwg3K6O0MLM3UyUUjKAlyULetwryFp1mHy1I5PfArK0AEqlfa+MR4gkJjcbuJXoDJCvXbyqZVf5CR2Sg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-ip": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-ip/-/is-ip-2.0.0.tgz",
 			"integrity": "sha512-9MTn0dteHETtyUx8pxqMwg5hMBi3pvlyglJ+b79KOCca0po23337LbVV2Hl4xmMvfw++ljnO0/+5G6G+0Szh6g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"ip-regex": "^2.0.0"
 			},
@@ -6146,14 +6378,16 @@
 		},
 		"node_modules/is-mobile": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-4.0.0.tgz",
-			"integrity": "sha512-mlcHZA84t1qLSuWkt2v0I2l61PYdyQDt4aG1mLIXF5FDMm4+haBCxCPYSr/uwqQNRk1MiTizn0ypEuRAOLRAew=="
+			"resolved": "https://registry.npmmirror.com/is-mobile/-/is-mobile-4.0.0.tgz",
+			"integrity": "sha512-mlcHZA84t1qLSuWkt2v0I2l61PYdyQDt4aG1mLIXF5FDMm4+haBCxCPYSr/uwqQNRk1MiTizn0ypEuRAOLRAew==",
+			"license": "MIT"
 		},
 		"node_modules/is-nan": {
 			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
+			"resolved": "https://registry.npmmirror.com/is-nan/-/is-nan-1.3.2.tgz",
 			"integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3"
@@ -6167,43 +6401,48 @@
 		},
 		"node_modules/is-number": {
 			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.12.0"
 			}
 		},
 		"node_modules/is-obj": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/is-obj/-/is-obj-1.0.1.tgz",
 			"integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-path-inside": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/is-path-inside/-/is-path-inside-3.0.3.tgz",
 			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/is-plain-obj": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
 			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-plain-object": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"isobject": "^3.0.1"
 			},
@@ -6213,21 +6452,24 @@
 		},
 		"node_modules/is-string-blank": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-string-blank/-/is-string-blank-1.0.1.tgz",
-			"integrity": "sha512-9H+ZBCVs3L9OYqv8nuUAzpcT9OTgMD1yAWrG7ihlnibdkbtB850heAmYWxHuXc4CHy4lKeK69tN+ny1K7gBIrw=="
+			"resolved": "https://registry.npmmirror.com/is-string-blank/-/is-string-blank-1.0.1.tgz",
+			"integrity": "sha512-9H+ZBCVs3L9OYqv8nuUAzpcT9OTgMD1yAWrG7ihlnibdkbtB850heAmYWxHuXc4CHy4lKeK69tN+ny1K7gBIrw==",
+			"license": "MIT"
 		},
 		"node_modules/is-svg-path": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-svg-path/-/is-svg-path-1.0.2.tgz",
-			"integrity": "sha512-Lj4vePmqpPR1ZnRctHv8ltSh1OrSxHkhUkd7wi+VQdcdP15/KvQFyk7LhNuM7ZW0EVbJz8kZLVmL9quLrfq4Kg=="
+			"resolved": "https://registry.npmmirror.com/is-svg-path/-/is-svg-path-1.0.2.tgz",
+			"integrity": "sha512-Lj4vePmqpPR1ZnRctHv8ltSh1OrSxHkhUkd7wi+VQdcdP15/KvQFyk7LhNuM7ZW0EVbJz8kZLVmL9quLrfq4Kg==",
+			"license": "MIT"
 		},
 		"node_modules/is-typed-array": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-			"integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.13.tgz",
+			"integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"which-typed-array": "^1.1.11"
+				"which-typed-array": "^1.1.14"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -6238,9 +6480,10 @@
 		},
 		"node_modules/is-unicode-supported": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
 			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -6250,29 +6493,33 @@
 		},
 		"node_modules/isarray": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+			"resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+			"license": "MIT"
 		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
 			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/isobject": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
 			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/jest-worker": {
 			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+			"resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
 			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/node": "*",
 				"merge-stream": "^2.0.0",
@@ -6282,20 +6529,12 @@
 				"node": ">= 10.13.0"
 			}
 		},
-		"node_modules/jest-worker/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/jest-worker/node_modules/supports-color": {
 			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -6308,14 +6547,16 @@
 		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+			"resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -6325,48 +6566,67 @@
 		},
 		"node_modules/jsdoc-type-pratt-parser": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
 			"integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=12.0.0"
 			}
 		},
+		"node_modules/jsesc": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-3.0.2.tgz",
+			"integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+			"license": "MIT",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/json-buffer/-/json-buffer-3.0.1.tgz",
 			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+			"resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"license": "MIT"
 		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
 			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/jsonschema": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/jsonschema/-/jsonschema-1.4.1.tgz",
 			"integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/jsonwebtoken": {
 			"version": "9.0.2",
-			"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
 			"integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+			"license": "MIT",
 			"dependencies": {
 				"jws": "^3.2.2",
 				"lodash.includes": "^4.3.0",
@@ -6386,14 +6646,16 @@
 		},
 		"node_modules/just-extend": {
 			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/just-extend/-/just-extend-6.2.0.tgz",
 			"integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/jwa": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/jwa/-/jwa-1.4.1.tgz",
 			"integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+			"license": "MIT",
 			"dependencies": {
 				"buffer-equal-constant-time": "1.0.1",
 				"ecdsa-sig-formatter": "1.0.11",
@@ -6402,8 +6664,9 @@
 		},
 		"node_modules/jws": {
 			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+			"resolved": "https://registry.npmmirror.com/jws/-/jws-3.2.2.tgz",
 			"integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+			"license": "MIT",
 			"dependencies": {
 				"jwa": "^1.4.1",
 				"safe-buffer": "^5.0.1"
@@ -6411,32 +6674,36 @@
 		},
 		"node_modules/kdbush": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz",
-			"integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="
+			"resolved": "https://registry.npmmirror.com/kdbush/-/kdbush-3.0.0.tgz",
+			"integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==",
+			"license": "ISC"
 		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
-			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+			"resolved": "https://registry.npmmirror.com/keyv/-/keyv-4.5.4.tgz",
 			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"json-buffer": "3.0.1"
 			}
 		},
 		"node_modules/kind-of": {
 			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
 			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/levn": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz",
 			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"prelude-ls": "^1.2.1",
 				"type-check": "~0.4.0"
@@ -6447,23 +6714,26 @@
 		},
 		"node_modules/lines-and-columns": {
 			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+			"resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+			"license": "MIT"
 		},
 		"node_modules/loader-runner": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
 			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.11.5"
 			}
 		},
 		"node_modules/locate-path": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-6.0.0.tgz",
 			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"p-locate": "^5.0.0"
 			},
@@ -6476,14 +6746,16 @@
 		},
 		"node_modules/lodash": {
 			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+			"resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+			"license": "MIT"
 		},
 		"node_modules/lodash-webpack-plugin": {
 			"version": "0.11.6",
-			"resolved": "https://registry.npmjs.org/lodash-webpack-plugin/-/lodash-webpack-plugin-0.11.6.tgz",
+			"resolved": "https://registry.npmmirror.com/lodash-webpack-plugin/-/lodash-webpack-plugin-0.11.6.tgz",
 			"integrity": "sha512-nsHN/+IxZK/C425vGC8pAxkKJ8KQH2+NJnhDul14zYNWr6HJcA95w+oRR7Cp0oZpOdMplDZXmjVROp8prPk7ig==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"lodash": "^4.17.20"
 			},
@@ -6493,60 +6765,71 @@
 		},
 		"node_modules/lodash.debounce": {
 			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+			"resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.get": {
 			"version": "4.4.2",
-			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+			"resolved": "https://registry.npmmirror.com/lodash.get/-/lodash.get-4.4.2.tgz",
 			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/lodash.includes": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-			"integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
+			"resolved": "https://registry.npmmirror.com/lodash.includes/-/lodash.includes-4.3.0.tgz",
+			"integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.isboolean": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-			"integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
+			"resolved": "https://registry.npmmirror.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+			"integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.isinteger": {
 			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-			"integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
+			"resolved": "https://registry.npmmirror.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+			"integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.isnumber": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-			"integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
+			"resolved": "https://registry.npmmirror.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+			"integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.isplainobject": {
 			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-			"integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
+			"resolved": "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+			"integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.isstring": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-			"integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+			"resolved": "https://registry.npmmirror.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+			"integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+			"resolved": "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+			"license": "MIT"
 		},
 		"node_modules/lodash.once": {
 			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-			"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
+			"resolved": "https://registry.npmmirror.com/lodash.once/-/lodash.once-4.1.1.tgz",
+			"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+			"license": "MIT"
 		},
 		"node_modules/log-symbols": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/log-symbols/-/log-symbols-4.1.0.tgz",
 			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"chalk": "^4.1.0",
 				"is-unicode-supported": "^0.1.0"
@@ -6558,80 +6841,11 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/log-symbols/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/log-symbols/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/log-symbols/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/log-symbols/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/log-symbols/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/log-symbols/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/loose-envify": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz",
 			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+			"license": "MIT",
 			"dependencies": {
 				"js-tokens": "^3.0.0 || ^4.0.0"
 			},
@@ -6641,25 +6855,28 @@
 		},
 		"node_modules/loupe": {
 			"version": "2.3.7",
-			"resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+			"resolved": "https://registry.npmmirror.com/loupe/-/loupe-2.3.7.tgz",
 			"integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"get-func-name": "^2.0.1"
 			}
 		},
 		"node_modules/make-event-props": {
 			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/make-event-props/-/make-event-props-1.6.2.tgz",
+			"resolved": "https://registry.npmmirror.com/make-event-props/-/make-event-props-1.6.2.tgz",
 			"integrity": "sha512-iDwf7mA03WPiR8QxvcVHmVWEPfMY1RZXerDVNCRYW7dUr2ppH3J58Rwb39/WG39yTZdRSxr3x+2v22tvI0VEvA==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/make-event-props?sponsor=1"
 			}
 		},
 		"node_modules/map-age-cleaner": {
 			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
 			"integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+			"license": "MIT",
 			"dependencies": {
 				"p-defer": "^1.0.0"
 			},
@@ -6669,24 +6886,27 @@
 		},
 		"node_modules/map-limit": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/map-limit/-/map-limit-0.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/map-limit/-/map-limit-0.0.1.tgz",
 			"integrity": "sha512-pJpcfLPnIF/Sk3taPW21G/RQsEEirGaFpCW3oXRwH9dnFHPHNGjNyvh++rdmC2fNqEaTw2MhYJraoJWAHx8kEg==",
+			"license": "MIT",
 			"dependencies": {
 				"once": "~1.3.0"
 			}
 		},
 		"node_modules/map-limit/node_modules/once": {
 			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+			"resolved": "https://registry.npmmirror.com/once/-/once-1.3.3.tgz",
 			"integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==",
+			"license": "ISC",
 			"dependencies": {
 				"wrappy": "1"
 			}
 		},
 		"node_modules/mapbox-gl": {
 			"version": "1.13.3",
-			"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.3.tgz",
+			"resolved": "https://registry.npmmirror.com/mapbox-gl/-/mapbox-gl-1.13.3.tgz",
 			"integrity": "sha512-p8lJFEiqmEQlyv+DQxFAOG/XPWN0Wp7j/Psq93Zywz7qt9CcUKFYDBOoOEKzqe6gudHVJY8/Bhqw6VDpX2lSBg==",
+			"license": "SEE LICENSE IN LICENSE.txt",
 			"peer": true,
 			"dependencies": {
 				"@mapbox/geojson-rewind": "^0.5.2",
@@ -6718,16 +6938,18 @@
 		},
 		"node_modules/math-log2": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/math-log2/-/math-log2-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/math-log2/-/math-log2-1.0.1.tgz",
 			"integrity": "sha512-9W0yGtkaMAkf74XGYVy4Dqw3YUMnTNB2eeiw9aQbUl4A3KmuCEHTt2DgAB07ENzOYAjsYSAYufkAq0Zd+jU7zA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/md5": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
 			"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"charenc": "0.0.2",
 				"crypt": "0.0.2",
@@ -6736,9 +6958,10 @@
 		},
 		"node_modules/md5.js": {
 			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+			"resolved": "https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz",
 			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"hash-base": "^3.0.0",
 				"inherits": "^2.0.1",
@@ -6747,16 +6970,18 @@
 		},
 		"node_modules/media-typer": {
 			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
 			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/mem": {
 			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/mem/-/mem-8.1.1.tgz",
 			"integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
+			"license": "MIT",
 			"dependencies": {
 				"map-age-cleaner": "^0.1.3",
 				"mimic-fn": "^3.1.0"
@@ -6770,44 +6995,50 @@
 		},
 		"node_modules/memoize-one": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
-			"integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+			"resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz",
+			"integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
+			"license": "MIT"
 		},
 		"node_modules/merge-descriptors": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+			"resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+			"license": "MIT"
 		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
 			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/merge2": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
 			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 8"
 			}
 		},
 		"node_modules/methods": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
 			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+			"version": "4.0.8",
+			"resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"braces": "^3.0.2",
+				"braces": "^3.0.3",
 				"picomatch": "^2.3.1"
 			},
 			"engines": {
@@ -6816,9 +7047,10 @@
 		},
 		"node_modules/miller-rabin": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/miller-rabin/-/miller-rabin-4.0.1.tgz",
 			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.0.0",
 				"brorand": "^1.0.1"
@@ -6828,15 +7060,17 @@
 			}
 		},
 		"node_modules/miller-rabin/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true
+			"version": "4.12.1",
+			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/mime": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
 			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"license": "MIT",
 			"bin": {
 				"mime": "cli.js"
 			},
@@ -6846,16 +7080,18 @@
 		},
 		"node_modules/mime-db": {
 			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
 			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/mime-types": {
 			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
 			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"license": "MIT",
 			"dependencies": {
 				"mime-db": "1.52.0"
 			},
@@ -6865,56 +7101,66 @@
 		},
 		"node_modules/mimic-fn": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-3.1.0.tgz",
 			"integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/minimalistic-assert": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/minimalistic-crypto-utils": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
 			"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"version": "9.0.3",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.3.tgz",
+			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"brace-expansion": "^1.1.7"
+				"brace-expansion": "^2.0.1"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/minimist": {
 			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
 			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/mixme": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/mixme/-/mixme-0.5.9.tgz",
-			"integrity": "sha512-VC5fg6ySUscaWUpI4gxCBTQMH2RdUpNrk+MsbpCYtIvf9SBJdiUey4qE7BXviJsJR4nDQxCZ+3yaYNW3guz/Pw==",
+			"version": "0.5.10",
+			"resolved": "https://registry.npmmirror.com/mixme/-/mixme-0.5.10.tgz",
+			"integrity": "sha512-5H76ANWinB1H3twpJ6JY8uvAtpmFvHNArpilJAjXRKXSDDLPIMoZArw5SH0q9z+lLs8IrMw7Q2VWpWimFKFT1Q==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 8.0.0"
 			}
 		},
 		"node_modules/mkdirp": {
 			"version": "0.5.6",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+			"resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
 			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+			"license": "MIT",
 			"dependencies": {
 				"minimist": "^1.2.6"
 			},
@@ -6924,9 +7170,10 @@
 		},
 		"node_modules/mocha": {
 			"version": "10.4.0",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/mocha/-/mocha-10.4.0.tgz",
 			"integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"ansi-colors": "4.1.1",
 				"browser-stdout": "1.3.1",
@@ -6957,51 +7204,37 @@
 				"node": ">= 14.0.0"
 			}
 		},
-		"node_modules/mocha/node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/mocha/node_modules/glob": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-			"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+		"node_modules/mocha/node_modules/debug": {
+			"version": "4.3.4",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz",
+			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^5.0.1",
-				"once": "^1.3.0"
+				"ms": "2.1.2"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=6.0"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
 			}
 		},
-		"node_modules/mocha/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+		"node_modules/mocha/node_modules/debug/node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
 			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
+			"license": "MIT"
 		},
 		"node_modules/mocha/node_modules/minimatch": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.0.1.tgz",
 			"integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -7009,26 +7242,12 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-			"dev": true,
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/mocha/node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true
-		},
 		"node_modules/mocha/node_modules/supports-color": {
 			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -7041,16 +7260,18 @@
 		},
 		"node_modules/moment": {
 			"version": "2.30.1",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+			"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
 			"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/moment-timezone": {
-			"version": "0.5.45",
-			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
-			"integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+			"version": "0.5.46",
+			"resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.46.tgz",
+			"integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
+			"license": "MIT",
 			"dependencies": {
 				"moment": "^2.29.4"
 			},
@@ -7060,8 +7281,9 @@
 		},
 		"node_modules/morgan": {
 			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+			"resolved": "https://registry.npmmirror.com/morgan/-/morgan-1.10.0.tgz",
 			"integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+			"license": "MIT",
 			"dependencies": {
 				"basic-auth": "~2.0.1",
 				"debug": "2.6.9",
@@ -7075,21 +7297,24 @@
 		},
 		"node_modules/morgan/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/morgan/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/morgan/node_modules/on-finished": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz",
 			"integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+			"license": "MIT",
 			"dependencies": {
 				"ee-first": "1.1.1"
 			},
@@ -7099,26 +7324,30 @@
 		},
 		"node_modules/mouse-change": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/mouse-change/-/mouse-change-1.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/mouse-change/-/mouse-change-1.4.0.tgz",
 			"integrity": "sha512-vpN0s+zLL2ykyyUDh+fayu9Xkor5v/zRD9jhSqjRS1cJTGS0+oakVZzNm5n19JvvEj0you+MXlYTpNxUDQUjkQ==",
+			"license": "MIT",
 			"dependencies": {
 				"mouse-event": "^1.0.0"
 			}
 		},
 		"node_modules/mouse-event": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/mouse-event/-/mouse-event-1.0.5.tgz",
-			"integrity": "sha512-ItUxtL2IkeSKSp9cyaX2JLUuKk2uMoxBg4bbOWVd29+CskYJR9BGsUqtXenNzKbnDshvupjUewDIYVrOB6NmGw=="
+			"resolved": "https://registry.npmmirror.com/mouse-event/-/mouse-event-1.0.5.tgz",
+			"integrity": "sha512-ItUxtL2IkeSKSp9cyaX2JLUuKk2uMoxBg4bbOWVd29+CskYJR9BGsUqtXenNzKbnDshvupjUewDIYVrOB6NmGw==",
+			"license": "MIT"
 		},
 		"node_modules/mouse-event-offset": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/mouse-event-offset/-/mouse-event-offset-3.0.2.tgz",
-			"integrity": "sha512-s9sqOs5B1Ykox3Xo8b3Ss2IQju4UwlW6LSR+Q5FXWpprJ5fzMLefIIItr3PH8RwzfGy6gxs/4GAmiNuZScE25w=="
+			"resolved": "https://registry.npmmirror.com/mouse-event-offset/-/mouse-event-offset-3.0.2.tgz",
+			"integrity": "sha512-s9sqOs5B1Ykox3Xo8b3Ss2IQju4UwlW6LSR+Q5FXWpprJ5fzMLefIIItr3PH8RwzfGy6gxs/4GAmiNuZScE25w==",
+			"license": "MIT"
 		},
 		"node_modules/mouse-wheel": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/mouse-wheel/-/mouse-wheel-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/mouse-wheel/-/mouse-wheel-1.2.0.tgz",
 			"integrity": "sha512-+OfYBiUOCTWcTECES49neZwL5AoGkXE+lFjIvzwNCnYRlso+EnfvovcBxGoyQ0yQt806eSPjS675K0EwWknXmw==",
+			"license": "MIT",
 			"dependencies": {
 				"right-now": "^1.0.0",
 				"signum": "^1.0.0",
@@ -7126,14 +7355,16 @@
 			}
 		},
 		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+			"version": "2.1.3",
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"license": "MIT"
 		},
 		"node_modules/multer": {
 			"version": "1.4.5-lts.1",
-			"resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz",
+			"resolved": "https://registry.npmmirror.com/multer/-/multer-1.4.5-lts.1.tgz",
 			"integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==",
+			"license": "MIT",
 			"dependencies": {
 				"append-field": "^1.0.0",
 				"busboy": "^1.0.0",
@@ -7149,33 +7380,57 @@
 		},
 		"node_modules/mumath": {
 			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/mumath/-/mumath-3.3.4.tgz",
+			"resolved": "https://registry.npmmirror.com/mumath/-/mumath-3.3.4.tgz",
 			"integrity": "sha512-VAFIOG6rsxoc7q/IaY3jdjmrsuX9f15KlRLYTHmixASBZkZEKC1IFqE2BC5CdhXmK6WLM1Re33z//AGmeRI6FA==",
 			"deprecated": "Redundant dependency in your project.",
+			"license": "Unlicense",
 			"dependencies": {
 				"almost-equal": "^1.1.0"
 			}
 		},
 		"node_modules/murmurhash-js": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
-			"integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="
+			"resolved": "https://registry.npmmirror.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
+			"integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==",
+			"license": "MIT"
+		},
+		"node_modules/nanoid": {
+			"version": "3.3.8",
+			"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.8.tgz",
+			"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
 		},
 		"node_modules/native-promise-only": {
 			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
-			"integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg=="
+			"resolved": "https://registry.npmmirror.com/native-promise-only/-/native-promise-only-0.8.1.tgz",
+			"integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==",
+			"license": "MIT"
 		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz",
 			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/needle": {
 			"version": "2.9.1",
-			"resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+			"resolved": "https://registry.npmmirror.com/needle/-/needle-2.9.1.tgz",
 			"integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
+			"license": "MIT",
 			"dependencies": {
 				"debug": "^3.2.6",
 				"iconv-lite": "^0.4.4",
@@ -7190,73 +7445,96 @@
 		},
 		"node_modules/needle/node_modules/debug": {
 			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz",
 			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "^2.1.1"
 			}
 		},
 		"node_modules/negotiator": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+			"resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
 			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/neo-async": {
 			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+			"resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
 			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/next-tick": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+			"resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz",
+			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+			"license": "ISC"
 		},
 		"node_modules/ngraph.events": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/ngraph.events/-/ngraph.events-1.2.2.tgz",
-			"integrity": "sha512-JsUbEOzANskax+WSYiAPETemLWYXmixuPAlmZmhIbIj6FH/WDgEGCGnRwUQBK0GjOnVm8Ui+e5IJ+5VZ4e32eQ=="
+			"resolved": "https://registry.npmmirror.com/ngraph.events/-/ngraph.events-1.2.2.tgz",
+			"integrity": "sha512-JsUbEOzANskax+WSYiAPETemLWYXmixuPAlmZmhIbIj6FH/WDgEGCGnRwUQBK0GjOnVm8Ui+e5IJ+5VZ4e32eQ==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/ngraph.graph": {
 			"version": "20.0.1",
-			"resolved": "https://registry.npmjs.org/ngraph.graph/-/ngraph.graph-20.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/ngraph.graph/-/ngraph.graph-20.0.1.tgz",
 			"integrity": "sha512-VFsQ+EMkT+7lcJO1QP8Ik3w64WbHJl27Q53EO9hiFU9CRyxJ8HfcXtfWz/U8okuoYKDctbciL6pX3vG5dt1rYA==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"ngraph.events": "^1.2.1"
 			}
 		},
 		"node_modules/ngraph.path": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/ngraph.path/-/ngraph.path-1.5.0.tgz",
-			"integrity": "sha512-2IdmqfBYq2zbGHtpmskdWF6x/nIWZkhfs1taMgg2waBJRn4xNqe7gBiRtD1YS5ZcKhp0trK+Gw94Rli2emMs1Q=="
+			"resolved": "https://registry.npmmirror.com/ngraph.path/-/ngraph.path-1.5.0.tgz",
+			"integrity": "sha512-2IdmqfBYq2zbGHtpmskdWF6x/nIWZkhfs1taMgg2waBJRn4xNqe7gBiRtD1YS5ZcKhp0trK+Gw94Rli2emMs1Q==",
+			"license": "MIT"
 		},
 		"node_modules/nise": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/nise/-/nise-6.0.0.tgz",
-			"integrity": "sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmmirror.com/nise/-/nise-6.1.1.tgz",
+			"integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"@sinonjs/commons": "^3.0.0",
-				"@sinonjs/fake-timers": "^11.2.2",
-				"@sinonjs/text-encoding": "^0.7.2",
+				"@sinonjs/commons": "^3.0.1",
+				"@sinonjs/fake-timers": "^13.0.1",
+				"@sinonjs/text-encoding": "^0.7.3",
 				"just-extend": "^6.2.0",
-				"path-to-regexp": "^6.2.1"
+				"path-to-regexp": "^8.1.0"
+			}
+		},
+		"node_modules/nise/node_modules/@sinonjs/fake-timers": {
+			"version": "13.0.5",
+			"resolved": "https://registry.npmmirror.com/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+			"integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@sinonjs/commons": "^3.0.1"
 			}
 		},
 		"node_modules/nise/node_modules/path-to-regexp": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
-			"integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
-			"dev": true
+			"version": "8.2.0",
+			"resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+			"integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=16"
+			}
 		},
 		"node_modules/node-polyfill-webpack-plugin": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz",
+			"resolved": "https://registry.npmmirror.com/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz",
 			"integrity": "sha512-Z0XTKj1wRWO8o/Vjobsw5iOJCN+Sua3EZEUc2Ziy9CyVvmHKu6o+t4gUH9GOE0czyPR94LI6ZCV/PpcM8b5yow==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"assert": "^2.0.0",
 				"browserify-zlib": "^0.2.0",
@@ -7292,9 +7570,10 @@
 		},
 		"node_modules/node-polyfill-webpack-plugin/node_modules/readable-stream": {
 			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -7305,24 +7584,27 @@
 			}
 		},
 		"node_modules/node-releases": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-			"dev": true
+			"version": "2.0.18",
+			"resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.18.tgz",
+			"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/nodemailer": {
-			"version": "6.9.13",
-			"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.13.tgz",
-			"integrity": "sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==",
+			"version": "6.9.16",
+			"resolved": "https://registry.npmmirror.com/nodemailer/-/nodemailer-6.9.16.tgz",
+			"integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==",
+			"license": "MIT-0",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/nodemon": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.1.tgz",
-			"integrity": "sha512-k43xGaDtaDIcufn0Fc6fTtsdKSkV/hQzoQFigNH//GaKta28yoKVYXCnV+KXRqfT/YzsFaQU9VdeEG+HEyxr6A==",
+			"version": "3.1.7",
+			"resolved": "https://registry.npmmirror.com/nodemon/-/nodemon-3.1.7.tgz",
+			"integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"chokidar": "^3.5.2",
 				"debug": "^4",
@@ -7346,39 +7628,74 @@
 				"url": "https://opencollective.com/nodemon"
 			}
 		},
-		"node_modules/nopt": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-			"integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
+		"node_modules/nodemon/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/nodemon/node_modules/has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/nodemon/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/nodemon/node_modules/supports-color": {
+			"version": "5.5.0",
+			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"abbrev": "1"
-			},
-			"bin": {
-				"nopt": "bin/nopt.js"
+				"has-flag": "^3.0.0"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">=4"
 			}
 		},
 		"node_modules/normalize-path": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
 			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/normalize-svg-path": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/normalize-svg-path/-/normalize-svg-path-0.1.0.tgz",
-			"integrity": "sha512-1/kmYej2iedi5+ROxkRESL/pI02pkg0OBnaR4hJkSIX6+ORzepwbuUXfrdZaPjysTsJInj0Rj5NuX027+dMBvA=="
+			"resolved": "https://registry.npmmirror.com/normalize-svg-path/-/normalize-svg-path-0.1.0.tgz",
+			"integrity": "sha512-1/kmYej2iedi5+ROxkRESL/pI02pkg0OBnaR4hJkSIX6+ORzepwbuUXfrdZaPjysTsJInj0Rj5NuX027+dMBvA==",
+			"license": "MIT"
 		},
 		"node_modules/number-is-integer": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-integer/-/number-is-integer-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/number-is-integer/-/number-is-integer-1.0.1.tgz",
 			"integrity": "sha512-Dq3iuiFBkrbmuQjGFFF3zckXNCQoSD37/SdSbgcBailUx6knDvDwb5CympBgcoWHy36sfS12u74MHYkXyHq6bg==",
+			"license": "MIT",
 			"dependencies": {
 				"is-finite": "^1.0.1"
 			},
@@ -7388,28 +7705,34 @@
 		},
 		"node_modules/object-assign": {
 			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
 			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/object-inspect": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-			"integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+			"version": "1.13.3",
+			"resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.3.tgz",
+			"integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/object-is": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+			"version": "1.1.6",
+			"resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.6.tgz",
+			"integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3"
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -7420,21 +7743,23 @@
 		},
 		"node_modules/object-keys": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
 			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			}
 		},
 		"node_modules/object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+			"version": "4.1.5",
+			"resolved": "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.5.tgz",
+			"integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
+				"call-bind": "^1.0.5",
+				"define-properties": "^1.2.1",
 				"has-symbols": "^1.0.3",
 				"object-keys": "^1.1.1"
 			},
@@ -7447,8 +7772,9 @@
 		},
 		"node_modules/on-finished": {
 			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz",
 			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+			"license": "MIT",
 			"dependencies": {
 				"ee-first": "1.1.1"
 			},
@@ -7458,32 +7784,35 @@
 		},
 		"node_modules/on-headers": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/on-headers/-/on-headers-1.0.2.tgz",
 			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/once": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz",
 			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+			"license": "ISC",
 			"dependencies": {
 				"wrappy": "1"
 			}
 		},
 		"node_modules/optionator": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-			"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+			"version": "0.9.4",
+			"resolved": "https://registry.npmmirror.com/optionator/-/optionator-0.9.4.tgz",
+			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@aashutoshrathi/word-wrap": "^1.2.3",
 				"deep-is": "^0.1.3",
 				"fast-levenshtein": "^2.0.6",
 				"levn": "^0.4.1",
 				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0"
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.5"
 			},
 			"engines": {
 				"node": ">= 0.8.0"
@@ -7491,23 +7820,26 @@
 		},
 		"node_modules/os-browserify": {
 			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/os-browserify/-/os-browserify-0.3.0.tgz",
 			"integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/p-defer": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/p-defer/-/p-defer-1.0.0.tgz",
 			"integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/p-limit": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz",
 			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"yocto-queue": "^0.1.0"
 			},
@@ -7520,9 +7852,10 @@
 		},
 		"node_modules/p-locate": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz",
 			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"p-limit": "^3.0.2"
 			},
@@ -7535,23 +7868,26 @@
 		},
 		"node_modules/p-try": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
 			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/pako": {
 			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+			"resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
 			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-			"dev": true
+			"dev": true,
+			"license": "(MIT AND Zlib)"
 		},
 		"node_modules/parent-module": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz",
 			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"license": "MIT",
 			"dependencies": {
 				"callsites": "^3.0.0"
 			},
@@ -7561,26 +7897,33 @@
 		},
 		"node_modules/parenthesis": {
 			"version": "3.1.8",
-			"resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.8.tgz",
-			"integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw=="
+			"resolved": "https://registry.npmmirror.com/parenthesis/-/parenthesis-3.1.8.tgz",
+			"integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw==",
+			"license": "MIT"
 		},
 		"node_modules/parse-asn1": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+			"version": "5.1.7",
+			"resolved": "https://registry.npmmirror.com/parse-asn1/-/parse-asn1-5.1.7.tgz",
+			"integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"asn1.js": "^5.2.0",
-				"browserify-aes": "^1.0.0",
-				"evp_bytestokey": "^1.0.0",
-				"pbkdf2": "^3.0.3",
-				"safe-buffer": "^5.1.1"
+				"asn1.js": "^4.10.1",
+				"browserify-aes": "^1.2.0",
+				"evp_bytestokey": "^1.0.3",
+				"hash-base": "~3.0",
+				"pbkdf2": "^3.1.2",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/parse-json": {
 			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
 			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/code-frame": "^7.0.0",
 				"error-ex": "^1.3.1",
@@ -7596,94 +7939,107 @@
 		},
 		"node_modules/parse-rect": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/parse-rect/-/parse-rect-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/parse-rect/-/parse-rect-1.2.0.tgz",
 			"integrity": "sha512-4QZ6KYbnE6RTwg9E0HpLchUM9EZt6DnDxajFZZDSV4p/12ZJEvPO702DZpGvRYEPo00yKDys7jASi+/w7aO8LA==",
+			"license": "MIT",
 			"dependencies": {
 				"pick-by-alias": "^1.2.0"
 			}
 		},
 		"node_modules/parse-svg-path": {
 			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz",
-			"integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ=="
+			"resolved": "https://registry.npmmirror.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz",
+			"integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==",
+			"license": "MIT"
 		},
 		"node_modules/parse-unit": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parse-unit/-/parse-unit-1.0.1.tgz",
-			"integrity": "sha512-hrqldJHokR3Qj88EIlV/kAyAi/G5R2+R56TBANxNMy0uPlYcttx0jnMW6Yx5KsKPSbC3KddM/7qQm3+0wEXKxg=="
+			"resolved": "https://registry.npmmirror.com/parse-unit/-/parse-unit-1.0.1.tgz",
+			"integrity": "sha512-hrqldJHokR3Qj88EIlV/kAyAi/G5R2+R56TBANxNMy0uPlYcttx0jnMW6Yx5KsKPSbC3KddM/7qQm3+0wEXKxg==",
+			"license": "MIT"
 		},
 		"node_modules/parseurl": {
 			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+			"resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",
 			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/path-browserify": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/path-browserify/-/path-browserify-1.0.1.tgz",
 			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/path-exists": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/path-key": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/path-parse": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+			"resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"license": "MIT"
 		},
 		"node_modules/path-to-regexp": {
 			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+			"resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+			"license": "MIT"
 		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/pathval": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/pathval/-/pathval-1.1.1.tgz",
 			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/pbf": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
-			"integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmmirror.com/pbf/-/pbf-3.3.0.tgz",
+			"integrity": "sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"ieee754": "^1.1.12",
 				"resolve-protobuf-schema": "^2.1.0"
@@ -7694,9 +8050,10 @@
 		},
 		"node_modules/pbkdf2": {
 			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/pbkdf2/-/pbkdf2-3.1.2.tgz",
 			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"create-hash": "^1.1.2",
 				"create-hmac": "^1.1.4",
@@ -7710,13 +8067,15 @@
 		},
 		"node_modules/performance-now": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+			"resolved": "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz",
+			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+			"license": "MIT"
 		},
 		"node_modules/pg": {
 			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/pg/-/pg-8.12.0.tgz",
+			"resolved": "https://registry.npmmirror.com/pg/-/pg-8.12.0.tgz",
 			"integrity": "sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==",
+			"license": "MIT",
 			"dependencies": {
 				"pg-connection-string": "^2.6.4",
 				"pg-pool": "^3.6.2",
@@ -7741,43 +8100,49 @@
 		},
 		"node_modules/pg-cloudflare": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
 			"integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
+			"license": "MIT",
 			"optional": true
 		},
 		"node_modules/pg-connection-string": {
-			"version": "2.6.4",
-			"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz",
-			"integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA=="
+			"version": "2.7.0",
+			"resolved": "https://registry.npmmirror.com/pg-connection-string/-/pg-connection-string-2.7.0.tgz",
+			"integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==",
+			"license": "MIT"
 		},
 		"node_modules/pg-int8": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/pg-int8/-/pg-int8-1.0.1.tgz",
 			"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+			"license": "ISC",
 			"engines": {
 				"node": ">=4.0.0"
 			}
 		},
 		"node_modules/pg-minify": {
 			"version": "1.6.4",
-			"resolved": "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.4.tgz",
+			"resolved": "https://registry.npmmirror.com/pg-minify/-/pg-minify-1.6.4.tgz",
 			"integrity": "sha512-cf6hBt1YqzqPX0OznXKSv4U7e4o7eUU4zp2zQsbJ+4OCNNr7EnnAVWkIz4k0dv6UN4ouS1ZL4WlXxCrZHHl69g==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=14.0.0"
 			}
 		},
 		"node_modules/pg-pool": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.2.tgz",
-			"integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==",
+			"version": "3.7.0",
+			"resolved": "https://registry.npmmirror.com/pg-pool/-/pg-pool-3.7.0.tgz",
+			"integrity": "sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==",
+			"license": "MIT",
 			"peerDependencies": {
 				"pg": ">=8.0"
 			}
 		},
 		"node_modules/pg-promise": {
 			"version": "11.8.0",
-			"resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-11.8.0.tgz",
+			"resolved": "https://registry.npmmirror.com/pg-promise/-/pg-promise-11.8.0.tgz",
 			"integrity": "sha512-w9hTFpkM4FByJTJ7KCWLtZSOtQa2BKC+XIV8+3ZvDlfYfBYdz8V4V+BttnqhUPY/d12Itug7Bft4XdILihsY+w==",
+			"license": "MIT",
 			"dependencies": {
 				"assert-options": "0.8.1",
 				"pg": "8.11.5",
@@ -7790,8 +8155,9 @@
 		},
 		"node_modules/pg-promise/node_modules/pg": {
 			"version": "8.11.5",
-			"resolved": "https://registry.npmjs.org/pg/-/pg-8.11.5.tgz",
+			"resolved": "https://registry.npmmirror.com/pg/-/pg-8.11.5.tgz",
 			"integrity": "sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==",
+			"license": "MIT",
 			"dependencies": {
 				"pg-connection-string": "^2.6.4",
 				"pg-pool": "^3.6.2",
@@ -7815,14 +8181,16 @@
 			}
 		},
 		"node_modules/pg-protocol": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz",
-			"integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg=="
+			"version": "1.7.0",
+			"resolved": "https://registry.npmmirror.com/pg-protocol/-/pg-protocol-1.7.0.tgz",
+			"integrity": "sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ==",
+			"license": "MIT"
 		},
 		"node_modules/pg-types": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/pg-types/-/pg-types-2.2.0.tgz",
 			"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+			"license": "MIT",
 			"dependencies": {
 				"pg-int8": "1.0.1",
 				"postgres-array": "~2.0.0",
@@ -7836,27 +8204,31 @@
 		},
 		"node_modules/pgpass": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/pgpass/-/pgpass-1.0.5.tgz",
 			"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+			"license": "MIT",
 			"dependencies": {
 				"split2": "^4.1.0"
 			}
 		},
 		"node_modules/pick-by-alias": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/pick-by-alias/-/pick-by-alias-1.2.0.tgz",
-			"integrity": "sha512-ESj2+eBxhGrcA1azgHs7lARG5+5iLakc/6nlfbpjcLl00HuuUOIuORhYXN4D1HfvMSKuVtFQjAlnwi1JHEeDIw=="
+			"resolved": "https://registry.npmmirror.com/pick-by-alias/-/pick-by-alias-1.2.0.tgz",
+			"integrity": "sha512-ESj2+eBxhGrcA1azgHs7lARG5+5iLakc/6nlfbpjcLl00HuuUOIuORhYXN4D1HfvMSKuVtFQjAlnwi1JHEeDIw==",
+			"license": "MIT"
 		},
 		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+			"license": "ISC"
 		},
 		"node_modules/picomatch": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
 			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8.6"
 			},
@@ -7866,9 +8238,10 @@
 		},
 		"node_modules/pkg-dir": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz",
 			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"find-up": "^4.0.0"
 			},
@@ -7878,9 +8251,10 @@
 		},
 		"node_modules/pkg-dir/node_modules/find-up": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
 			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"locate-path": "^5.0.0",
 				"path-exists": "^4.0.0"
@@ -7891,9 +8265,10 @@
 		},
 		"node_modules/pkg-dir/node_modules/locate-path": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
 			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"p-locate": "^4.1.0"
 			},
@@ -7903,9 +8278,10 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-limit": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"p-try": "^2.0.0"
 			},
@@ -7918,9 +8294,10 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-locate": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
 			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"p-limit": "^2.2.0"
 			},
@@ -7930,8 +8307,9 @@
 		},
 		"node_modules/plotly.js": {
 			"version": "2.29.1",
-			"resolved": "https://registry.npmjs.org/plotly.js/-/plotly.js-2.29.1.tgz",
+			"resolved": "https://registry.npmmirror.com/plotly.js/-/plotly.js-2.29.1.tgz",
 			"integrity": "sha512-+XirhgCh42JF/iVu/RtBRbhcs328ipinajy7hd3mnZdnQv2Th6F441DSXer5S+P0nNluNs10vAFTELo4k/icjg==",
+			"license": "MIT",
 			"dependencies": {
 				"@plotly/d3": "3.8.1",
 				"@plotly/d3-sankey": "0.7.2",
@@ -7985,20 +8363,104 @@
 				"world-calendars": "^1.0.3"
 			}
 		},
+		"node_modules/plotly.js/node_modules/d3-array": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
+			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/plotly.js/node_modules/d3-dispatch": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
+			"integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/plotly.js/node_modules/d3-force": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmmirror.com/d3-force/-/d3-force-1.2.1.tgz",
+			"integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-collection": "1",
+				"d3-dispatch": "1",
+				"d3-quadtree": "1",
+				"d3-timer": "1"
+			}
+		},
+		"node_modules/plotly.js/node_modules/d3-format": {
+			"version": "1.4.5",
+			"resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-1.4.5.tgz",
+			"integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/plotly.js/node_modules/d3-geo": {
+			"version": "1.12.1",
+			"resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-1.12.1.tgz",
+			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-array": "1"
+			}
+		},
+		"node_modules/plotly.js/node_modules/d3-hierarchy": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmmirror.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
+			"integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/plotly.js/node_modules/d3-quadtree": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmmirror.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
+			"integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/plotly.js/node_modules/d3-time": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-1.1.0.tgz",
+			"integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/plotly.js/node_modules/d3-time-format": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-2.3.0.tgz",
+			"integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-time": "1"
+			}
+		},
+		"node_modules/plotly.js/node_modules/d3-timer": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-1.0.10.tgz",
+			"integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==",
+			"license": "BSD-3-Clause"
+		},
 		"node_modules/point-in-polygon": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/point-in-polygon/-/point-in-polygon-1.1.0.tgz",
-			"integrity": "sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw=="
+			"resolved": "https://registry.npmmirror.com/point-in-polygon/-/point-in-polygon-1.1.0.tgz",
+			"integrity": "sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw==",
+			"license": "MIT"
 		},
 		"node_modules/polybooljs": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/polybooljs/-/polybooljs-1.2.0.tgz",
-			"integrity": "sha512-mKjR5nolISvF+q2BtC1fi/llpxBPTQ3wLWN8+ldzdw2Hocpc8C72ZqnamCM4Z6z+68GVVjkeM01WJegQmZ8MEQ=="
+			"version": "1.2.2",
+			"resolved": "https://registry.npmmirror.com/polybooljs/-/polybooljs-1.2.2.tgz",
+			"integrity": "sha512-ziHW/02J0XuNuUtmidBc6GXE8YohYydp3DWPWXYsd7O721TjcmN+k6ezjdwkDqep+gnWnFY+yqZHvzElra2oCg==",
+			"license": "MIT"
+		},
+		"node_modules/possible-typed-array-names": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+			"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
 		"node_modules/postcss": {
-			"version": "8.4.31",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-			"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+			"version": "8.4.49",
+			"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.49.tgz",
+			"integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
 			"dev": true,
 			"funding": [
 				{
@@ -8014,20 +8476,22 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"nanoid": "^3.3.6",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.1.1",
+				"source-map-js": "^1.2.1"
 			},
 			"engines": {
 				"node": "^10 || ^12 || >=14"
 			}
 		},
 		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
 			},
@@ -8036,13 +8500,14 @@
 			}
 		},
 		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-			"integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz",
+			"integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^6.0.2",
+				"postcss-selector-parser": "^7.0.0",
 				"postcss-value-parser": "^4.1.0"
 			},
 			"engines": {
@@ -8053,12 +8518,13 @@
 			}
 		},
 		"node_modules/postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+			"integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"postcss-selector-parser": "^6.0.4"
+				"postcss-selector-parser": "^7.0.0"
 			},
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
@@ -8069,9 +8535,10 @@
 		},
 		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
 			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"icss-utils": "^5.0.0"
 			},
@@ -8083,10 +8550,11 @@
 			}
 		},
 		"node_modules/postcss-selector-parser": {
-			"version": "6.0.13",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-			"integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+			"integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"cssesc": "^3.0.0",
 				"util-deprecate": "^1.0.2"
@@ -8097,56 +8565,43 @@
 		},
 		"node_modules/postcss-value-parser": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
-		},
-		"node_modules/postcss/node_modules/nanoid": {
-			"version": "3.3.7",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
 			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
-			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-			}
+			"license": "MIT"
 		},
 		"node_modules/postgres-array": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/postgres-array/-/postgres-array-2.0.0.tgz",
 			"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/postgres-bytea": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
 			"integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/postgres-date": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+			"resolved": "https://registry.npmmirror.com/postgres-date/-/postgres-date-1.0.7.tgz",
 			"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/postgres-interval": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/postgres-interval/-/postgres-interval-1.2.0.tgz",
 			"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+			"license": "MIT",
 			"dependencies": {
 				"xtend": "^4.0.0"
 			},
@@ -8156,22 +8611,25 @@
 		},
 		"node_modules/potpack": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz",
-			"integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ=="
+			"resolved": "https://registry.npmmirror.com/potpack/-/potpack-1.0.2.tgz",
+			"integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==",
+			"license": "ISC"
 		},
 		"node_modules/prelude-ls": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz",
 			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8.0"
 			}
 		},
 		"node_modules/probe-image-size": {
 			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.2.3.tgz",
+			"resolved": "https://registry.npmmirror.com/probe-image-size/-/probe-image-size-7.2.3.tgz",
 			"integrity": "sha512-HubhG4Rb2UH8YtV4ba0Vp5bQ7L78RTONYu/ujmCu5nBI8wGv24s4E9xSKBi0N1MowRpxk76pFCpJtW0KPzOK0w==",
+			"license": "MIT",
 			"dependencies": {
 				"lodash.merge": "^4.6.2",
 				"needle": "^2.5.2",
@@ -8180,22 +8638,25 @@
 		},
 		"node_modules/process": {
 			"version": "0.11.10",
-			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+			"resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
 			"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6.0"
 			}
 		},
 		"node_modules/process-nextick-args": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+			"resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+			"license": "MIT"
 		},
 		"node_modules/prop-types": {
 			"version": "15.8.1",
-			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+			"resolved": "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz",
 			"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+			"license": "MIT",
 			"dependencies": {
 				"loose-envify": "^1.4.0",
 				"object-assign": "^4.1.1",
@@ -8204,13 +8665,15 @@
 		},
 		"node_modules/protocol-buffers-schema": {
 			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
-			"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
+			"resolved": "https://registry.npmmirror.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
+			"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
+			"license": "MIT"
 		},
 		"node_modules/proxy-addr": {
 			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+			"resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz",
 			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+			"license": "MIT",
 			"dependencies": {
 				"forwarded": "0.2.0",
 				"ipaddr.js": "1.9.1"
@@ -8221,20 +8684,23 @@
 		},
 		"node_modules/proxy-from-env": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+			"resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+			"license": "MIT"
 		},
 		"node_modules/pstree.remy": {
 			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+			"resolved": "https://registry.npmmirror.com/pstree.remy/-/pstree.remy-1.1.8.tgz",
 			"integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/public-encrypt": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/public-encrypt/-/public-encrypt-4.0.3.tgz",
 			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.1.0",
 				"browserify-rsa": "^4.0.0",
@@ -8245,26 +8711,29 @@
 			}
 		},
 		"node_modules/public-encrypt/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-			"dev": true
+			"version": "4.12.1",
+			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz",
 			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"version": "6.13.0",
+			"resolved": "https://registry.npmmirror.com/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"side-channel": "^1.0.4"
+				"side-channel": "^1.0.6"
 			},
 			"engines": {
 				"node": ">=0.6"
@@ -8275,8 +8744,9 @@
 		},
 		"node_modules/query-string": {
 			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/query-string/-/query-string-9.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/query-string/-/query-string-9.0.0.tgz",
 			"integrity": "sha512-4EWwcRGsO2H+yzq6ddHcVqkCQ2EFUSfDMEjF8ryp8ReymyZhIuaFRGLomeOQLkrzacMHoyky2HW0Qe30UbzkKw==",
+			"license": "MIT",
 			"dependencies": {
 				"decode-uri-component": "^0.4.1",
 				"filter-obj": "^5.1.0",
@@ -8291,8 +8761,9 @@
 		},
 		"node_modules/query-string/node_modules/filter-obj": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/filter-obj/-/filter-obj-5.1.0.tgz",
 			"integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
 			},
@@ -8302,7 +8773,7 @@
 		},
 		"node_modules/querystring-es3": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/querystring-es3/-/querystring-es3-0.2.1.tgz",
 			"integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
 			"dev": true,
 			"engines": {
@@ -8311,7 +8782,7 @@
 		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
 			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true,
 			"funding": [
@@ -8327,35 +8798,40 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			]
+			],
+			"license": "MIT"
 		},
 		"node_modules/quickselect": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
-			"integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
+			"resolved": "https://registry.npmmirror.com/quickselect/-/quickselect-2.0.0.tgz",
+			"integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==",
+			"license": "ISC"
 		},
 		"node_modules/raf": {
 			"version": "3.4.1",
-			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",
 			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+			"license": "MIT",
 			"dependencies": {
 				"performance-now": "^2.1.0"
 			}
 		},
 		"node_modules/randombytes": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "^5.1.0"
 			}
 		},
 		"node_modules/randomfill": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/randomfill/-/randomfill-1.0.4.tgz",
 			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"randombytes": "^2.0.5",
 				"safe-buffer": "^5.1.0"
@@ -8363,16 +8839,18 @@
 		},
 		"node_modules/range-parser": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz",
 			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/raw-body": {
 			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+			"resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.2.tgz",
 			"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+			"license": "MIT",
 			"dependencies": {
 				"bytes": "3.1.2",
 				"http-errors": "2.0.0",
@@ -8385,8 +8863,9 @@
 		},
 		"node_modules/react": {
 			"version": "18.3.1",
-			"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/react/-/react-18.3.1.tgz",
 			"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+			"license": "MIT",
 			"dependencies": {
 				"loose-envify": "^1.1.0"
 			},
@@ -8395,9 +8874,10 @@
 			}
 		},
 		"node_modules/react-calendar": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-5.0.0.tgz",
-			"integrity": "sha512-bHcE5e5f+VUKLd4R19BGkcSQLpuwjKBVG0fKz74cwPW5xDfNsReHdDbfd4z3mdjuUuZzVtw4Q920mkwK5/ZOEg==",
+			"version": "5.1.0",
+			"resolved": "https://registry.npmmirror.com/react-calendar/-/react-calendar-5.1.0.tgz",
+			"integrity": "sha512-09o/rQHPZGEi658IXAJtWfra1N69D1eFnuJ3FQm9qUVzlzNnos1+GWgGiUeSs22QOpNm32aoVFOimq0p3Ug9Eg==",
+			"license": "MIT",
 			"dependencies": {
 				"@wojtekmaj/date-utils": "^1.1.3",
 				"clsx": "^2.0.0",
@@ -8418,26 +8898,11 @@
 				}
 			}
 		},
-		"node_modules/react-calendar/node_modules/clsx": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
-			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/react-calendar/node_modules/warning": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-			"dependencies": {
-				"loose-envify": "^1.0.0"
-			}
-		},
 		"node_modules/react-date-picker": {
 			"version": "11.0.0",
-			"resolved": "https://registry.npmjs.org/react-date-picker/-/react-date-picker-11.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/react-date-picker/-/react-date-picker-11.0.0.tgz",
 			"integrity": "sha512-l+siu5HSZ/ciGL1293KCAHl4o9aD5rw16V4tB0C43h7QbMv2dWGgj7Dxgt8iztLaPVtEfOt/+sxNiTYw4WVq6A==",
+			"license": "MIT",
 			"dependencies": {
 				"@wojtekmaj/date-utils": "^1.1.3",
 				"clsx": "^2.0.0",
@@ -8461,18 +8926,11 @@
 				}
 			}
 		},
-		"node_modules/react-date-picker/node_modules/clsx": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
-			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/react-dom": {
 			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/react-dom/-/react-dom-18.2.0.tgz",
 			"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+			"license": "MIT",
 			"dependencies": {
 				"loose-envify": "^1.1.0",
 				"scheduler": "^0.23.0"
@@ -8483,13 +8941,15 @@
 		},
 		"node_modules/react-fast-compare": {
 			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
-			"integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+			"resolved": "https://registry.npmmirror.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+			"integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==",
+			"license": "MIT"
 		},
 		"node_modules/react-fit": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/react-fit/-/react-fit-2.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/react-fit/-/react-fit-2.0.1.tgz",
 			"integrity": "sha512-Eip6ALs/+6Jv82Si0I9UnfysdwVlAhkkZRycgmMdnj7jwUg69SVFp84ICxwB8zszkfvJJ2MGAAo9KAYM8ZUykQ==",
+			"license": "MIT",
 			"dependencies": {
 				"detect-element-overflow": "^1.4.0",
 				"warning": "^4.0.0"
@@ -8511,18 +8971,11 @@
 				}
 			}
 		},
-		"node_modules/react-fit/node_modules/warning": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-			"dependencies": {
-				"loose-envify": "^1.0.0"
-			}
-		},
 		"node_modules/react-intl": {
 			"version": "6.6.8",
-			"resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.6.8.tgz",
+			"resolved": "https://registry.npmmirror.com/react-intl/-/react-intl-6.6.8.tgz",
 			"integrity": "sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/icu-messageformat-parser": "2.7.8",
@@ -8545,51 +8998,17 @@
 				}
 			}
 		},
-		"node_modules/react-intl/node_modules/@formatjs/ecma402-abstract": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
-			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
-			"dependencies": {
-				"@formatjs/intl-localematcher": "0.5.4",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/react-intl/node_modules/@formatjs/icu-messageformat-parser": {
-			"version": "2.7.8",
-			"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
-			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
-			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"@formatjs/icu-skeleton-parser": "1.8.2",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/react-intl/node_modules/@formatjs/icu-skeleton-parser": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
-			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
-			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/react-intl/node_modules/@formatjs/intl-localematcher": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
-			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
-			"dependencies": {
-				"tslib": "^2.4.0"
-			}
-		},
 		"node_modules/react-is": {
 			"version": "16.13.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+			"resolved": "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz",
+			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+			"license": "MIT"
 		},
 		"node_modules/react-plotly.js": {
 			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/react-plotly.js/-/react-plotly.js-2.6.0.tgz",
+			"resolved": "https://registry.npmmirror.com/react-plotly.js/-/react-plotly.js-2.6.0.tgz",
 			"integrity": "sha512-g93xcyhAVCSt9kV1svqG1clAEdL6k3U+jjuSzfTV7owaSU9Go6Ph8bl25J+jKfKvIGAEYpe4qj++WHJuc9IaeA==",
+			"license": "MIT",
 			"dependencies": {
 				"prop-types": "^15.8.1"
 			},
@@ -8600,8 +9019,9 @@
 		},
 		"node_modules/react-popper": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/react-popper/-/react-popper-2.3.0.tgz",
 			"integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+			"license": "MIT",
 			"dependencies": {
 				"react-fast-compare": "^3.0.1",
 				"warning": "^4.0.2"
@@ -8612,18 +9032,11 @@
 				"react-dom": "^16.8.0 || ^17 || ^18"
 			}
 		},
-		"node_modules/react-popper/node_modules/warning": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-			"dependencies": {
-				"loose-envify": "^1.0.0"
-			}
-		},
 		"node_modules/react-redux": {
 			"version": "8.1.3",
-			"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/react-redux/-/react-redux-8.1.3.tgz",
 			"integrity": "sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.12.1",
 				"@types/hoist-non-react-statics": "^3.3.1",
@@ -8659,16 +9072,18 @@
 			}
 		},
 		"node_modules/react-redux/node_modules/react-is": {
-			"version": "18.2.0",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+			"version": "18.3.1",
+			"resolved": "https://registry.npmmirror.com/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+			"license": "MIT"
 		},
 		"node_modules/react-router": {
-			"version": "6.21.1",
-			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.1.tgz",
-			"integrity": "sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==",
+			"version": "6.21.3",
+			"resolved": "https://registry.npmmirror.com/react-router/-/react-router-6.21.3.tgz",
+			"integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
+			"license": "MIT",
 			"dependencies": {
-				"@remix-run/router": "1.14.1"
+				"@remix-run/router": "1.14.2"
 			},
 			"engines": {
 				"node": ">=14.0.0"
@@ -8678,12 +9093,13 @@
 			}
 		},
 		"node_modules/react-router-dom": {
-			"version": "6.21.1",
-			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.1.tgz",
-			"integrity": "sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA==",
+			"version": "6.21.3",
+			"resolved": "https://registry.npmmirror.com/react-router-dom/-/react-router-dom-6.21.3.tgz",
+			"integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
+			"license": "MIT",
 			"dependencies": {
-				"@remix-run/router": "1.14.1",
-				"react-router": "6.21.1"
+				"@remix-run/router": "1.14.2",
+				"react-router": "6.21.3"
 			},
 			"engines": {
 				"node": ">=14.0.0"
@@ -8694,9 +9110,10 @@
 			}
 		},
 		"node_modules/react-select": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz",
-			"integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==",
+			"version": "5.8.3",
+			"resolved": "https://registry.npmmirror.com/react-select/-/react-select-5.8.3.tgz",
+			"integrity": "sha512-lVswnIq8/iTj1db7XCG74M/3fbGB6ZaluCzvwPGT5ZOjCdL/k0CLWhEK0vCBLuU5bHTEf6Gj8jtSvi+3v+tO1w==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.12.0",
 				"@emotion/cache": "^11.4.0",
@@ -8715,8 +9132,9 @@
 		},
 		"node_modules/react-toastify": {
 			"version": "9.1.3",
-			"resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/react-toastify/-/react-toastify-9.1.3.tgz",
 			"integrity": "sha512-fPfb8ghtn/XMxw3LkxQBk3IyagNpF/LIKjOBflbexr2AWxAH1MJgvnESwEwBn9liLFXgTKWgBSdZpw9m4OTHTg==",
+			"license": "MIT",
 			"dependencies": {
 				"clsx": "^1.1.1"
 			},
@@ -8725,10 +9143,20 @@
 				"react-dom": ">=16"
 			}
 		},
+		"node_modules/react-toastify/node_modules/clsx": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmmirror.com/clsx/-/clsx-1.2.1.tgz",
+			"integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/react-tooltip": {
 			"version": "4.5.1",
-			"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.5.1.tgz",
+			"resolved": "https://registry.npmmirror.com/react-tooltip/-/react-tooltip-4.5.1.tgz",
 			"integrity": "sha512-Zo+CSFUGXar1uV+bgXFFDe7VeS2iByeIp5rTgTcc2HqtuOS5D76QapejNNfx320MCY91TlhTQat36KGFTqgcvw==",
+			"license": "MIT",
 			"dependencies": {
 				"prop-types": "^15.8.1",
 				"uuid": "^7.0.3"
@@ -8743,8 +9171,9 @@
 		},
 		"node_modules/react-transition-group": {
 			"version": "4.4.5",
-			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+			"resolved": "https://registry.npmmirror.com/react-transition-group/-/react-transition-group-4.4.5.tgz",
 			"integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@babel/runtime": "^7.5.5",
 				"dom-helpers": "^5.0.1",
@@ -8757,9 +9186,10 @@
 			}
 		},
 		"node_modules/reactstrap": {
-			"version": "9.2.2",
-			"resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.2.2.tgz",
-			"integrity": "sha512-4KroiGOdqZLAnMGzHjpErW3G7bLB+QbKzzMLIDXydPIV0y74lpdL7WtXHkLWAGInd97WCPNx4+R0NQDPyzIfhw==",
+			"version": "9.2.3",
+			"resolved": "https://registry.npmmirror.com/reactstrap/-/reactstrap-9.2.3.tgz",
+			"integrity": "sha512-1nXy7FIBIoOgXr3AIHOpgzcZXdj6rZE5YvNSPd1hYgwv8X64m6TAJsU0ExlieJdlRXhaRfTYRSZoTWa127b0gw==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.12.5",
 				"@popperjs/core": "^2.6.0",
@@ -8773,11 +9203,48 @@
 				"react-dom": ">=16.8.0"
 			}
 		},
+		"node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"license": "MIT",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/readable-stream/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"license": "MIT"
+		},
+		"node_modules/readable-stream/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"license": "MIT"
+		},
+		"node_modules/readable-stream/node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"license": "MIT",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
 		"node_modules/readdirp": {
 			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+			"resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
 			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"picomatch": "^2.2.1"
 			},
@@ -8787,9 +9254,10 @@
 		},
 		"node_modules/rechoir": {
 			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+			"resolved": "https://registry.npmmirror.com/rechoir/-/rechoir-0.8.0.tgz",
 			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"resolve": "^1.20.0"
 			},
@@ -8799,35 +9267,40 @@
 		},
 		"node_modules/redux": {
 			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/redux/-/redux-4.2.1.tgz",
 			"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.9.2"
 			}
 		},
 		"node_modules/redux-thunk": {
 			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
+			"resolved": "https://registry.npmmirror.com/redux-thunk/-/redux-thunk-2.4.2.tgz",
 			"integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
+			"license": "MIT",
 			"peerDependencies": {
 				"redux": "^4"
 			}
 		},
 		"node_modules/regenerator-runtime": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-			"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+			"version": "0.14.1",
+			"resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+			"license": "MIT"
 		},
 		"node_modules/regl": {
 			"name": "@plotly/regl",
 			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/@plotly/regl/-/regl-2.1.2.tgz",
-			"integrity": "sha512-Mdk+vUACbQvjd0m/1JJjOOafmkp/EpmHjISsopEz5Av44CBq7rPC05HHNbYGKVyNUF2zmEoBS/TT0pd0SPFFyw=="
+			"resolved": "https://registry.npmmirror.com/@plotly/regl/-/regl-2.1.2.tgz",
+			"integrity": "sha512-Mdk+vUACbQvjd0m/1JJjOOafmkp/EpmHjISsopEz5Av44CBq7rPC05HHNbYGKVyNUF2zmEoBS/TT0pd0SPFFyw==",
+			"license": "MIT"
 		},
 		"node_modules/regl-error2d": {
 			"version": "2.0.12",
-			"resolved": "https://registry.npmjs.org/regl-error2d/-/regl-error2d-2.0.12.tgz",
+			"resolved": "https://registry.npmmirror.com/regl-error2d/-/regl-error2d-2.0.12.tgz",
 			"integrity": "sha512-r7BUprZoPO9AbyqM5qlJesrSRkl+hZnVKWKsVp7YhOl/3RIpi4UDGASGJY0puQ96u5fBYw/OlqV24IGcgJ0McA==",
+			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"color-normalize": "^1.5.0",
@@ -8839,9 +9312,10 @@
 			}
 		},
 		"node_modules/regl-line2d": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-3.1.2.tgz",
-			"integrity": "sha512-nmT7WWS/WxmXAQMkgaMKWXaVmwJ65KCrjbqHGOUjjqQi6shfT96YbBOvelXwO9hG7/hjvbzjtQ2UO0L3e7YaXQ==",
+			"version": "3.1.3",
+			"resolved": "https://registry.npmmirror.com/regl-line2d/-/regl-line2d-3.1.3.tgz",
+			"integrity": "sha512-fkgzW+tTn4QUQLpFKsUIE0sgWdCmXAM3ctXcCgoGBZTSX5FE2A0M7aynz7nrZT5baaftLrk9te54B+MEq4QcSA==",
+			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"array-find-index": "^1.0.2",
@@ -8850,7 +9324,6 @@
 				"earcut": "^2.1.5",
 				"es6-weak-map": "^2.0.3",
 				"flatten-vertex-data": "^1.0.2",
-				"glslify": "^7.0.0",
 				"object-assign": "^4.1.1",
 				"parse-rect": "^1.2.0",
 				"pick-by-alias": "^1.2.0",
@@ -8859,8 +9332,9 @@
 		},
 		"node_modules/regl-scatter2d": {
 			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/regl-scatter2d/-/regl-scatter2d-3.3.1.tgz",
 			"integrity": "sha512-seOmMIVwaCwemSYz/y4WE0dbSO9svNFSqtTh5RE57I7PjGo3tcUYKtH0MTSoshcAsreoqN8HoCtnn8wfHXXfKQ==",
+			"license": "MIT",
 			"dependencies": {
 				"@plotly/point-cluster": "^3.1.9",
 				"array-range": "^1.0.1",
@@ -8881,8 +9355,9 @@
 		},
 		"node_modules/regl-splom": {
 			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.14.tgz",
+			"resolved": "https://registry.npmmirror.com/regl-splom/-/regl-splom-1.0.14.tgz",
 			"integrity": "sha512-OiLqjmPRYbd7kDlHC6/zDf6L8lxgDC65BhC8JirhP4ykrK4x22ZyS+BnY8EUinXKDeMgmpRwCvUmk7BK4Nweuw==",
+			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"array-range": "^1.0.1",
@@ -8896,22 +9371,25 @@
 		},
 		"node_modules/require-directory": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
 			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/reselect": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.0.tgz",
-			"integrity": "sha512-aw7jcGLDpSgNDyWBQLv2cedml85qd95/iszJjN988zX1t7AVRJi19d9kto5+W7oCfQ94gyo40dVbT6g2k4/kXg=="
+			"version": "5.1.1",
+			"resolved": "https://registry.npmmirror.com/reselect/-/reselect-5.1.1.tgz",
+			"integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
+			"license": "MIT"
 		},
 		"node_modules/resolve": {
 			"version": "1.22.8",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+			"resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz",
 			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+			"license": "MIT",
 			"dependencies": {
 				"is-core-module": "^2.13.0",
 				"path-parse": "^1.0.7",
@@ -8926,9 +9404,10 @@
 		},
 		"node_modules/resolve-cwd": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
 			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"resolve-from": "^5.0.0"
 			},
@@ -8938,34 +9417,38 @@
 		},
 		"node_modules/resolve-cwd/node_modules/resolve-from": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-5.0.0.tgz",
 			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/resolve-from": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
 			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/resolve-protobuf-schema": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
 			"integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
+			"license": "MIT",
 			"dependencies": {
 				"protocol-buffers-schema": "^3.3.1"
 			}
 		},
 		"node_modules/reusify": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+			"resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
 			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"iojs": ">=1.0.0",
 				"node": ">=0.10.0"
@@ -8973,14 +9456,17 @@
 		},
 		"node_modules/right-now": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/right-now/-/right-now-1.0.0.tgz",
-			"integrity": "sha512-DA8+YS+sMIVpbsuKgy+Z67L9Lxb1p05mNxRpDPNksPDEFir4vmBlUtuN9jkTGn9YMMdlBuK7XQgFiz6ws+yhSg=="
+			"resolved": "https://registry.npmmirror.com/right-now/-/right-now-1.0.0.tgz",
+			"integrity": "sha512-DA8+YS+sMIVpbsuKgy+Z67L9Lxb1p05mNxRpDPNksPDEFir4vmBlUtuN9jkTGn9YMMdlBuK7XQgFiz6ws+yhSg==",
+			"license": "MIT"
 		},
 		"node_modules/rimraf": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
 			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"glob": "^7.1.3"
 			},
@@ -8991,11 +9477,58 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"node_modules/rimraf/node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/rimraf/node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/rimraf/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
 		"node_modules/ripemd160": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/ripemd160/-/ripemd160-2.0.2.tgz",
 			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"hash-base": "^3.0.0",
 				"inherits": "^2.0.1"
@@ -9003,12 +9536,13 @@
 		},
 		"node_modules/robust-predicates": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
-			"integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+			"resolved": "https://registry.npmmirror.com/robust-predicates/-/robust-predicates-3.0.2.tgz",
+			"integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+			"license": "Unlicense"
 		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
 			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
 			"dev": true,
 			"funding": [
@@ -9025,18 +9559,20 @@
 					"url": "https://feross.org/support"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
 				"queue-microtask": "^1.2.2"
 			}
 		},
 		"node_modules/rw": {
 			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-			"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+			"resolved": "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz",
+			"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/safe-buffer": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
 			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 			"funding": [
 				{
@@ -9051,30 +9587,54 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			]
+			],
+			"license": "MIT"
 		},
 		"node_modules/safer-buffer": {
 			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+			"resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"license": "MIT"
 		},
 		"node_modules/sax": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
-			"integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
+			"version": "1.4.1",
+			"resolved": "https://registry.npmmirror.com/sax/-/sax-1.4.1.tgz",
+			"integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+			"license": "ISC"
 		},
 		"node_modules/scheduler": {
-			"version": "0.23.0",
-			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-			"integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+			"version": "0.23.2",
+			"resolved": "https://registry.npmmirror.com/scheduler/-/scheduler-0.23.2.tgz",
+			"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+			"license": "MIT",
 			"dependencies": {
 				"loose-envify": "^1.1.0"
 			}
 		},
+		"node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
 		"node_modules/semver": {
-			"version": "7.6.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-			"integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+			"version": "7.6.3",
+			"resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"license": "ISC",
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -9084,8 +9644,9 @@
 		},
 		"node_modules/send": {
 			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+			"resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
 			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+			"license": "MIT",
 			"dependencies": {
 				"debug": "2.6.9",
 				"depd": "2.0.0",
@@ -9107,35 +9668,34 @@
 		},
 		"node_modules/send/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/send/node_modules/debug/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-		},
-		"node_modules/send/node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/serialize-javascript": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
 			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
 		},
 		"node_modules/serve-favicon": {
 			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/serve-favicon/-/serve-favicon-2.5.0.tgz",
 			"integrity": "sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==",
+			"license": "MIT",
 			"dependencies": {
 				"etag": "~1.8.1",
 				"fresh": "0.5.2",
@@ -9149,18 +9709,21 @@
 		},
 		"node_modules/serve-favicon/node_modules/ms": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.1.tgz",
+			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+			"license": "MIT"
 		},
 		"node_modules/serve-favicon/node_modules/safe-buffer": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.1.tgz",
+			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+			"license": "MIT"
 		},
 		"node_modules/serve-static": {
 			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+			"resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz",
 			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+			"license": "MIT",
 			"dependencies": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
@@ -9173,8 +9736,9 @@
 		},
 		"node_modules/set-function-length": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
 			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+			"license": "MIT",
 			"dependencies": {
 				"define-data-property": "^1.1.4",
 				"es-errors": "^1.3.0",
@@ -9189,20 +9753,23 @@
 		},
 		"node_modules/setimmediate": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz",
 			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/setprototypeof": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+			"resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
+			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+			"license": "ISC"
 		},
 		"node_modules/sha.js": {
 			"version": "2.4.11",
-			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+			"resolved": "https://registry.npmmirror.com/sha.js/-/sha.js-2.4.11.tgz",
 			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 			"dev": true,
+			"license": "(MIT AND BSD-3-Clause)",
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"safe-buffer": "^5.0.1"
@@ -9213,9 +9780,10 @@
 		},
 		"node_modules/shallow-clone": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz",
 			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"kind-of": "^6.0.2"
 			},
@@ -9225,14 +9793,16 @@
 		},
 		"node_modules/shallow-copy": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
-			"integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw=="
+			"resolved": "https://registry.npmmirror.com/shallow-copy/-/shallow-copy-0.0.1.tgz",
+			"integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
+			"license": "MIT"
 		},
 		"node_modules/shebang-command": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -9242,17 +9812,19 @@
 		},
 		"node_modules/shebang-regex": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/side-channel": {
 			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+			"resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.6.tgz",
 			"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.7",
 				"es-errors": "^1.3.0",
@@ -9268,14 +9840,16 @@
 		},
 		"node_modules/signum": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/signum/-/signum-1.0.0.tgz",
-			"integrity": "sha512-yodFGwcyt59XRh7w5W3jPcIQb3Bwi21suEfT7MAWnBX3iCdklJpgDgvGT9o04UonglZN5SNMfJFkHIR/jO8GHw=="
+			"resolved": "https://registry.npmmirror.com/signum/-/signum-1.0.0.tgz",
+			"integrity": "sha512-yodFGwcyt59XRh7w5W3jPcIQb3Bwi21suEfT7MAWnBX3iCdklJpgDgvGT9o04UonglZN5SNMfJFkHIR/jO8GHw==",
+			"license": "MIT"
 		},
 		"node_modules/simple-update-notifier": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
 			"integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"semver": "^7.5.3"
 			},
@@ -9284,13 +9858,14 @@
 			}
 		},
 		"node_modules/sinon": {
-			"version": "18.0.0",
-			"resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.0.tgz",
-			"integrity": "sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA==",
+			"version": "18.0.1",
+			"resolved": "https://registry.npmmirror.com/sinon/-/sinon-18.0.1.tgz",
+			"integrity": "sha512-a2N2TDY1uGviajJ6r4D1CyRAkzE9NNVlYOV1wX5xQDuAk0ONgzgRl0EjCQuRCPxOwp13ghsMwt9Gdldujs39qw==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@sinonjs/commons": "^3.0.1",
-				"@sinonjs/fake-timers": "^11.2.2",
+				"@sinonjs/fake-timers": "11.2.2",
 				"@sinonjs/samsam": "^8.0.0",
 				"diff": "^5.2.0",
 				"nise": "^6.0.0",
@@ -9303,67 +9878,50 @@
 		},
 		"node_modules/sinon/node_modules/diff": {
 			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/diff/-/diff-5.2.0.tgz",
 			"integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.3.1"
 			}
 		},
-		"node_modules/sinon/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/sinon/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/slash": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz",
 			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/source-map": {
 			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
 			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/source-map-loader": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz",
-			"integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmmirror.com/source-map-loader/-/source-map-loader-4.0.2.tgz",
+			"integrity": "sha512-oYwAqCuL0OZhBoSgmdrLa7mv9MjommVMiQIWgcztf+eS4+8BfcUee6nenFnDhKOhzAVnk5gpZdfnz1iiBv+5sg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"abab": "^2.0.6",
 				"iconv-lite": "^0.6.3",
 				"source-map-js": "^1.0.2"
 			},
@@ -9380,9 +9938,10 @@
 		},
 		"node_modules/source-map-loader/node_modules/iconv-lite": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
 			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3.0.0"
 			},
@@ -9392,9 +9951,10 @@
 		},
 		"node_modules/source-map-support": {
 			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
 			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
@@ -9402,47 +9962,53 @@
 		},
 		"node_modules/source-map-support/node_modules/source-map": {
 			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/spdx-exceptions": {
 			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
 			"integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-			"dev": true
+			"dev": true,
+			"license": "CC-BY-3.0"
 		},
 		"node_modules/spdx-expression-parse": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
 			"integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"spdx-exceptions": "^2.1.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
 		"node_modules/spdx-license-ids": {
-			"version": "3.0.17",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
-			"integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
-			"dev": true
+			"version": "3.0.20",
+			"resolved": "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+			"integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
+			"dev": true,
+			"license": "CC0-1.0"
 		},
 		"node_modules/spex": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/spex/-/spex-3.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/spex/-/spex-3.3.0.tgz",
 			"integrity": "sha512-VNiXjFp6R4ldPbVRYbpxlD35yRHceecVXlct1J4/X80KuuPnW2AXMq3sGwhnJOhKkUsOxAT6nRGfGE5pocVw5w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
 		"node_modules/split-on-first": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/split-on-first/-/split-on-first-3.0.0.tgz",
 			"integrity": "sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=12"
 			},
@@ -9452,41 +10018,45 @@
 		},
 		"node_modules/split2": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/split2/-/split2-4.2.0.tgz",
 			"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+			"license": "ISC",
 			"engines": {
 				"node": ">= 10.x"
 			}
 		},
 		"node_modules/stack-trace": {
 			"version": "0.0.9",
-			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+			"resolved": "https://registry.npmmirror.com/stack-trace/-/stack-trace-0.0.9.tgz",
 			"integrity": "sha512-vjUc6sfgtgY0dxCdnc40mK6Oftjo9+2K8H/NG81TMhgL392FtiPA9tn9RLyTxXmTLPJPjF3VyzFp6bsWFLisMQ==",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/static-eval": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz",
-			"integrity": "sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmmirror.com/static-eval/-/static-eval-2.1.1.tgz",
+			"integrity": "sha512-MgWpQ/ZjGieSVB3eOJVs4OA2LT/q1vx98KPCTTQPzq/aLr0YUXTsgryTXr4SLfR0ZfUUCiedM9n/ABeDIyy4mA==",
+			"license": "MIT",
 			"dependencies": {
-				"escodegen": "^1.11.1"
+				"escodegen": "^2.1.0"
 			}
 		},
 		"node_modules/statuses": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz",
 			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/stream-browserify": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/stream-browserify/-/stream-browserify-3.0.0.tgz",
 			"integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "~2.0.4",
 				"readable-stream": "^3.5.0"
@@ -9494,9 +10064,10 @@
 		},
 		"node_modules/stream-browserify/node_modules/readable-stream": {
 			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -9508,9 +10079,10 @@
 		},
 		"node_modules/stream-http": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/stream-http/-/stream-http-3.2.0.tgz",
 			"integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"builtin-status-codes": "^3.0.0",
 				"inherits": "^2.0.4",
@@ -9520,9 +10092,10 @@
 		},
 		"node_modules/stream-http/node_modules/readable-stream": {
 			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -9534,41 +10107,46 @@
 		},
 		"node_modules/stream-parser": {
 			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz",
+			"resolved": "https://registry.npmmirror.com/stream-parser/-/stream-parser-0.3.1.tgz",
 			"integrity": "sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==",
+			"license": "MIT",
 			"dependencies": {
 				"debug": "2"
 			}
 		},
 		"node_modules/stream-parser/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/stream-parser/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/stream-shift": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-			"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
+			"version": "1.0.3",
+			"resolved": "https://registry.npmmirror.com/stream-shift/-/stream-shift-1.0.3.tgz",
+			"integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
+			"license": "MIT"
 		},
 		"node_modules/stream-transform": {
 			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-2.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/stream-transform/-/stream-transform-2.1.3.tgz",
 			"integrity": "sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==",
+			"license": "MIT",
 			"dependencies": {
 				"mixme": "^0.5.1"
 			}
 		},
 		"node_modules/streamsearch": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/streamsearch/-/streamsearch-1.1.0.tgz",
 			"integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
 			"engines": {
 				"node": ">=10.0.0"
@@ -9576,26 +10154,29 @@
 		},
 		"node_modules/string_decoder": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
 			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "~5.2.0"
 			}
 		},
 		"node_modules/string-split-by": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/string-split-by/-/string-split-by-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/string-split-by/-/string-split-by-1.0.0.tgz",
 			"integrity": "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A==",
+			"license": "MIT",
 			"dependencies": {
 				"parenthesis": "^3.1.5"
 			}
 		},
 		"node_modules/string-width": {
 			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -9607,9 +10188,10 @@
 		},
 		"node_modules/strip-ansi": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"ansi-regex": "^5.0.1"
 			},
@@ -9619,9 +10201,10 @@
 		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			},
@@ -9631,14 +10214,16 @@
 		},
 		"node_modules/strongly-connected-components": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/strongly-connected-components/-/strongly-connected-components-1.0.1.tgz",
-			"integrity": "sha512-i0TFx4wPcO0FwX+4RkLJi1MxmcTv90jNZgxMu9XRnMXMeFUY1VJlIoXpZunPUvUUqbCT1pg5PEkFqqpcaElNaA=="
+			"resolved": "https://registry.npmmirror.com/strongly-connected-components/-/strongly-connected-components-1.0.1.tgz",
+			"integrity": "sha512-i0TFx4wPcO0FwX+4RkLJi1MxmcTv90jNZgxMu9XRnMXMeFUY1VJlIoXpZunPUvUUqbCT1pg5PEkFqqpcaElNaA==",
+			"license": "MIT"
 		},
 		"node_modules/style-loader": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-4.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/style-loader/-/style-loader-4.0.0.tgz",
 			"integrity": "sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 18.12.0"
 			},
@@ -9652,15 +10237,17 @@
 		},
 		"node_modules/stylis": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
-			"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
+			"resolved": "https://registry.npmmirror.com/stylis/-/stylis-4.2.0.tgz",
+			"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
+			"license": "MIT"
 		},
 		"node_modules/superagent": {
 			"version": "8.1.2",
-			"resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/superagent/-/superagent-8.1.2.tgz",
 			"integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==",
 			"deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"component-emitter": "^1.3.0",
 				"cookiejar": "^2.1.4",
@@ -9679,9 +10266,10 @@
 		},
 		"node_modules/superagent/node_modules/mime": {
 			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+			"resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz",
 			"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"mime": "cli.js"
 			},
@@ -9691,32 +10279,37 @@
 		},
 		"node_modules/supercluster": {
 			"version": "7.1.5",
-			"resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz",
+			"resolved": "https://registry.npmmirror.com/supercluster/-/supercluster-7.1.5.tgz",
 			"integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==",
+			"license": "ISC",
 			"dependencies": {
 				"kdbush": "^3.0.0"
 			}
 		},
 		"node_modules/superscript-text": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/superscript-text/-/superscript-text-1.0.0.tgz",
-			"integrity": "sha512-gwu8l5MtRZ6koO0icVTlmN5pm7Dhh1+Xpe9O4x6ObMAsW+3jPbW14d1DsBq1F4wiI+WOFjXF35pslgec/G8yCQ=="
+			"resolved": "https://registry.npmmirror.com/superscript-text/-/superscript-text-1.0.0.tgz",
+			"integrity": "sha512-gwu8l5MtRZ6koO0icVTlmN5pm7Dhh1+Xpe9O4x6ObMAsW+3jPbW14d1DsBq1F4wiI+WOFjXF35pslgec/G8yCQ==",
+			"license": "MIT"
 		},
 		"node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"has-flag": "^3.0.0"
+				"has-flag": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=8"
 			}
 		},
 		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
 			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -9726,13 +10319,15 @@
 		},
 		"node_modules/svg-arc-to-cubic-bezier": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz",
-			"integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g=="
+			"resolved": "https://registry.npmmirror.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz",
+			"integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==",
+			"license": "ISC"
 		},
 		"node_modules/svg-path-bounds": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/svg-path-bounds/-/svg-path-bounds-1.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/svg-path-bounds/-/svg-path-bounds-1.0.2.tgz",
 			"integrity": "sha512-H4/uAgLWrppIC0kHsb2/dWUYSmb4GE5UqH06uqWBcg6LBjX2fu0A8+JrO2/FJPZiSsNOKZAhyFFgsLTdYUvSqQ==",
+			"license": "MIT",
 			"dependencies": {
 				"abs-svg-path": "^0.1.1",
 				"is-svg-path": "^1.0.1",
@@ -9742,16 +10337,18 @@
 		},
 		"node_modules/svg-path-bounds/node_modules/normalize-svg-path": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz",
 			"integrity": "sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg==",
+			"license": "MIT",
 			"dependencies": {
 				"svg-arc-to-cubic-bezier": "^3.0.0"
 			}
 		},
 		"node_modules/svg-path-sdf": {
 			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/svg-path-sdf/-/svg-path-sdf-1.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/svg-path-sdf/-/svg-path-sdf-1.1.3.tgz",
 			"integrity": "sha512-vJJjVq/R5lSr2KLfVXVAStktfcfa1pNFjFOgyJnzZFXlO/fDZ5DmM8FpnSKKzLPfEYTVeXuVBTHF296TpxuJVg==",
+			"license": "MIT",
 			"dependencies": {
 				"bitmap-sdf": "^1.0.0",
 				"draw-svg-path": "^1.0.0",
@@ -9762,18 +10359,20 @@
 		},
 		"node_modules/tapable": {
 			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
 			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/terser": {
-			"version": "5.29.1",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz",
-			"integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==",
+			"version": "5.37.0",
+			"resolved": "https://registry.npmmirror.com/terser/-/terser-5.37.0.tgz",
+			"integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",
@@ -9789,9 +10388,10 @@
 		},
 		"node_modules/terser-webpack-plugin": {
 			"version": "5.3.10",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+			"resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
 			"integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/trace-mapping": "^0.3.20",
 				"jest-worker": "^27.4.5",
@@ -9821,85 +10421,46 @@
 				}
 			}
 		},
-		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
 		"node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+			"version": "6.0.2",
+			"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
 		},
+		"node_modules/terser/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/text-table": {
 			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/through2": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/through2/-/through2-2.0.5.tgz",
 			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+			"license": "MIT",
 			"dependencies": {
 				"readable-stream": "~2.3.6",
 				"xtend": "~4.0.1"
 			}
 		},
-		"node_modules/through2/node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-		},
-		"node_modules/through2/node_modules/readable-stream": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"node_modules/through2/node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
-		"node_modules/through2/node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
 		"node_modules/timers-browserify": {
 			"version": "2.0.12",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+			"resolved": "https://registry.npmmirror.com/timers-browserify/-/timers-browserify-2.0.12.tgz",
 			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"setimmediate": "^1.0.4"
 			},
@@ -9909,40 +10470,37 @@
 		},
 		"node_modules/tinycolor2": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
-			"integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="
+			"resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.6.0.tgz",
+			"integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
+			"license": "MIT"
 		},
 		"node_modules/tinyqueue": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
-			"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
-		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-			"engines": {
-				"node": ">=4"
-			}
+			"resolved": "https://registry.npmmirror.com/tinyqueue/-/tinyqueue-2.0.3.tgz",
+			"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==",
+			"license": "ISC"
 		},
 		"node_modules/to-float32": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/to-float32/-/to-float32-1.1.0.tgz",
-			"integrity": "sha512-keDnAusn/vc+R3iEiSDw8TOF7gPiTLdK1ArvWtYbJQiVfmRg6i/CAvbKq3uIS0vWroAC7ZecN3DjQKw3aSklUg=="
+			"resolved": "https://registry.npmmirror.com/to-float32/-/to-float32-1.1.0.tgz",
+			"integrity": "sha512-keDnAusn/vc+R3iEiSDw8TOF7gPiTLdK1ArvWtYbJQiVfmRg6i/CAvbKq3uIS0vWroAC7ZecN3DjQKw3aSklUg==",
+			"license": "MIT"
 		},
 		"node_modules/to-px": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-px/-/to-px-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/to-px/-/to-px-1.0.1.tgz",
 			"integrity": "sha512-2y3LjBeIZYL19e5gczp14/uRWFDtDUErJPVN3VU9a7SJO+RjGRtYR47aMN2bZgGlxvW4ZcEz2ddUPVHXcMfuXw==",
+			"license": "MIT",
 			"dependencies": {
 				"parse-unit": "^1.0.1"
 			}
 		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
 			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"is-number": "^7.0.0"
 			},
@@ -9952,16 +10510,18 @@
 		},
 		"node_modules/toidentifier": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
 			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.6"
 			}
 		},
 		"node_modules/topojson-client": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/topojson-client/-/topojson-client-3.1.0.tgz",
 			"integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
+			"license": "ISC",
 			"dependencies": {
 				"commander": "2"
 			},
@@ -9971,25 +10531,30 @@
 				"topoquantize": "bin/topoquantize"
 			}
 		},
+		"node_modules/topojson-client/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"license": "MIT"
+		},
 		"node_modules/touch": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
-			"integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmmirror.com/touch/-/touch-3.1.1.tgz",
+			"integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
 			"dev": true,
-			"dependencies": {
-				"nopt": "~1.0.10"
-			},
+			"license": "ISC",
 			"bin": {
 				"nodetouch": "bin/nodetouch.js"
 			}
 		},
 		"node_modules/ts-api-utils": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-			"integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+			"version": "1.4.3",
+			"resolved": "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+			"integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=16.13.0"
+				"node": ">=16"
 			},
 			"peerDependencies": {
 				"typescript": ">=4.2.0"
@@ -9997,9 +10562,10 @@
 		},
 		"node_modules/ts-loader": {
 			"version": "9.5.1",
-			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
+			"resolved": "https://registry.npmmirror.com/ts-loader/-/ts-loader-9.5.1.tgz",
 			"integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"chalk": "^4.1.0",
 				"enhanced-resolve": "^5.0.0",
@@ -10015,106 +10581,41 @@
 				"webpack": "^5.0.0"
 			}
 		},
-		"node_modules/ts-loader/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/ts-loader/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/ts-loader/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/ts-loader/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/ts-loader/node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/ts-loader/node_modules/source-map": {
 			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz",
 			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">= 8"
 			}
 		},
-		"node_modules/ts-loader/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/tslib": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-			"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+			"version": "2.8.1",
+			"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz",
+			"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+			"license": "0BSD"
 		},
 		"node_modules/tty-browserify": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/tty-browserify/-/tty-browserify-0.0.1.tgz",
 			"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/type": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-			"integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+			"version": "2.7.3",
+			"resolved": "https://registry.npmmirror.com/type/-/type-2.7.3.tgz",
+			"integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
+			"license": "ISC"
 		},
 		"node_modules/type-check": {
 			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz",
 			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"prelude-ls": "^1.2.1"
 			},
@@ -10123,19 +10624,21 @@
 			}
 		},
 		"node_modules/type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmmirror.com/type-detect/-/type-detect-4.1.0.tgz",
+			"integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/type-fest": {
 			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+			"resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz",
 			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
 			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
 			"engines": {
 				"node": ">=10"
 			},
@@ -10145,8 +10648,9 @@
 		},
 		"node_modules/type-is": {
 			"version": "1.6.18",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+			"resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz",
 			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+			"license": "MIT",
 			"dependencies": {
 				"media-typer": "0.3.0",
 				"mime-types": "~2.1.24"
@@ -10157,13 +10661,15 @@
 		},
 		"node_modules/typedarray": {
 			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+			"resolved": "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+			"license": "MIT"
 		},
 		"node_modules/typedarray-pool": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/typedarray-pool/-/typedarray-pool-1.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/typedarray-pool/-/typedarray-pool-1.2.0.tgz",
 			"integrity": "sha512-YTSQbzX43yvtpfRtIDAYygoYtgT+Rpjuxy9iOpczrjpXLgGoyG7aS5USJXV2d3nn8uHTeb9rXDvzS27zUg5KYQ==",
+			"license": "MIT",
 			"dependencies": {
 				"bit-twiddle": "^1.0.0",
 				"dup": "^1.0.0"
@@ -10171,9 +10677,10 @@
 		},
 		"node_modules/typescript": {
 			"version": "5.4.5",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+			"resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.4.5.tgz",
 			"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
 			"devOptional": true,
+			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -10184,33 +10691,37 @@
 		},
 		"node_modules/undefsafe": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+			"resolved": "https://registry.npmmirror.com/undefsafe/-/undefsafe-2.0.5.tgz",
 			"integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/undici-types": {
 			"version": "5.26.5",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+			"resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz",
 			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/unpipe": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz",
 			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/unquote": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-			"integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
+			"resolved": "https://registry.npmmirror.com/unquote/-/unquote-1.1.1.tgz",
+			"integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
+			"license": "MIT"
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.0.13",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+			"integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
 			"dev": true,
 			"funding": [
 				{
@@ -10226,9 +10737,10 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
+				"escalade": "^3.2.0",
+				"picocolors": "^1.1.0"
 			},
 			"bin": {
 				"update-browserslist-db": "cli.js"
@@ -10239,61 +10751,55 @@
 		},
 		"node_modules/update-diff": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/update-diff/-/update-diff-1.1.0.tgz",
-			"integrity": "sha512-rCiBPiHxZwT4+sBhEbChzpO5hYHjm91kScWgdHf4Qeafs6Ba7MBl+d9GlGv72bcTZQO0sLmtQS1pHSWoCLtN/A=="
+			"resolved": "https://registry.npmmirror.com/update-diff/-/update-diff-1.1.0.tgz",
+			"integrity": "sha512-rCiBPiHxZwT4+sBhEbChzpO5hYHjm91kScWgdHf4Qeafs6Ba7MBl+d9GlGv72bcTZQO0sLmtQS1pHSWoCLtN/A==",
+			"license": "MIT"
 		},
 		"node_modules/update-input-width": {
 			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/update-input-width/-/update-input-width-1.4.2.tgz",
+			"resolved": "https://registry.npmmirror.com/update-input-width/-/update-input-width-1.4.2.tgz",
 			"integrity": "sha512-/p0XLhrQQQ4bMWD7bL9duYObwYCO1qGr8R19xcMmoMSmXuQ7/1//veUnCObQ7/iW6E2pGS6rFkS4TfH4ur7e/g==",
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/update-input-width?sponsor=1"
 			}
 		},
 		"node_modules/uri-js": {
 			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz",
 			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"punycode": "^2.1.0"
 			}
 		},
 		"node_modules/url": {
-			"version": "0.11.3",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
-			"integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
+			"version": "0.11.4",
+			"resolved": "https://registry.npmmirror.com/url/-/url-0.11.4.tgz",
+			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"punycode": "^1.4.1",
-				"qs": "^6.11.2"
+				"qs": "^6.12.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/url/node_modules/punycode": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"resolved": "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz",
 			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-			"dev": true
-		},
-		"node_modules/url/node_modules/qs": {
-			"version": "6.11.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-			"integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
 			"dev": true,
-			"dependencies": {
-				"side-channel": "^1.0.4"
-			},
-			"engines": {
-				"node": ">=0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
+			"license": "MIT"
 		},
 		"node_modules/use-isomorphic-layout-effect": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
 			"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+			"license": "MIT",
 			"peerDependencies": {
 				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			},
@@ -10304,17 +10810,19 @@
 			}
 		},
 		"node_modules/use-sync-external-store": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-			"integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmmirror.com/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz",
+			"integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==",
+			"license": "MIT",
 			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
 			}
 		},
 		"node_modules/usehooks-ts": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/usehooks-ts/-/usehooks-ts-3.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/usehooks-ts/-/usehooks-ts-3.1.0.tgz",
 			"integrity": "sha512-bBIa7yUyPhE1BCc0GmR96VU/15l/9gP1Ch5mYdLcFBaFGQsdmXkvjV0TtOqW1yUd6VjIwDunm+flSciCQXujiw==",
+			"license": "MIT",
 			"dependencies": {
 				"lodash.debounce": "^4.0.8"
 			},
@@ -10327,9 +10835,10 @@
 		},
 		"node_modules/util": {
 			"version": "0.12.5",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+			"resolved": "https://registry.npmmirror.com/util/-/util-0.12.5.tgz",
 			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"is-arguments": "^1.0.4",
@@ -10340,54 +10849,70 @@
 		},
 		"node_modules/util-deprecate": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+			"resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+			"license": "MIT"
 		},
 		"node_modules/utils-merge": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
 			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4.0"
 			}
 		},
 		"node_modules/uuid": {
 			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/uuid/-/uuid-7.0.3.tgz",
 			"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+			"license": "MIT",
 			"bin": {
 				"uuid": "dist/bin/uuid"
 			}
 		},
 		"node_modules/vary": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
 			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/vm-browserify": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+			"resolved": "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz",
 			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/vt-pbf": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
+			"resolved": "https://registry.npmmirror.com/vt-pbf/-/vt-pbf-3.1.3.tgz",
 			"integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
+			"license": "MIT",
 			"dependencies": {
 				"@mapbox/point-geometry": "0.1.0",
 				"@mapbox/vector-tile": "^1.3.1",
 				"pbf": "^3.2.1"
 			}
 		},
+		"node_modules/warning": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmmirror.com/warning/-/warning-4.0.3.tgz",
+			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+			"license": "MIT",
+			"dependencies": {
+				"loose-envify": "^1.0.0"
+			}
+		},
 		"node_modules/watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
@@ -10398,22 +10923,25 @@
 		},
 		"node_modules/weak-map": {
 			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.8.tgz",
-			"integrity": "sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw=="
+			"resolved": "https://registry.npmmirror.com/weak-map/-/weak-map-1.0.8.tgz",
+			"integrity": "sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw==",
+			"license": "Apache-2.0"
 		},
 		"node_modules/webgl-context": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/webgl-context/-/webgl-context-2.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/webgl-context/-/webgl-context-2.2.0.tgz",
 			"integrity": "sha512-q/fGIivtqTT7PEoF07axFIlHNk/XCPaYpq64btnepopSWvKNFkoORlQYgqDigBIuGA1ExnFd/GnSUnBNEPQY7Q==",
+			"license": "MIT",
 			"dependencies": {
 				"get-canvas-context": "^1.0.1"
 			}
 		},
 		"node_modules/webpack": {
 			"version": "5.76.3",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.3.tgz",
+			"resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.76.3.tgz",
 			"integrity": "sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/eslint-scope": "^3.7.3",
 				"@types/estree": "^0.0.51",
@@ -10458,9 +10986,10 @@
 		},
 		"node_modules/webpack-cli": {
 			"version": "5.1.4",
-			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
+			"resolved": "https://registry.npmmirror.com/webpack-cli/-/webpack-cli-5.1.4.tgz",
 			"integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@discoveryjs/json-ext": "^0.5.0",
 				"@webpack-cli/configtest": "^2.1.1",
@@ -10503,18 +11032,20 @@
 		},
 		"node_modules/webpack-cli/node_modules/commander": {
 			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/commander/-/commander-10.0.1.tgz",
 			"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=14"
 			}
 		},
 		"node_modules/webpack-merge": {
 			"version": "5.10.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+			"resolved": "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-5.10.0.tgz",
 			"integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"clone-deep": "^4.0.1",
 				"flat": "^5.0.2",
@@ -10526,18 +11057,27 @@
 		},
 		"node_modules/webpack-sources": {
 			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+			"resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
 			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.13.0"
 			}
 		},
+		"node_modules/webpack/node_modules/@types/estree": {
+			"version": "0.0.51",
+			"resolved": "https://registry.npmmirror.com/@types/estree/-/estree-0.0.51.tgz",
+			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/webpack/node_modules/eslint-scope": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
 			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"esrecurse": "^4.3.0",
 				"estraverse": "^4.1.1"
@@ -10548,36 +11088,20 @@
 		},
 		"node_modules/webpack/node_modules/estraverse": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
 			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
-		"node_modules/webpack/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
 		"node_modules/which": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -10589,16 +11113,17 @@
 			}
 		},
 		"node_modules/which-typed-array": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-			"integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+			"version": "1.1.16",
+			"resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.16.tgz",
+			"integrity": "sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"available-typed-arrays": "^1.0.5",
-				"call-bind": "^1.0.4",
+				"available-typed-arrays": "^1.0.7",
+				"call-bind": "^1.0.7",
 				"for-each": "^0.3.3",
 				"gopd": "^1.0.1",
-				"has-tostringtag": "^1.0.0"
+				"has-tostringtag": "^1.0.2"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -10609,37 +11134,43 @@
 		},
 		"node_modules/wildcard": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-2.0.1.tgz",
 			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/word-wrap": {
 			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+			"resolved": "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz",
 			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/workerpool": {
 			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+			"resolved": "https://registry.npmmirror.com/workerpool/-/workerpool-6.2.1.tgz",
 			"integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
-			"dev": true
+			"dev": true,
+			"license": "Apache-2.0"
 		},
 		"node_modules/world-calendars": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/world-calendars/-/world-calendars-1.0.3.tgz",
+			"resolved": "https://registry.npmmirror.com/world-calendars/-/world-calendars-1.0.3.tgz",
 			"integrity": "sha512-sAjLZkBnsbHkHWVhrsCU5Sa/EVuf9QqgvrN8zyJ2L/F9FR9Oc6CvVK0674+PGAtmmmYQMH98tCUSO4QLQv3/TQ==",
+			"license": "MIT",
 			"dependencies": {
 				"object-assign": "^4.1.0"
 			}
 		},
 		"node_modules/wrap-ansi": {
 			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
 			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"string-width": "^4.1.0",
@@ -10652,48 +11183,17 @@
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
-		"node_modules/wrap-ansi/node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/wrap-ansi/node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
 		"node_modules/wrappy": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+			"resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+			"license": "ISC"
 		},
 		"node_modules/xml2js": {
 			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+			"resolved": "https://registry.npmmirror.com/xml2js/-/xml2js-0.5.0.tgz",
 			"integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+			"license": "MIT",
 			"dependencies": {
 				"sax": ">=0.6.0",
 				"xmlbuilder": "~11.0.0"
@@ -10704,42 +11204,47 @@
 		},
 		"node_modules/xmlbuilder": {
 			"version": "11.0.1",
-			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+			"resolved": "https://registry.npmmirror.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
 			"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
 		"node_modules/xtend": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+			"resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
 			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=0.4"
 			}
 		},
 		"node_modules/y18n": {
 			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
 			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=10"
 			}
 		},
 		"node_modules/yaml": {
 			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+			"resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
 			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"license": "ISC",
 			"engines": {
 				"node": ">= 6"
 			}
 		},
 		"node_modules/yargs": {
 			"version": "16.2.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"resolved": "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz",
 			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"cliui": "^7.0.2",
 				"escalade": "^3.1.1",
@@ -10755,18 +11260,20 @@
 		},
 		"node_modules/yargs-parser": {
 			"version": "20.2.4",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.4.tgz",
 			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=10"
 			}
 		},
 		"node_modules/yargs-unparser": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"resolved": "https://registry.npmmirror.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
 			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"camelcase": "^6.0.0",
 				"decamelize": "^4.0.0",
@@ -10779,18 +11286,20 @@
 		},
 		"node_modules/yargs-unparser/node_modules/is-plain-obj": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
 			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/yocto-queue": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"resolved": "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz",
 			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
diff --git a/package.json b/package.json
index fa5f6d8de..625a68a07 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
 		]
 	},
 	"dependencies": {
+		"@plotly/mapbox-gl": "~1.13.4",
 		"@reduxjs/toolkit": "~2.2.5",
 		"@wojtekmaj/react-daterange-picker": "~6.0.0",
 		"axios": "~1.6.2",

From 7ec61e644121cff0683fca593c2eaf1047b6809e Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Fri, 6 Dec 2024 12:54:10 -0800
Subject: [PATCH 102/128] address requested changes

---
 src/server/test/web/obviusTest.js | 52 ++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index e93129bd7..6965b3a78 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -12,6 +12,19 @@ const bcrypt = require('bcryptjs');
 const { insertUnits } = require('../../util/insertData');
 const Unit = require('../../models/Unit');
 const Meter = require('../../models/Meter.js');
+const { Console } = require('console');
+
+//expected names and ids for obvius meters.
+const expMeterNames = [
+	'mb-001.0', 'mb-001.1', 'mb-001.2', 'mb-001.3', 'mb-001.4', 'mb-001.5', 'mb-001.6', 'mb-001.7',
+	'mb-001.8', 'mb-001.9', 'mb-001.10', 'mb-001.11', 'mb-001.12', 'mb-001.13', 'mb-001.14', 'mb-001.15',
+	'mb-001.16', 'mb-001.17', 'mb-001.18', 'mb-001.19', 'mb-001.20', 'mb-001.21', 'mb-001.22', 'mb-001.23',
+	'mb-001.24', 'mb-001.25', 'mb-001.26', 'mb-001.27'
+];
+
+const expMeterIDs = [
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28
+];
 
 mocha.describe('Obvius API', () => {
 	mocha.describe('upload: ', () => {
@@ -176,15 +189,15 @@ mocha.describe('Obvius API', () => {
 					.field('modbusdevice', '1234')
 					.attach('files', configFilePath);
 
+				//logfile upload should respond with 200, success
+				expect(upload).to.have.status(200);
+
 				const res = await chai.request(app)
 					.post('/api/obvius')
 					.field('username', obviusUser.username)
 					.field('password', obviusUser.password)
 					.field('mode', manifestRequestMode);
 
-				//logfile upload should respond with 200, success
-				expect(upload).to.have.status(200);
-
 				//logfile request should respond with 200, success
 				expect(res).to.have.status(200);
 
@@ -201,8 +214,8 @@ mocha.describe('Obvius API', () => {
 				//config file uploads should create accurate meter objects
 				const allMeters = await Meter.getAll(conn);
 
-				//mb-001.ini should make 28 meters
-				expect(allMeters.length).to.equal(28);
+				//mb-001.ini should make meters equal to expMeterNames.length
+				expect(allMeters.length).to.equal(expMeterNames.length);
 
 				//these arrays should vary for different submeters
 				const meterNames = [];
@@ -213,20 +226,9 @@ mocha.describe('Obvius API', () => {
 				const allMetersAreNotDisplayable = true;
 				const allMetersAreNotEnabled = true;
 
-				//expected names and ids
-				const expMeterNames = [
-					'mb-001.0', 'mb-001.1', 'mb-001.2', 'mb-001.3', 'mb-001.4', 'mb-001.5', 'mb-001.6', 'mb-001.7',
-					'mb-001.8', 'mb-001.9', 'mb-001.10', 'mb-001.11', 'mb-001.12', 'mb-001.13', 'mb-001.14', 'mb-001.15',
-					'mb-001.16', 'mb-001.17', 'mb-001.18', 'mb-001.19', 'mb-001.20', 'mb-001.21', 'mb-001.22', 'mb-001.23',
-					'mb-001.24', 'mb-001.25', 'mb-001.26', 'mb-001.27'
-				];
-
-				const expMeterIDs = [
-					1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28
-				];
 				for (const meter of allMeters) {
 					//populate arrays with varying values in ascending order
-					let currentName = meter.name + "";
+					let currentName = meter.name;
 					let idx = currentName.split('.')[1];
 					meterNames[parseInt(idx)] = meter.name;
 					meterIDs[meter.id - 1] = meter.id;
@@ -243,17 +245,25 @@ mocha.describe('Obvius API', () => {
 				}
 
 				//flags for comparison between expected arrays and actual arrays
-				const expectedNamesAreEqual = true;
-				const expectedIDsAreEqual = true;
+				let expectedNamesAreEqual = true;
+				let expectedIDsAreEqual = true;
+
+				//error message for more descriptive failures
+				let allErrorMessagesNames = "";
+				let allErrorMessagesIDs = "";
+
 
 				//both arrays should be contain the same sequence of values
 				for (let i = 0; i < 28; i++) {
 					if (expMeterNames[i] != meterNames[i]) {
 						expectedNamesAreEqual = false;
+						allErrorMessagesNames += "Meter failed name comparison, Expeceted: " + expMeterNames[i] + " Actual: " + meterNames[i] + "\n";
 					}
 
 					if (expMeterIDs[i] != meterIDs[i]) {
 						expectedIDsAreEqual = false;
+						allErrorMessagesIDs += "Meter failed ID comparison. Expected: " + expMeterIDs[i] + " Actual: " + meterIDs[i] + "\n";
+
 					}
 				}
 
@@ -263,8 +273,8 @@ mocha.describe('Obvius API', () => {
 				expect(allMetersAreNotEnabled).to.equal(true);
 
 				//expected arrays should equal actual arrays
-				expect(expectedNamesAreEqual).to.equal(true);
-				expect(expectedIDsAreEqual).to.equal(true);
+				expect(expectedNamesAreEqual).to.equal(true, allErrorMessagesNames);
+				expect(expectedIDsAreEqual).to.equal(true, allErrorMessagesIDs);
 			});
 		});
 	});

From dc1a369508504d0ba2c3df64e8e7bde9b46e2445 Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Fri, 6 Dec 2024 13:52:12 -0800
Subject: [PATCH 103/128] add modbus/serial params

---
 src/server/test/web/obviusTest.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 6965b3a78..410a32de9 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -177,6 +177,9 @@ mocha.describe('Obvius API', () => {
 				obviusUser.password = password;
 				const uploadRequestMode = 'CONFIGFILEUPLOAD';
 				const manifestRequestMode = 'CONFIGFILEMANIFEST';
+				const serialStart = 'mb-';
+				const serialNumber = serialStart + '001';
+				const modbusDevice = '1234'
 
 				// Adapted from ../obvius/README.md
 				const configFilePath = 'src/server/test/web/obvius/mb-001.ini.gz';
@@ -185,8 +188,8 @@ mocha.describe('Obvius API', () => {
 					.field('username', obviusUser.username)
 					.field('password', obviusUser.password)
 					.field('mode', uploadRequestMode)
-					.field('serialnumber', 'mb-001')
-					.field('modbusdevice', '1234')
+					.field('serialnumber', serialNumber)
+					.field('modbusdevice', modbusDevice)
 					.attach('files', configFilePath);
 
 				//logfile upload should respond with 200, success
@@ -205,7 +208,7 @@ mocha.describe('Obvius API', () => {
 				const allConfigfiles = await Configfile.getAll(conn);
 				let response = '';
 				for (f of allConfigfiles) {
-					response += `CONFIGFILE,${f.makeFilename()},${f.hash},${f.created.format('YYYY-MM-DD hh:mm:ss')}`;
+					response += `CONFIGFILE,${serialNumber}-${serialStart}${modbusDevice}.ini,${f.hash},${f.created.format('YYYY-MM-DD hh:mm:ss')}`;
 				}
 
 				//the third line of the response should be the config file

From 818f66c2b0ca6547397b21a2c5fd8e1564821adc Mon Sep 17 00:00:00 2001
From: Luke Cheng <Lukeecheng@gmail.com>
Date: Sat, 7 Dec 2024 09:06:32 -0800
Subject: [PATCH 104/128] Updated checWebsiteStatus.js to log the error using
 log.js. Created a shell script that runs checWebsiteStatus script in docker
 with ability to provide URL

---
 package.json                              |  3 +-
 src/scripts/checkWebsiteStatusCron.bash   | 16 +++++
 src/server/services/checkWebsiteStatus.js | 80 ++++++++---------------
 3 files changed, 45 insertions(+), 54 deletions(-)
 create mode 100644 src/scripts/checkWebsiteStatusCron.bash

diff --git a/package.json b/package.json
index 4fc5b5ad3..d725b94d8 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 	"scripts": {
 		"start": "node ./src/bin/www",
 		"start:dev": "nodemon --legacy-watch --inspect=0.0.0.0 ./src/bin/www",
-		"status": "node src/server/services/checkWebsiteStatus.js",
+		"checkWebsiteStatus": "node src/server/services/checkWebsiteStatus.js",
 		"webpack:dev": "webpack watch --color --progress --mode development",
 		"webpack:build": "webpack build --node-env production",
 		"webpack": "webpack build --color --progress --mode development",
@@ -63,7 +63,6 @@
 		"bcryptjs": "~2.4.3",
 		"body-parser": "~1.20.2",
 		"bootstrap": "~5.3.3",
-		"colors": "~1.4.0",
 		"csv": "~5.3.2",
 		"csv-stringify": "~5.6.5",
 		"d3": "~7.8.5",
diff --git a/src/scripts/checkWebsiteStatusCron.bash b/src/scripts/checkWebsiteStatusCron.bash
new file mode 100644
index 000000000..3d5b15687
--- /dev/null
+++ b/src/scripts/checkWebsiteStatusCron.bash
@@ -0,0 +1,16 @@
+# This aggregates the readings data at hour level.
+# This should be copied to /etc/ or /etc/cron.hourly/ or /etc/cron.daily and the copy renamed so that its function will be clear to admins.
+
+# Check if a URL is provided as an argument
+if [ -z "$1" ]; then
+    echo "Error: No URL provided. Usage: $0"
+    exit 1
+fi
+
+URL=$1
+
+# The absolute path the project root directory (OED)
+cd '/example/path/to/project/OED'
+
+# The following line should NOT need to be edited except by devs or if you have an old system with only docker-compose.
+docker compose run --rm web npm run --silent checkWebsiteStatus -- $URL &>> /dev/null &
diff --git a/src/server/services/checkWebsiteStatus.js b/src/server/services/checkWebsiteStatus.js
index b8e2ad9de..1009f4e75 100644
--- a/src/server/services/checkWebsiteStatus.js
+++ b/src/server/services/checkWebsiteStatus.js
@@ -1,52 +1,28 @@
-const cron = require('node-cron');
-const { getConnection } = require('../db');
-const { logMailer } = require('../logMailer');
-const LogEmail = require('../models/LogEmail');
-const colors = require('colors');
-  
-async function checkWebsite() {
-  const conn = getConnection();
-
-  try {
-    const response = await fetch('https://httpstat.us/500/', { method: 'HEAD' });
-
-    if (response.ok) {
-      console.log('The server is up'.green.inverse);
-    } else {
-      console.error('The server is down'.red.inverse);
-
-      const errorMessage = 'The server at https://httpstat.us/500/ is down.';
-
-      // Log the error in the database
-      const log = new LogEmail(undefined, errorMessage);
-      await log.insert(conn);
-
-      // Send a logging email
-      await logMailer(conn);
-    }
-  } 
-  catch (error) {
-    console.error('Error:', error);
-
-    const errorMessage = `Failed to reach https://httpstat.us/500/. Error: ${error.message}`;
-
-    // Log the error in the database
-    const log = new LogEmail(undefined, errorMessage);
-    await log.insert(conn);
-
-    // Send a logging email
-    await logMailer(conn);
-  } finally {
-    if (conn.close) {
-      await conn.close();
-    }
-  }
-}
-
-// Schedule the task to run every hour
-// cron.schedule('0 * * * *', () => {
-//   console.log('Running website status check...');
-//   checkWebsite();
-// });
-
-checkWebsite();
\ No newline at end of file
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+	const cron = require('node-cron');
+	const { getConnection } = require('../db');
+	const { log } = require('../log');
+	const { logMailer } = require('../logMailer');
+	const LogEmail = require('../models/LogEmail');
+	const WEBSITE_URL = process.argv[2];
+	
+	async function checkWebsite() {
+		try {
+			const response = await fetch(WEBSITE_URL, { method: 'HEAD' });
+	
+			if (!response.ok) {
+				const errorMessage = `The server at ${WEBSITE_URL} is down.`;
+				// Log the error using Logger class
+				log.error(errorMessage);	
+			}
+		} catch (error) {
+			const errorMessage = `Failed to reach ${WEBSITE_URL}. Error: ${error.message}`;
+	  log.error(errorMessage, error);
+		}
+	}
+	
+	checkWebsite();
+	
\ No newline at end of file

From 824a512098056f6989c1c03fba4eed759b6491c2 Mon Sep 17 00:00:00 2001
From: Chika Starks <145545889+ChikaStarks@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:40:17 -0800
Subject: [PATCH 105/128] Commiting CG4 Co-authored-by: Abdelrhaman Nianaa
 <anianaa@student.cccd.edu>

---
 .../test/web/readingsCompareGroupQuantity.js   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index 39ab5ab2a..ccb5c5a3b 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -51,8 +51,6 @@ mocha.describe('readings API', () => {
 						});
 					expectCompareToEqualExpected(res, expected, GROUP_ID);
 				});
-
-				// Add CG3 here
 				mocha.it('CG3: 28 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as kWh ', async () => {
 					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh);
 					// Get the unit ID since the DB could use any value.
@@ -68,7 +66,21 @@ mocha.describe('readings API', () => {
 						});
 					expectCompareToEqualExpected(res, expected, GROUP_ID);
 				});
-				// Add CG4 here
+				mocha.it('CG4: 1 day shift end 2022-11-01 00:00:00 (full day) for 15 minute reading intervals and quantity units & kWh as kWh', async () => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh);
+					// Get the unit ID since the DB could use any value.
+					const unitId = await getUnitId('kWh');
+					const expected = [7820.41927336775, 8351.13117114892];
+					// for compare, need the unitID, currentStart, currentEnd, shift
+					const res = await chai.request(app).get(`/api/compareReadings/groups/${GROUP_ID}`)
+						.query({
+							curr_start: '2022-10-31 00:00:00',
+							curr_end: '2022-11-01 00:00:00',
+							shift: 'P1D',
+							graphicUnitId: unitId
+						});
+					expectCompareToEqualExpected(res, expected, GROUP_ID);
+				});
 
 				// Add CG5 here
 

From f7006f21c61310b2e64c2c7a10a4db4844d5e08a Mon Sep 17 00:00:00 2001
From: Luke Cheng <Lukeecheng@gmail.com>
Date: Mon, 9 Dec 2024 13:19:18 -0800
Subject: [PATCH 106/128] Cleaned up unnecessary imports and comments

---
 package.json                              |  1 -
 src/scripts/checkWebsiteStatusCron.bash   | 11 +++++++++--
 src/server/services/checkWebsiteStatus.js |  4 ----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index d725b94d8..031ad7646 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,6 @@
 		"multer": "~1.4.5-lts.1",
 		"ngraph.graph": "~20.0.0",
 		"ngraph.path": "~1.5.0",
-		"node-cron": "~3.0.3",
 		"nodemailer": "~6.9.13",
 		"pg": "~8.12.0",
 		"pg-promise": "~11.8.0",
diff --git a/src/scripts/checkWebsiteStatusCron.bash b/src/scripts/checkWebsiteStatusCron.bash
index 3d5b15687..b4e1cbb55 100644
--- a/src/scripts/checkWebsiteStatusCron.bash
+++ b/src/scripts/checkWebsiteStatusCron.bash
@@ -1,9 +1,16 @@
-# This aggregates the readings data at hour level.
+#!/bin/bash
+# *
+# * This Source Code Form is subject to the terms of the Mozilla Public
+# * License, v. 2.0. If a copy of the MPL was not distributed with this
+# * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# *
+
+# This check the website status at hour level.
 # This should be copied to /etc/ or /etc/cron.hourly/ or /etc/cron.daily and the copy renamed so that its function will be clear to admins.
 
 # Check if a URL is provided as an argument
 if [ -z "$1" ]; then
-    echo "Error: No URL provided. Usage: $0"
+    echo "Error: No URL provided. Usage: $0 URL-to-check"
     exit 1
 fi
 
diff --git a/src/server/services/checkWebsiteStatus.js b/src/server/services/checkWebsiteStatus.js
index 1009f4e75..144aa903f 100644
--- a/src/server/services/checkWebsiteStatus.js
+++ b/src/server/services/checkWebsiteStatus.js
@@ -2,11 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-	const cron = require('node-cron');
-	const { getConnection } = require('../db');
 	const { log } = require('../log');
-	const { logMailer } = require('../logMailer');
-	const LogEmail = require('../models/LogEmail');
 	const WEBSITE_URL = process.argv[2];
 	
 	async function checkWebsite() {

From 0c534f96114dc5141e790cea8795c7aa1e96bcb5 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Mon, 9 Dec 2024 16:32:29 -0500
Subject: [PATCH 107/128] resolved PR comments and refactor code

---
 .../app/components/admin/LogMsgComponent.tsx  | 29 +++++++++----------
 src/client/app/translations/data.ts           |  6 ++++
 src/client/app/utils/api/LogsApi.ts           |  2 +-
 .../sql/logmsg/create_log_types_enum.sql      |  9 ++++++
 .../sql/logmsg/create_logmsg_table.sql        | 13 +++++++++
 src/server/models/LogMsg.js                   |  6 +++-
 src/server/routes/logs.js                     | 12 ++++----
 src/server/services/addLogMsg.js              | 10 +++----
 8 files changed, 57 insertions(+), 30 deletions(-)
 create mode 100644 src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_log_types_enum.sql
 create mode 100644 src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_logmsg_table.sql

diff --git a/src/client/app/components/admin/LogMsgComponent.tsx b/src/client/app/components/admin/LogMsgComponent.tsx
index e3cb26ef1..19bdfdf42 100644
--- a/src/client/app/components/admin/LogMsgComponent.tsx
+++ b/src/client/app/components/admin/LogMsgComponent.tsx
@@ -5,12 +5,12 @@
  */
 
 import * as React from 'react';
-import * as moment from 'moment';
+import * as moment from 'moment-timezone';
 import { orderBy } from 'lodash';
 import {
 	Alert, Button, Dropdown, DropdownItem, DropdownMenu, DropdownToggle,
-	FormFeedback,
-	FormGroup, Input, Label, Modal, ModalBody, ModalHeader, Pagination, PaginationItem, PaginationLink, Table
+	FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalHeader,
+	Pagination, PaginationItem, PaginationLink, Table
 } from 'reactstrap';
 import DateRangePicker from '@wojtekmaj/react-daterange-picker';
 import { useAppSelector } from '../../redux/reduxHooks';
@@ -82,7 +82,7 @@ export default function LogMsgComponent() {
 
 	// Open modal with the full log message
 	const handleLogMessageModal = (logType: string, logTime: string, logMessage: string) => {
-		setModelHeader(`[${logType}] ${moment(logTime).toLocaleString()}`);
+		setModelHeader(`[${logType}] ${moment.parseZone(logTime).format('LL LTS [(and ]SSS[ms)]')}`);
 		setModalLogMessage(logMessage);
 		setModalOpen(true);
 	};
@@ -136,10 +136,6 @@ export default function LogMsgComponent() {
 		setDateSortOrder(newDateSortOrder);
 		setLogs(sortedLogs);
 	};
-	// Handle page change for pagination
-	const handlePageChange = (newPage: number) => {
-		setCurrentPage(newPage);
-	};
 
 	// Filter logs based on selected log types and date range
 	const paginatedLogs = showAllLogs
@@ -154,7 +150,8 @@ export default function LogMsgComponent() {
 	async function handleShowLogTable() {
 		try {
 			// get log by date and type
-			const data = await logsApi.getLogsByDateRangeAndType(logDateRange, selectedUpdateLogTypes, logLimit.toString());
+			const data = await logsApi.getLogsByDateRangeAndType(
+				logDateRange, selectedUpdateLogTypes.toString(), logLimit.toString());
 			setLogs(data);
 			// reset pagination to first page after fetching new logs
 			setCurrentPage(1);
@@ -284,7 +281,7 @@ export default function LogMsgComponent() {
 								>
 									{log.logMessage.length > 80 ? `${log.logMessage.slice(0, 80)} ...` : log.logMessage}
 								</td>
-								<td>{moment(log.logTime).format('MM/DD/YYYY, hh:mm:ss.SS A')}</td>
+								<td>{moment.parseZone(log.logTime).format('LL LTS')}</td>
 							</tr>
 						))}
 					</tbody>
@@ -297,23 +294,23 @@ export default function LogMsgComponent() {
 			{!showAllLogs && logs.length !== 0 && <Pagination aria-label="Log pagination" style={{ justifyContent: 'center', margin: '1% auto' }}>
 				<>
 					<PaginationItem disabled={currentPage === 1}>
-						<PaginationLink first onClick={() => handlePageChange(1)} />
+						<PaginationLink first onClick={() => setCurrentPage(1)} />
 					</PaginationItem><PaginationItem disabled={currentPage === 1}>
-						<PaginationLink previous onClick={() => handlePageChange(currentPage - 1)} />
+						<PaginationLink previous onClick={() => setCurrentPage(currentPage - 1)} />
 					</PaginationItem>
 
 					{Array.from({ length: totalPages }, (_, index) => (
 						<PaginationItem key={index + 1} active={currentPage === index + 1}>
-							<PaginationLink onClick={() => handlePageChange(index + 1)}>
+							<PaginationLink onClick={() => setCurrentPage(index + 1)}>
 								{index + 1}
 							</PaginationLink>
 						</PaginationItem>
 					))}
 
 					<PaginationItem disabled={currentPage === totalPages}>
-						<PaginationLink next onClick={() => handlePageChange(currentPage + 1)} />
+						<PaginationLink next onClick={() => setCurrentPage(currentPage + 1)} />
 					</PaginationItem><PaginationItem disabled={currentPage === totalPages}>
-						<PaginationLink last onClick={() => handlePageChange(totalPages)} />
+						<PaginationLink last onClick={() => setCurrentPage(totalPages)} />
 					</PaginationItem>
 				</>
 			</Pagination >}
@@ -321,7 +318,7 @@ export default function LogMsgComponent() {
 			{/* Show all logs or in pages button */}
 			{logs.length > 0 &&
 				<Button color='primary' style={{ margin: '0% 40% 1%' }} onClick={() => setShowAllLogs(!showAllLogs)}>
-					{!showAllLogs ? `Show All Logs (${logs.length})` : 'Show in pages'}
+					{!showAllLogs ? `${translate('show.all.logs')} (${logs.length})` : translate('show.in.pages')}
 				</Button>}
 
 			{/* Modal for displaying full log message */}
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 95395495f..393ffaf5c 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -435,8 +435,10 @@ const LocaleTranslationData = {
 		"select.meters": "Select Meters",
 		"select.unit": "Select Unit",
 		"show": "Show",
+		"show.all.logs": "Show All Logs ",
 		"show.grid": "Show grid",
 		"show.options": "Show options",
+		"show.in.pages": "Show in Pages",
 		"site.settings": "Site Settings",
 		"site.title": "Site Title",
 		"sort": "Sort Order",
@@ -966,8 +968,10 @@ const LocaleTranslationData = {
 		"select.meters": "Sélectionnez des Mètres",
 		"select.unit": "Select Unit\u{26A1}",
 		"show": "Montrer",
+		"show.all.logs": "Show All Logs\u{26A1} ",
 		"show.grid": "Show grid\u{26A1}",
 		"show.options": "Options de désancrage",
+		"show.in.pages": "Show in Pages\u{26A1}",
 		"site.settings": "Site Settings\u{26A1}",
 		"site.title": "Site Title\u{26A1}",
 		"sort": "Sort Order\u{26A1}",
@@ -1498,8 +1502,10 @@ const LocaleTranslationData = {
 		"select.meters": "Seleccionar medidores",
 		"select.unit": "Seleccionar unidad",
 		"show": "Mostrar",
+		"show.all.logs": "Show All Logs\u{26A1} ",
 		"show.grid": "Mostrar rejilla",
 		"show.options": "Mostrar opciones",
+		"show.in.pages": "Show in Pages\u{26A1}",
 		"site.settings": "Site Settings\u{26A1}",
 		"site.title": "Site Title\u{26A1}",
 		"sort": "Sort Order\u{26A1}",
diff --git a/src/client/app/utils/api/LogsApi.ts b/src/client/app/utils/api/LogsApi.ts
index f7c30f633..11d58e8db 100644
--- a/src/client/app/utils/api/LogsApi.ts
+++ b/src/client/app/utils/api/LogsApi.ts
@@ -27,7 +27,7 @@ export default class LogsApi {
 		return await this.backend.doPostRequest('/api/logs/error', log);
 	}
 
-	public async getLogsByDateRangeAndType(timeInterval: TimeInterval, logTypes: string[], logLimit: string): Promise<LogData[]> {
+	public async getLogsByDateRangeAndType(timeInterval: TimeInterval, logTypes: string, logLimit: string): Promise<LogData[]> {
 		const request = await this.backend.doGetRequest('/api/logs/logsmsg/getLogsByDateRangeAndType',
 			{ timeInterval: timeInterval.toString(), logTypes: logTypes, logLimit: logLimit });
 		return request as LogData[];
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_log_types_enum.sql b/src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_log_types_enum.sql
new file mode 100644
index 000000000..64df5b2ab
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_log_types_enum.sql
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+DO $$ BEGIN 
+	CREATE TYPE log_msg_type AS ENUM('INFO', 'WARN', 'ERROR', 'DEBUG', 'SILENT');
+EXCEPTION
+	WHEN duplicate_object THEN null;
+END $$;
\ No newline at end of file
diff --git a/src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_logmsg_table.sql b/src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_logmsg_table.sql
new file mode 100644
index 000000000..1e6cfc5d8
--- /dev/null
+++ b/src/server/migrations/1.0.0-2.0.0/sql/logmsg/create_logmsg_table.sql
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+--create logmsg table
+CREATE TABLE IF NOT EXISTS logmsg (
+	id SERIAL PRIMARY KEY,
+	log_type log_msg_type NOT NULL,
+	log_message TEXT NOT NULL,
+	log_time TIMESTAMP NOT NULL
+);
+
+-- TODO Consider index optimization for queries
\ No newline at end of file
diff --git a/src/server/models/LogMsg.js b/src/server/models/LogMsg.js
index 98a9ecc9c..119f0e345 100644
--- a/src/server/models/LogMsg.js
+++ b/src/server/models/LogMsg.js
@@ -52,7 +52,11 @@ class LogMsg {
 	 */
 	async insert(conn) {
 		const logMsg = this;
-		await conn.none(sqlFile('logmsg/insert_new_logmsg.sql'), logMsg);
+		await conn.none(sqlFile('logmsg/insert_new_logmsg.sql'), {
+			logType: logMsg.logType,
+			logMessage: logMsg.logMessage,
+			logTime: logMsg.logTime.format('YYYY-MM-DDTHH:mm:ss.SSS')
+		});
 	}
 
 	/**
diff --git a/src/server/routes/logs.js b/src/server/routes/logs.js
index f941d9b36..1111d318f 100644
--- a/src/server/routes/logs.js
+++ b/src/server/routes/logs.js
@@ -37,11 +37,8 @@ const validLogMsg = {
 			type: 'string',
 		},
 		logTypes: {
-			type: 'array',
-			items: {
-				type: 'string',
-				enum: ['INFO', 'WARN', 'ERROR', 'SILENT', 'DEBUG']
-			}
+			type: 'string',
+			pattern: '^(INFO|WARN|ERROR|SILENT|DEBUG)(,(INFO|WARN|ERROR|SILENT|DEBUG))*$'
 		},
 		logLimit: {
 			type: 'string',
@@ -86,18 +83,19 @@ router.post('/error', async (req, res) => {
 router.get('/logsmsg/getLogsByDateRangeAndType', async (req, res) => {
 	const validationResult = validate(req.query, validLogMsg);
 	if (!validationResult.valid) {
+		log.error('invalid request to getLogsByDateRangeAndType');
 		res.sendStatus(400);
 	} else {
 		const conn = getConnection();
 		try {
 			const logLimit = parseInt(req.query.logLimit);
 			const timeInterval = TimeInterval.fromString(req.query.timeInterval);
-			const logTypes = req.query.logTypes;
+			const logTypes = req.query.logTypes.split(',');
 			const rows = await LogMsg.getLogsByDateRangeAndType(
 				timeInterval.startTimestamp, timeInterval.endTimestamp, logTypes, logLimit, conn);
 			res.json(rows);
 		} catch (err) {
-			console.error(`Failed to fetch logs filter by date range and type: ${err}`);
+			log.error(`Failed to fetch logs filter by date range and type: ${err}`);
 			res.sendStatus(500);
 		}
 	}
diff --git a/src/server/services/addLogMsg.js b/src/server/services/addLogMsg.js
index f90a59a39..303329061 100644
--- a/src/server/services/addLogMsg.js
+++ b/src/server/services/addLogMsg.js
@@ -10,14 +10,14 @@ const LogMsg = require('../models/LogMsg');
 const { getConnection } = require('../db');
 const moment = require('moment');
 
-const addLogMsgToDB = async () => {
+async function addLogMsgToDB() {
     try {
         const data = await fs.promises.readFile(logFile, 'utf8');
-        const logEntries = data.split('\n').filter(entry => entry.trim() !== '');
+        const logEntries = data.split('[');
         const conn = getConnection();
 
         for (const entry of logEntries) {
-            const logParts = entry.match(/\[(.*?)@(.*?)\] (.*)/);
+            const logParts = entry.match(/(.*?)@(.*?)\] ([^\[]*)(?=\[|$)/s);
             if (logParts) {
                 const [, logType, logTime, logMessage] = logParts;
                 const logMsg = new LogMsg(logType, logMessage, moment(logTime));
@@ -32,6 +32,6 @@ const addLogMsgToDB = async () => {
     } catch (err) {
         console.error(`Failed to migrate logs to database: ${err} (${err.stack})`);
     }
-};
+}
 
-module.exports = addLogMsgToDB;
\ No newline at end of file
+module.exports = { addLogMsgToDB };
\ No newline at end of file

From 08c24c9be0840dd257f64f0d3fcf230e5c92db85 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Mon, 9 Dec 2024 18:27:09 -0600
Subject: [PATCH 108/128] comment fixes

- Fix formatting.
- uninstall node-cron so gone from package-lock.json
---
 package-lock.json                         | 32 ---------------------
 src/server/services/checkWebsiteStatus.js | 35 +++++++++++------------
 2 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 30f020e45..68bc1cd28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,6 @@
 				"bcryptjs": "~2.4.3",
 				"body-parser": "~1.20.2",
 				"bootstrap": "~5.3.3",
-				"colors": "~1.4.0",
 				"csv": "~5.3.2",
 				"csv-stringify": "~5.6.5",
 				"d3": "~7.8.5",
@@ -35,7 +34,6 @@
 				"multer": "~1.4.5-lts.1",
 				"ngraph.graph": "~20.0.0",
 				"ngraph.path": "~1.5.0",
-				"node-cron": "~3.0.3",
 				"nodemailer": "~6.9.13",
 				"pg": "~8.12.0",
 				"pg-promise": "~11.8.0",
@@ -2888,15 +2886,6 @@
 			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
 			"dev": true
 		},
-		"node_modules/colors": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-			"integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.1.90"
-			}
-		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -7263,27 +7252,6 @@
 			"integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
 			"dev": true
 		},
-		"node_modules/node-cron": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz",
-			"integrity": "sha512-dOal67//nohNgYWb+nWmg5dkFdIwDm8EpeGYMekPMrngV3637lqnX0lbUcCtgibHTz6SEz7DAIjKvKDFYCnO1A==",
-			"license": "ISC",
-			"dependencies": {
-				"uuid": "8.3.2"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/node-cron/node_modules/uuid": {
-			"version": "8.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-			"license": "MIT",
-			"bin": {
-				"uuid": "dist/bin/uuid"
-			}
-		},
 		"node_modules/node-polyfill-webpack-plugin": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz",
diff --git a/src/server/services/checkWebsiteStatus.js b/src/server/services/checkWebsiteStatus.js
index 144aa903f..3c63ad65f 100644
--- a/src/server/services/checkWebsiteStatus.js
+++ b/src/server/services/checkWebsiteStatus.js
@@ -2,23 +2,22 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-	const { log } = require('../log');
-	const WEBSITE_URL = process.argv[2];
-	
-	async function checkWebsite() {
-		try {
-			const response = await fetch(WEBSITE_URL, { method: 'HEAD' });
-	
-			if (!response.ok) {
-				const errorMessage = `The server at ${WEBSITE_URL} is down.`;
-				// Log the error using Logger class
-				log.error(errorMessage);	
-			}
-		} catch (error) {
-			const errorMessage = `Failed to reach ${WEBSITE_URL}. Error: ${error.message}`;
-	  log.error(errorMessage, error);
+const { log } = require('../log');
+const WEBSITE_URL = process.argv[2];
+
+async function checkWebsite() {
+	try {
+		const response = await fetch(WEBSITE_URL, { method: 'HEAD' });
+
+		if (!response.ok) {
+			const errorMessage = `The server at ${WEBSITE_URL} is down.`;
+			// Log the error using Logger class
+			log.error(errorMessage);
 		}
+	} catch (error) {
+		const errorMessage = `Failed to reach ${WEBSITE_URL}. Error: ${error.message}`;
+		log.error(errorMessage, error);
 	}
-	
-	checkWebsite();
-	
\ No newline at end of file
+}
+
+checkWebsite();

From 991eb271b2a7e8680c21b4e72f20c0573ae1a030 Mon Sep 17 00:00:00 2001
From: Hin Yan Liew <hinyan17@gmail.com>
Date: Tue, 26 Nov 2024 15:23:50 -0500
Subject: [PATCH 109/128] Added warnings to admin preferences component

---
 .../components/admin/PreferencesComponent.tsx | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index ffc2717cb..153da4549 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { cloneDeep, isEqual } from 'lodash';
+import * as moment from 'moment';
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Button, Input } from 'reactstrap';
@@ -18,7 +19,6 @@ import TimeZoneSelect from '../TimeZoneSelect';
 import { defaultAdminState } from '../../redux/slices/adminSlice';
 
 
-// TODO: Add warning for invalid data
 /**
  * @returns Preferences Component for Administrative use
  */
@@ -43,6 +43,40 @@ export default function PreferencesComponent() {
 		setLocalAdminPref(cloneDeep(adminPreferences));
 	};
 
+	// small functions that determine if fields are invalid to warn the user
+	const invalidReadingFreq = () => {
+		const frequency = moment.duration(localAdminPref.defaultMeterReadingFrequency);
+		return !frequency.isValid() || frequency.asSeconds() <= 0;
+	};
+
+	// force check some localAdminPref values as numbers, they are stored as strings
+	const invalidValueLimits = () => {
+		return Number(localAdminPref.defaultMeterMinimumValue) >= Number(localAdminPref.defaultMeterMaximumValue);
+	};
+
+	const invalidDateLimits = () => {
+		const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
+		const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
+		return !minMoment.isValid() || !maxMoment.isValid() || !minMoment.isBefore(maxMoment);
+	};
+
+	const invalidReadingGap = () => {
+		return Number(localAdminPref.defaultMeterReadingGap) < 0;
+	};
+
+	const invalidMeterErrors = () => {
+		return Number(localAdminPref.defaultMeterMaximumErrors) <= 0;
+	};
+
+	const invalidFileSizeLimit = () => {
+		return Number(localAdminPref.defaultFileSizeLimit) < 0;
+	};
+
+	const invalidWarningFileSize = () => {
+		return Number(localAdminPref.defaultWarningFileSize) < 0
+			|| Number(localAdminPref.defaultWarningFileSize) > Number(localAdminPref.defaultFileSizeLimit);
+	};
+
 	return (
 		<div className='d-flex flex-column '>
 			<UnsavedWarningComponent
@@ -143,6 +177,7 @@ export default function PreferencesComponent() {
 					type='text'
 					value={localAdminPref.defaultMeterReadingFrequency}
 					onChange={e => makeLocalChanges('defaultMeterReadingFrequency', e.target.value)}
+					invalid={invalidReadingFreq()}
 				/>
 			</div>
 			<div>
@@ -154,6 +189,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMinimumValue}
 					onChange={e => makeLocalChanges('defaultMeterMinimumValue', e.target.value)}
 					maxLength={50}
+					invalid={invalidValueLimits()}
 				/>
 			</div>
 			<div>
@@ -165,6 +201,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMaximumValue}
 					onChange={e => makeLocalChanges('defaultMeterMaximumValue', e.target.value)}
 					maxLength={50}
+					invalid={invalidValueLimits()}
 				/>
 			</div>
 			<div>
@@ -176,6 +213,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMinimumDate}
 					onChange={e => makeLocalChanges('defaultMeterMinimumDate', e.target.value)}
 					placeholder='YYYY-MM-DD HH:MM:SS'
+					invalid={invalidDateLimits()}
 				/>
 			</div>
 			<div>
@@ -187,6 +225,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMaximumDate}
 					onChange={e => makeLocalChanges('defaultMeterMaximumDate', e.target.value)}
 					placeholder='YYYY-MM-DD HH:MM:SS'
+					invalid={invalidDateLimits()}
 				/>
 			</div>
 			<div>
@@ -198,6 +237,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterReadingGap}
 					onChange={e => makeLocalChanges('defaultMeterReadingGap', e.target.value)}
 					maxLength={50}
+					invalid={invalidReadingGap()}
 				/>
 			</div>
 			<div>
@@ -209,6 +249,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMaximumErrors}
 					onChange={e => makeLocalChanges('defaultMeterMaximumErrors', e.target.value)}
 					maxLength={50}
+					invalid={invalidMeterErrors()}
 				/>
 			</div>
 			<div>
@@ -298,6 +339,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultWarningFileSize}
 					onChange={e => makeLocalChanges('defaultWarningFileSize', e.target.value)}
 					maxLength={50}
+					invalid={invalidWarningFileSize()}
 				/>
 			</div>
 			<div>
@@ -309,6 +351,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultFileSizeLimit}
 					onChange={e => makeLocalChanges('defaultFileSizeLimit', e.target.value)}
 					maxLength={50}
+					invalid={invalidFileSizeLimit()}
 				/>
 			</div>
 			<div>

From e517ebbd95d596c11c34c5d7df174c540f65cb95 Mon Sep 17 00:00:00 2001
From: Hin Yan Liew <hinyan17@gmail.com>
Date: Mon, 2 Dec 2024 17:19:57 -0500
Subject: [PATCH 110/128] Modified invalid data functions and added
 FormFeedbacks

---
 .../components/admin/PreferencesComponent.tsx | 62 ++++++++++++++++---
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index 153da4549..b1d453c27 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -6,9 +6,12 @@ import { cloneDeep, isEqual } from 'lodash';
 import * as moment from 'moment';
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { Button, Input } from 'reactstrap';
+import { Button, Input, FormFeedback } from 'reactstrap';
 import { UnsavedWarningComponent } from '../UnsavedWarningComponent';
 import { preferencesApi } from '../../redux/api/preferencesApi';
+import {
+	MIN_DATE, MIN_DATE_MOMENT, MAX_DATE, MAX_DATE_MOMENT, MAX_VAL, MIN_VAL, MAX_ERRORS
+} from '../../redux/selectors/adminSelectors';
 import { PreferenceRequestItem, TrueFalseType } from '../../types/items';
 import { ChartTypes } from '../../types/redux/graph';
 import { LanguageTypes } from '../../types/redux/i18n';
@@ -50,14 +53,28 @@ export default function PreferencesComponent() {
 	};
 
 	// force check some localAdminPref values as numbers, they are stored as strings
-	const invalidValueLimits = () => {
-		return Number(localAdminPref.defaultMeterMinimumValue) >= Number(localAdminPref.defaultMeterMaximumValue);
+	const invalidMinValue = () => {
+		const min = Number(localAdminPref.defaultMeterMinimumValue);
+		const max = Number(localAdminPref.defaultMeterMaximumValue);
+		return  min < MIN_VAL || min > max;
 	};
 
-	const invalidDateLimits = () => {
+	const invalidMaxValue = () => {
+		const min = Number(localAdminPref.defaultMeterMinimumValue);
+		const max = Number(localAdminPref.defaultMeterMaximumValue);
+		return max > MAX_VAL || min > max;
+	};
+
+	const invalidMinDate = () => {
+		const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
+		const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
+		return !minMoment.isValid() || !minMoment.isSameOrAfter(MIN_DATE_MOMENT) || !minMoment.isSameOrBefore(maxMoment);
+	};
+
+	const invalidMaxDate = () => {
 		const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
 		const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
-		return !minMoment.isValid() || !maxMoment.isValid() || !minMoment.isBefore(maxMoment);
+		return !maxMoment.isValid() || !maxMoment.isSameOrBefore(MAX_DATE_MOMENT) || !maxMoment.isSameOrAfter(minMoment);
 	};
 
 	const invalidReadingGap = () => {
@@ -65,7 +82,8 @@ export default function PreferencesComponent() {
 	};
 
 	const invalidMeterErrors = () => {
-		return Number(localAdminPref.defaultMeterMaximumErrors) <= 0;
+		return Number(localAdminPref.defaultMeterMaximumErrors) < 0
+			|| Number(localAdminPref.defaultMeterMaximumErrors) > MAX_ERRORS;
 	};
 
 	const invalidFileSizeLimit = () => {
@@ -189,8 +207,11 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMinimumValue}
 					onChange={e => makeLocalChanges('defaultMeterMinimumValue', e.target.value)}
 					maxLength={50}
-					invalid={invalidValueLimits()}
+					invalid={invalidMinValue()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: Number(localAdminPref.defaultMeterMaximumValue) }}/>
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -201,8 +222,11 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMaximumValue}
 					onChange={e => makeLocalChanges('defaultMeterMaximumValue', e.target.value)}
 					maxLength={50}
-					invalid={invalidValueLimits()}
+					invalid={invalidMaxValue()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: Number(localAdminPref.defaultMeterMinimumValue), max: MAX_VAL }}/>
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -213,8 +237,11 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMinimumDate}
 					onChange={e => makeLocalChanges('defaultMeterMinimumDate', e.target.value)}
 					placeholder='YYYY-MM-DD HH:MM:SS'
-					invalid={invalidDateLimits()}
+					invalid={invalidMinDate()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: MIN_DATE, max: moment(localAdminPref.defaultMeterMaximumDate).utc().format() }} />
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -225,8 +252,11 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMaximumDate}
 					onChange={e => makeLocalChanges('defaultMeterMaximumDate', e.target.value)}
 					placeholder='YYYY-MM-DD HH:MM:SS'
-					invalid={invalidDateLimits()}
+					invalid={invalidMaxDate()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: MAX_DATE, max: moment(localAdminPref.defaultMeterMinimumDate).utc().format() }} />
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -239,6 +269,9 @@ export default function PreferencesComponent() {
 					maxLength={50}
 					invalid={invalidReadingGap()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: 0, max: Infinity }}/>
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -251,6 +284,9 @@ export default function PreferencesComponent() {
 					maxLength={50}
 					invalid={invalidMeterErrors()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: 0, max: MAX_ERRORS }}/>
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -341,6 +377,9 @@ export default function PreferencesComponent() {
 					maxLength={50}
 					invalid={invalidWarningFileSize()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: 0, max: Number(localAdminPref.defaultFileSizeLimit) }}/>
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -353,6 +392,9 @@ export default function PreferencesComponent() {
 					maxLength={50}
 					invalid={invalidFileSizeLimit()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.bounds" values={{ min: 0, max: Infinity }}/>
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>

From 3eb6d94309d2f50c65bdbde4692afb2c9dd0054b Mon Sep 17 00:00:00 2001
From: Hin Yan Liew <hinyan17@gmail.com>
Date: Mon, 9 Dec 2024 19:15:40 -0500
Subject: [PATCH 111/128] Fixed small issues with FormFeedback and min/max
 bounds, added final check to submit button

---
 .../components/admin/PreferencesComponent.tsx | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index b1d453c27..34f891e41 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -46,7 +46,7 @@ export default function PreferencesComponent() {
 		setLocalAdminPref(cloneDeep(adminPreferences));
 	};
 
-	// small functions that determine if fields are invalid to warn the user
+	// small functions that determine if fields are invalid
 	const invalidReadingFreq = () => {
 		const frequency = moment.duration(localAdminPref.defaultMeterReadingFrequency);
 		return !frequency.isValid() || frequency.asSeconds() <= 0;
@@ -197,6 +197,9 @@ export default function PreferencesComponent() {
 					onChange={e => makeLocalChanges('defaultMeterReadingFrequency', e.target.value)}
 					invalid={invalidReadingFreq()}
 				/>
+				<FormFeedback>
+					<FormattedMessage id="error.unknown" ></FormattedMessage>
+				</FormFeedback>
 			</div>
 			<div>
 				<p className='mt-2' style={titleStyle}>
@@ -206,6 +209,8 @@ export default function PreferencesComponent() {
 					type='number'
 					value={localAdminPref.defaultMeterMinimumValue}
 					onChange={e => makeLocalChanges('defaultMeterMinimumValue', e.target.value)}
+					min={MIN_VAL}
+					max={Number(localAdminPref.defaultMeterMaximumValue)}
 					maxLength={50}
 					invalid={invalidMinValue()}
 				/>
@@ -221,6 +226,8 @@ export default function PreferencesComponent() {
 					type='number'
 					value={localAdminPref.defaultMeterMaximumValue}
 					onChange={e => makeLocalChanges('defaultMeterMaximumValue', e.target.value)}
+					min={Number(localAdminPref.defaultMeterMinimumValue)}
+					max={MAX_VAL}
 					maxLength={50}
 					invalid={invalidMaxValue()}
 				/>
@@ -255,7 +262,7 @@ export default function PreferencesComponent() {
 					invalid={invalidMaxDate()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: MAX_DATE, max: moment(localAdminPref.defaultMeterMinimumDate).utc().format() }} />
+					<FormattedMessage id="error.bounds" values={{ min: moment(localAdminPref.defaultMeterMinimumDate).utc().format(), max: MAX_DATE }} />
 				</FormFeedback>
 			</div>
 			<div>
@@ -266,6 +273,7 @@ export default function PreferencesComponent() {
 					type='number'
 					value={localAdminPref.defaultMeterReadingGap}
 					onChange={e => makeLocalChanges('defaultMeterReadingGap', e.target.value)}
+					min='0'
 					maxLength={50}
 					invalid={invalidReadingGap()}
 				/>
@@ -281,6 +289,8 @@ export default function PreferencesComponent() {
 					type='number'
 					value={localAdminPref.defaultMeterMaximumErrors}
 					onChange={e => makeLocalChanges('defaultMeterMaximumErrors', e.target.value)}
+					min='0'
+					max={MAX_ERRORS}
 					maxLength={50}
 					invalid={invalidMeterErrors()}
 				/>
@@ -374,6 +384,8 @@ export default function PreferencesComponent() {
 					type='number'
 					value={localAdminPref.defaultWarningFileSize}
 					onChange={e => makeLocalChanges('defaultWarningFileSize', e.target.value)}
+					min='0'
+					max={Number(localAdminPref.defaultFileSizeLimit)}
 					maxLength={50}
 					invalid={invalidWarningFileSize()}
 				/>
@@ -389,6 +401,7 @@ export default function PreferencesComponent() {
 					type='number'
 					value={localAdminPref.defaultFileSizeLimit}
 					onChange={e => makeLocalChanges('defaultFileSizeLimit', e.target.value)}
+					min='0'
 					maxLength={50}
 					invalid={invalidFileSizeLimit()}
 				/>
@@ -427,7 +440,9 @@ export default function PreferencesComponent() {
 								showErrorNotification(translate('failed.to.submit.changes'));
 							})
 					}
-					disabled={!hasChanges}
+					disabled={!hasChanges || invalidReadingFreq() || invalidMinValue() || invalidMaxValue() || invalidMinDate() || invalidMaxDate()
+						|| invalidReadingGap() || invalidMeterErrors() || invalidFileSizeLimit() || invalidWarningFileSize()
+					}
 				>
 					{translate('submit')}
 				</Button>

From 11a2adfdf5463766ebfc5c366d6067728f3a154a Mon Sep 17 00:00:00 2001
From: Hin Yan Liew <hinyan17@gmail.com>
Date: Mon, 9 Dec 2024 21:41:44 -0500
Subject: [PATCH 112/128] added invalid.input key to data.ts and adjusted
 defaultFileSizeLimit min

---
 src/client/app/components/admin/PreferencesComponent.tsx | 4 ++--
 src/client/app/translations/data.ts                      | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index 34f891e41..b8d6cfa5e 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -198,7 +198,7 @@ export default function PreferencesComponent() {
 					invalid={invalidReadingFreq()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.unknown" ></FormattedMessage>
+					<FormattedMessage id="invalid.input" ></FormattedMessage>
 				</FormFeedback>
 			</div>
 			<div>
@@ -401,7 +401,7 @@ export default function PreferencesComponent() {
 					type='number'
 					value={localAdminPref.defaultFileSizeLimit}
 					onChange={e => makeLocalChanges('defaultFileSizeLimit', e.target.value)}
-					min='0'
+					min={Number(localAdminPref.defaultWarningFileSize)}
 					maxLength={50}
 					invalid={invalidFileSizeLimit()}
 				/>
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 393ffaf5c..fe64e0f3c 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -277,6 +277,7 @@ const LocaleTranslationData = {
 		"input.gps.coords.second": "in this format -> latitude,longitude",
 		"input.gps.range": "Invalid GPS coordinate, latitude must be an integer between -90 and 90, longitude must be an integer between -180 and 180. You input: ",
 		"insufficient.readings": "Insufficient readings data to process comparison for ",
+		"invalid.input": "Invalid input",
 		"invalid.number": "Please submit a valid number (between 0 and 2.0)",
 		"invalid.token.login": "Token has expired. Please log in again.",
 		"invalid.token.login.admin": "Token has expired. Please log in again to view this page.",
@@ -810,6 +811,7 @@ const LocaleTranslationData = {
 		"input.gps.coords.second": "in this format -> latitude,longitude\u{26A1}",
 		"input.gps.range": "Coordonnée GPS invalide, la latitude doit être un nombre entier entre -90 et 90, la longitude doit être un nombre entier entre -180 et 180. You input: \u{26A1}",
 		"insufficient.readings": "Données de lectures insuffisantes pour la comparaison de processus pour ",
+		"invalid.input": "Invalid input\u{26A1}",
 		"invalid.number": "Please submit a valid number (between 0 and 2.0)\u{26A1}",
 		"invalid.token.login": "Le jeton a expiré. Connectez-vous à nouveau.",
 		"invalid.token.login.admin": "Le jeton a expiré. Please log in again to view this page.\u{26A1}",
@@ -1344,6 +1346,7 @@ const LocaleTranslationData = {
 		"input.gps.coords.second": "de esta forma -> latitud, longitud",
 		"input.gps.range": "Coordenada GPS no válida, la latitud debe ser un número entero entre -90 y 90, la longitud debe ser un número entero entre -180 y 180. Usted puso: ",
 		"insufficient.readings": "Hay insuficientes datos de lecturas para procesar la comparación de ",
+		"invalid.input": "Invalid input\u{26A1}",
 		"invalid.number": "Por favor indique un número válido (entre 0 a 2.0)",
 		"invalid.token.login": "El token se ha vencido. Inicie la sesión nuevamente",
 		"invalid.token.login.admin": "El token se ha vencido. Inicie la sesión nuevamente para ver esta página.",

From b5f758637562ab2705e5f2bfaf846db7c1e38267 Mon Sep 17 00:00:00 2001
From: VanishedAIR <vanshp.1005@gmail.com>
Date: Mon, 9 Dec 2024 18:54:54 -0800
Subject: [PATCH 113/128] Installed all required stuff

---
 package-lock.json | 541 ++++++++++++++++++++++++----------------------
 package.json      |   6 +-
 2 files changed, 286 insertions(+), 261 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 68bc1cd28..f3ec01532 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
 			"dependencies": {
 				"@reduxjs/toolkit": "~2.2.5",
 				"@wojtekmaj/react-daterange-picker": "~6.0.0",
-				"axios": "~1.6.2",
+				"axios": "~1.7.7",
 				"bcryptjs": "~2.4.3",
 				"body-parser": "~1.20.2",
 				"bootstrap": "~5.3.3",
@@ -20,7 +20,7 @@
 				"d3": "~7.8.5",
 				"dotenv": "~16.4.5",
 				"escape-html": "~1.0.3",
-				"express": "~4.19.2",
+				"express": "~4.21.1",
 				"express-rate-limit": "~7.2.0",
 				"history": "~5.3.0",
 				"ini": "~4.1.3",
@@ -85,7 +85,7 @@
 				"terser-webpack-plugin": "~5.3.10",
 				"ts-loader": "~9.5.1",
 				"typescript": "~5.4.5",
-				"webpack": "~5.76.0",
+				"webpack": "~5.96.1",
 				"webpack-cli": "~5.1.4"
 			}
 		},
@@ -1252,10 +1252,11 @@
 			}
 		},
 		"node_modules/@types/estree": {
-			"version": "0.0.51",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-			"dev": true
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+			"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@types/geojson": {
 			"version": "7946.0.14",
@@ -1593,148 +1594,163 @@
 			}
 		},
 		"node_modules/@webassemblyjs/ast": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-			"integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/helper-numbers": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+				"@webassemblyjs/helper-numbers": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2"
 			}
 		},
 		"node_modules/@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-			"integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-			"dev": true
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-api-error": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-			"integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-			"dev": true
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-			"integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-			"dev": true
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-			"integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/floating-point-hex-parser": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
+				"@webassemblyjs/floating-point-hex-parser": "1.13.2",
+				"@webassemblyjs/helper-api-error": "1.13.2",
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-			"integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-			"dev": true
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-			"integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/wasm-gen": "1.14.1"
 			}
 		},
 		"node_modules/@webassemblyjs/ieee754": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-			"integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@xtuc/ieee754": "^1.2.0"
 			}
 		},
 		"node_modules/@webassemblyjs/leb128": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-			"integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"dependencies": {
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webassemblyjs/utf8": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-			"integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-			"dev": true
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-			"integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/helper-wasm-section": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-opt": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
-				"@webassemblyjs/wast-printer": "1.11.1"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/helper-wasm-section": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-opt": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1",
+				"@webassemblyjs/wast-printer": "1.14.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-			"integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-			"integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-			"integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-api-error": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
 			}
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-			"integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.1",
+				"@webassemblyjs/ast": "1.14.1",
 				"@xtuc/long": "4.2.2"
 			}
 		},
@@ -1827,13 +1843,15 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
 			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true
+			"dev": true,
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/@xtuc/long": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"dev": true
+			"dev": true,
+			"license": "Apache-2.0"
 		},
 		"node_modules/abab": {
 			"version": "2.0.6",
@@ -1865,10 +1883,11 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.11.2",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
-			"integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
+			"version": "8.14.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+			"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -1876,15 +1895,6 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-			"dev": true,
-			"peerDependencies": {
-				"acorn": "^8"
-			}
-		},
 		"node_modules/acorn-jsx": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -2103,11 +2113,12 @@
 			}
 		},
 		"node_modules/axios": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-			"integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+			"version": "1.7.7",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+			"integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+			"license": "MIT",
 			"dependencies": {
-				"follow-redirects": "^1.15.0",
+				"follow-redirects": "^1.15.6",
 				"form-data": "^4.0.0",
 				"proxy-from-env": "^1.1.0"
 			}
@@ -2253,9 +2264,10 @@
 			"dev": true
 		},
 		"node_modules/body-parser": {
-			"version": "1.20.2",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-			"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+			"version": "1.20.3",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+			"integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+			"license": "MIT",
 			"dependencies": {
 				"bytes": "3.1.2",
 				"content-type": "~1.0.5",
@@ -2265,7 +2277,7 @@
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"on-finished": "2.4.1",
-				"qs": "6.11.0",
+				"qs": "6.13.0",
 				"raw-body": "2.5.2",
 				"type-is": "~1.6.18",
 				"unpipe": "1.0.0"
@@ -2431,9 +2443,9 @@
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.23.0",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+			"version": "4.24.2",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+			"integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
 			"dev": true,
 			"funding": [
 				{
@@ -2449,11 +2461,12 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001587",
-				"electron-to-chromium": "^1.4.668",
-				"node-releases": "^2.0.14",
-				"update-browserslist-db": "^1.0.13"
+				"caniuse-lite": "^1.0.30001669",
+				"electron-to-chromium": "^1.5.41",
+				"node-releases": "^2.0.18",
+				"update-browserslist-db": "^1.1.1"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -2578,9 +2591,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001621",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz",
-			"integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==",
+			"version": "1.0.30001684",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
+			"integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -2595,7 +2608,8 @@
 					"type": "github",
 					"url": "https://github.com/sponsors/ai"
 				}
-			]
+			],
+			"license": "CC-BY-4.0"
 		},
 		"node_modules/canvas-fit": {
 			"version": "1.5.0",
@@ -2654,21 +2668,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/chai-http/node_modules/qs": {
-			"version": "6.12.1",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
-			"integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
-			"dev": true,
-			"dependencies": {
-				"side-channel": "^1.0.6"
-			},
-			"engines": {
-				"node": ">=0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/chalk": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -3009,9 +3008,10 @@
 			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
 		},
 		"node_modules/cookie": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+			"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -3096,10 +3096,11 @@
 			}
 		},
 		"node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -4118,10 +4119,11 @@
 			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.782",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.782.tgz",
-			"integrity": "sha512-JUfU61e8tr+i5Y1FKXcKs+Xe+rJ+CEqm4cgv1kMihPE2EvYHmYyVr3Im/+1+Z5B29Be2EEGCZCwAc6Tazdl1Yg==",
-			"dev": true
+			"version": "1.5.64",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz",
+			"integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==",
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/element-size": {
 			"version": "1.1.1",
@@ -4137,10 +4139,11 @@
 			}
 		},
 		"node_modules/elliptic": {
-			"version": "6.5.4",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+			"version": "6.6.1",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
+			"integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.11.9",
 				"brorand": "^1.1.0",
@@ -4164,9 +4167,10 @@
 			"dev": true
 		},
 		"node_modules/encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+			"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
@@ -4180,10 +4184,11 @@
 			}
 		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+			"version": "5.17.1",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
 				"tapable": "^2.2.0"
@@ -4232,10 +4237,11 @@
 			}
 		},
 		"node_modules/es-module-lexer": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-			"dev": true
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+			"integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/es5-ext": {
 			"version": "0.10.64",
@@ -4283,10 +4289,11 @@
 			}
 		},
 		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
@@ -4728,36 +4735,37 @@
 			}
 		},
 		"node_modules/express": {
-			"version": "4.19.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-			"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+			"version": "4.21.1",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+			"integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+			"license": "MIT",
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
-				"body-parser": "1.20.2",
+				"body-parser": "1.20.3",
 				"content-disposition": "0.5.4",
 				"content-type": "~1.0.4",
-				"cookie": "0.6.0",
+				"cookie": "0.7.1",
 				"cookie-signature": "1.0.6",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
+				"finalhandler": "1.3.1",
 				"fresh": "0.5.2",
 				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
+				"merge-descriptors": "1.0.3",
 				"methods": "~1.1.2",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
+				"path-to-regexp": "0.1.10",
 				"proxy-addr": "~2.0.7",
-				"qs": "6.11.0",
+				"qs": "6.13.0",
 				"range-parser": "~1.2.1",
 				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
+				"send": "0.19.0",
+				"serve-static": "1.16.2",
 				"setprototypeof": "1.2.0",
 				"statuses": "2.0.1",
 				"type-is": "~1.6.18",
@@ -4942,12 +4950,13 @@
 			}
 		},
 		"node_modules/finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+			"integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+			"license": "MIT",
 			"dependencies": {
 				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
@@ -4962,6 +4971,7 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -4969,7 +4979,8 @@
 		"node_modules/finalhandler/node_modules/ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
 		},
 		"node_modules/find-root": {
 			"version": "1.1.0",
@@ -5338,7 +5349,8 @@
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
 			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-			"dev": true
+			"dev": true,
+			"license": "BSD-2-Clause"
 		},
 		"node_modules/globby": {
 			"version": "11.1.0",
@@ -6774,9 +6786,13 @@
 			"integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
 		},
 		"node_modules/merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
@@ -6802,12 +6818,13 @@
 			}
 		},
 		"node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"braces": "^3.0.2",
+				"braces": "^3.0.3",
 				"picomatch": "^2.3.1"
 			},
 			"engines": {
@@ -6837,6 +6854,7 @@
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
 			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"license": "MIT",
 			"bin": {
 				"mime": "cli.js"
 			},
@@ -7247,10 +7265,11 @@
 			}
 		},
 		"node_modules/nise/node_modules/path-to-regexp": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
-			"integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
-			"dev": true
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+			"integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/node-polyfill-webpack-plugin": {
 			"version": "1.1.4",
@@ -7305,10 +7324,11 @@
 			}
 		},
 		"node_modules/node-releases": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-			"dev": true
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+			"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/nodemailer": {
 			"version": "6.9.13",
@@ -7659,9 +7679,10 @@
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
 		"node_modules/path-to-regexp": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+			"version": "0.1.10",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+			"integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+			"license": "MIT"
 		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
@@ -7848,9 +7869,10 @@
 			"integrity": "sha512-ESj2+eBxhGrcA1azgHs7lARG5+5iLakc/6nlfbpjcLl00HuuUOIuORhYXN4D1HfvMSKuVtFQjAlnwi1JHEeDIw=="
 		},
 		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+			"license": "ISC"
 		},
 		"node_modules/picomatch": {
 			"version": "2.3.1",
@@ -8260,11 +8282,12 @@
 			}
 		},
 		"node_modules/qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"version": "6.13.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"side-channel": "^1.0.4"
+				"side-channel": "^1.0.6"
 			},
 			"engines": {
 				"node": ">=0.6"
@@ -8365,6 +8388,7 @@
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
 			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -9083,9 +9107,10 @@
 			}
 		},
 		"node_modules/send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+			"version": "0.19.0",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+			"integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+			"license": "MIT",
 			"dependencies": {
 				"debug": "2.6.9",
 				"depd": "2.0.0",
@@ -9109,6 +9134,7 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -9116,12 +9142,23 @@
 		"node_modules/send/node_modules/debug/node_modules/ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"license": "MIT"
+		},
+		"node_modules/send/node_modules/encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
 		"node_modules/send/node_modules/ms": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"license": "MIT"
 		},
 		"node_modules/serialize-javascript": {
 			"version": "6.0.0",
@@ -9158,14 +9195,15 @@
 			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 		},
 		"node_modules/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+			"version": "1.16.2",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+			"integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+			"license": "MIT",
 			"dependencies": {
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"parseurl": "~1.3.3",
-				"send": "0.18.0"
+				"send": "0.19.0"
 			},
 			"engines": {
 				"node": ">= 0.8.0"
@@ -10208,9 +10246,9 @@
 			"integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.0.13",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+			"integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
 			"dev": true,
 			"funding": [
 				{
@@ -10226,9 +10264,10 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
+				"escalade": "^3.2.0",
+				"picocolors": "^1.1.0"
 			},
 			"bin": {
 				"update-browserslist-db": "cli.js"
@@ -10275,21 +10314,6 @@
 			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
 			"dev": true
 		},
-		"node_modules/url/node_modules/qs": {
-			"version": "6.11.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-			"integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
-			"dev": true,
-			"dependencies": {
-				"side-channel": "^1.0.4"
-			},
-			"engines": {
-				"node": ">=0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/use-isomorphic-layout-effect": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
@@ -10384,10 +10408,11 @@
 			}
 		},
 		"node_modules/watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
@@ -10410,34 +10435,34 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.76.3",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.3.tgz",
-			"integrity": "sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==",
-			"dev": true,
-			"dependencies": {
-				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^0.0.51",
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/wasm-edit": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
-				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.7.6",
-				"browserslist": "^4.14.5",
+			"version": "5.96.1",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+			"integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/eslint-scope": "^3.7.7",
+				"@types/estree": "^1.0.6",
+				"@webassemblyjs/ast": "^1.12.1",
+				"@webassemblyjs/wasm-edit": "^1.12.1",
+				"@webassemblyjs/wasm-parser": "^1.12.1",
+				"acorn": "^8.14.0",
+				"browserslist": "^4.24.0",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.10.0",
-				"es-module-lexer": "^0.9.0",
+				"enhanced-resolve": "^5.17.1",
+				"es-module-lexer": "^1.2.1",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
+				"graceful-fs": "^4.2.11",
 				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
-				"schema-utils": "^3.1.0",
+				"schema-utils": "^3.2.0",
 				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.1.3",
-				"watchpack": "^2.4.0",
+				"terser-webpack-plugin": "^5.3.10",
+				"watchpack": "^2.4.1",
 				"webpack-sources": "^3.2.3"
 			},
 			"bin": {
diff --git a/package.json b/package.json
index fa5f6d8de..57f229b12 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
 	"dependencies": {
 		"@reduxjs/toolkit": "~2.2.5",
 		"@wojtekmaj/react-daterange-picker": "~6.0.0",
-		"axios": "~1.6.2",
+		"axios": "~1.7.7",
 		"bcryptjs": "~2.4.3",
 		"body-parser": "~1.20.2",
 		"bootstrap": "~5.3.3",
@@ -67,7 +67,7 @@
 		"d3": "~7.8.5",
 		"dotenv": "~16.4.5",
 		"escape-html": "~1.0.3",
-		"express": "~4.19.2",
+		"express": "~4.21.1",
 		"express-rate-limit": "~7.2.0",
 		"history": "~5.3.0",
 		"ini": "~4.1.3",
@@ -132,7 +132,7 @@
 		"terser-webpack-plugin": "~5.3.10",
 		"ts-loader": "~9.5.1",
 		"typescript": "~5.4.5",
-		"webpack": "~5.76.0",
+		"webpack": "~5.96.1",
 		"webpack-cli": "~5.1.4"
 	}
 }

From 96f4a12f979c109638910f73cc348236f22e0f91 Mon Sep 17 00:00:00 2001
From: vladoleksiyenko <vladolek2003@gmail.com>
Date: Mon, 9 Dec 2024 19:30:14 -0800
Subject: [PATCH 114/128] added the backupScript with the fixes that Steve
 requested in the closed #792 PR

---
 src/scripts/backupScript.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 src/scripts/backupScript.sh

diff --git a/src/scripts/backupScript.sh b/src/scripts/backupScript.sh
new file mode 100755
index 000000000..0b3e5f602
--- /dev/null
+++ b/src/scripts/backupScript.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# 
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# Input the pathname for the desired backup directory
+# ie PATH="/home/<your_username>/path_to/database_dumps/dump.sql"
+# This path MUST exist
+
+# This could probably be programmatically populated. Currently needs to be set manually
+db_dump_path="/home/<your_username>/database_dumps" #INPUT REQUIRED
+
+# Generate a timestamp to append to the dump file. This line has errors at the moment.
+date=`date +%Y-%m-%d_%H_%M_%S`
+
+# Set the final path for the backup file
+final_path="${db_dump_path}/dump_${date}.sql"
+
+# Perform the backup using pg_dump
+docker compose exec database pg_dump -U oed > "$final_path"
\ No newline at end of file

From 3c8d2a5219471ac4e67aac94ce20b52dd8346e1e Mon Sep 17 00:00:00 2001
From: Brenden <brendenshaskins@gmail.com>
Date: Mon, 9 Dec 2024 20:40:00 -0800
Subject: [PATCH 115/128] fixed spelling, added length bound

---
 src/server/test/web/obviusTest.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/test/web/obviusTest.js b/src/server/test/web/obviusTest.js
index 410a32de9..4566af7e2 100644
--- a/src/server/test/web/obviusTest.js
+++ b/src/server/test/web/obviusTest.js
@@ -257,10 +257,10 @@ mocha.describe('Obvius API', () => {
 
 
 				//both arrays should be contain the same sequence of values
-				for (let i = 0; i < 28; i++) {
+				for (let i = 0; i < expMeterNames.length; i++) {
 					if (expMeterNames[i] != meterNames[i]) {
 						expectedNamesAreEqual = false;
-						allErrorMessagesNames += "Meter failed name comparison, Expeceted: " + expMeterNames[i] + " Actual: " + meterNames[i] + "\n";
+						allErrorMessagesNames += "Meter failed name comparison, Expected: " + expMeterNames[i] + " Actual: " + meterNames[i] + "\n";
 					}
 
 					if (expMeterIDs[i] != meterIDs[i]) {

From 580a3df9972a2fa21caecaf29ff263ff194e3364 Mon Sep 17 00:00:00 2001
From: Hin Yan Liew <hinyan17@gmail.com>
Date: Tue, 10 Dec 2024 03:29:23 -0500
Subject: [PATCH 116/128] Reformatted invalid data functions

---
 .../components/admin/PreferencesComponent.tsx | 101 ++++++++----------
 1 file changed, 45 insertions(+), 56 deletions(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index b8d6cfa5e..64016be32 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -46,53 +46,42 @@ export default function PreferencesComponent() {
 		setLocalAdminPref(cloneDeep(adminPreferences));
 	};
 
-	// small functions that determine if fields are invalid
-	const invalidReadingFreq = () => {
-		const frequency = moment.duration(localAdminPref.defaultMeterReadingFrequency);
-		return !frequency.isValid() || frequency.asSeconds() <= 0;
-	};
-
-	// force check some localAdminPref values as numbers, they are stored as strings
-	const invalidMinValue = () => {
-		const min = Number(localAdminPref.defaultMeterMinimumValue);
-		const max = Number(localAdminPref.defaultMeterMaximumValue);
-		return  min < MIN_VAL || min > max;
-	};
-
-	const invalidMaxValue = () => {
-		const min = Number(localAdminPref.defaultMeterMinimumValue);
-		const max = Number(localAdminPref.defaultMeterMaximumValue);
-		return max > MAX_VAL || min > max;
-	};
-
-	const invalidMinDate = () => {
-		const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
-		const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
-		return !minMoment.isValid() || !minMoment.isSameOrAfter(MIN_DATE_MOMENT) || !minMoment.isSameOrBefore(maxMoment);
-	};
+	// Functions for input validation and warnings. Each returns true if the user inputs invalid data into its field
+	// Need to be functions due to static reference. If they were booleans they wouldn't update when localAdminPref updates
+	const invalidFuncs = {
+		readingFreq: (): boolean => {
+			const frequency = moment.duration(localAdminPref.defaultMeterReadingFrequency);
+			return !frequency.isValid() || frequency.asSeconds() <= 0;
+		},
+		minValue: (): boolean => {
+			const min = Number(localAdminPref.defaultMeterMinimumValue);
+			const max = Number(localAdminPref.defaultMeterMaximumValue);
+			return  min < MIN_VAL || min > max;
+		},
+		maxValue: (): boolean => {
+			const min = Number(localAdminPref.defaultMeterMinimumValue);
+			const max = Number(localAdminPref.defaultMeterMaximumValue);
+			return max > MAX_VAL || min > max;
+		},
+		minDate: (): boolean => {
+			const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
+			const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
+			return !minMoment.isValid() || !minMoment.isSameOrAfter(MIN_DATE_MOMENT) || !minMoment.isSameOrBefore(maxMoment);
+		},
+		maxDate: (): boolean => {
+			const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
+			const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
+			return !maxMoment.isValid() || !maxMoment.isSameOrBefore(MAX_DATE_MOMENT) || !maxMoment.isSameOrAfter(minMoment);
+		},
+		readingGap: (): boolean => Number(localAdminPref.defaultMeterReadingGap) < 0,
 
-	const invalidMaxDate = () => {
-		const minMoment = moment(localAdminPref.defaultMeterMinimumDate);
-		const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
-		return !maxMoment.isValid() || !maxMoment.isSameOrBefore(MAX_DATE_MOMENT) || !maxMoment.isSameOrAfter(minMoment);
-	};
-
-	const invalidReadingGap = () => {
-		return Number(localAdminPref.defaultMeterReadingGap) < 0;
-	};
+		meterErrors: (): boolean => Number(localAdminPref.defaultMeterMaximumErrors) < 0
+			|| Number(localAdminPref.defaultMeterMaximumErrors) > MAX_ERRORS,
 
-	const invalidMeterErrors = () => {
-		return Number(localAdminPref.defaultMeterMaximumErrors) < 0
-			|| Number(localAdminPref.defaultMeterMaximumErrors) > MAX_ERRORS;
-	};
+		fileSizeLimit: (): boolean => Number(localAdminPref.defaultFileSizeLimit) < 0,
 
-	const invalidFileSizeLimit = () => {
-		return Number(localAdminPref.defaultFileSizeLimit) < 0;
-	};
-
-	const invalidWarningFileSize = () => {
-		return Number(localAdminPref.defaultWarningFileSize) < 0
-			|| Number(localAdminPref.defaultWarningFileSize) > Number(localAdminPref.defaultFileSizeLimit);
+		warningFileSize: (): boolean => Number(localAdminPref.defaultWarningFileSize) < 0
+			|| Number(localAdminPref.defaultWarningFileSize) > Number(localAdminPref.defaultFileSizeLimit)
 	};
 
 	return (
@@ -195,7 +184,7 @@ export default function PreferencesComponent() {
 					type='text'
 					value={localAdminPref.defaultMeterReadingFrequency}
 					onChange={e => makeLocalChanges('defaultMeterReadingFrequency', e.target.value)}
-					invalid={invalidReadingFreq()}
+					invalid={invalidFuncs.readingFreq()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="invalid.input" ></FormattedMessage>
@@ -212,7 +201,7 @@ export default function PreferencesComponent() {
 					min={MIN_VAL}
 					max={Number(localAdminPref.defaultMeterMaximumValue)}
 					maxLength={50}
-					invalid={invalidMinValue()}
+					invalid={invalidFuncs.minValue()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: Number(localAdminPref.defaultMeterMaximumValue) }}/>
@@ -229,7 +218,7 @@ export default function PreferencesComponent() {
 					min={Number(localAdminPref.defaultMeterMinimumValue)}
 					max={MAX_VAL}
 					maxLength={50}
-					invalid={invalidMaxValue()}
+					invalid={invalidFuncs.maxValue()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: Number(localAdminPref.defaultMeterMinimumValue), max: MAX_VAL }}/>
@@ -244,7 +233,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMinimumDate}
 					onChange={e => makeLocalChanges('defaultMeterMinimumDate', e.target.value)}
 					placeholder='YYYY-MM-DD HH:MM:SS'
-					invalid={invalidMinDate()}
+					invalid={invalidFuncs.minDate()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: MIN_DATE, max: moment(localAdminPref.defaultMeterMaximumDate).utc().format() }} />
@@ -259,7 +248,7 @@ export default function PreferencesComponent() {
 					value={localAdminPref.defaultMeterMaximumDate}
 					onChange={e => makeLocalChanges('defaultMeterMaximumDate', e.target.value)}
 					placeholder='YYYY-MM-DD HH:MM:SS'
-					invalid={invalidMaxDate()}
+					invalid={invalidFuncs.maxDate()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: moment(localAdminPref.defaultMeterMinimumDate).utc().format(), max: MAX_DATE }} />
@@ -275,7 +264,7 @@ export default function PreferencesComponent() {
 					onChange={e => makeLocalChanges('defaultMeterReadingGap', e.target.value)}
 					min='0'
 					maxLength={50}
-					invalid={invalidReadingGap()}
+					invalid={invalidFuncs.readingGap()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: 0, max: Infinity }}/>
@@ -292,7 +281,7 @@ export default function PreferencesComponent() {
 					min='0'
 					max={MAX_ERRORS}
 					maxLength={50}
-					invalid={invalidMeterErrors()}
+					invalid={invalidFuncs.meterErrors()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: 0, max: MAX_ERRORS }}/>
@@ -387,7 +376,7 @@ export default function PreferencesComponent() {
 					min='0'
 					max={Number(localAdminPref.defaultFileSizeLimit)}
 					maxLength={50}
-					invalid={invalidWarningFileSize()}
+					invalid={invalidFuncs.warningFileSize()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: 0, max: Number(localAdminPref.defaultFileSizeLimit) }}/>
@@ -403,7 +392,7 @@ export default function PreferencesComponent() {
 					onChange={e => makeLocalChanges('defaultFileSizeLimit', e.target.value)}
 					min={Number(localAdminPref.defaultWarningFileSize)}
 					maxLength={50}
-					invalid={invalidFileSizeLimit()}
+					invalid={invalidFuncs.fileSizeLimit()}
 				/>
 				<FormFeedback>
 					<FormattedMessage id="error.bounds" values={{ min: 0, max: Infinity }}/>
@@ -425,6 +414,7 @@ export default function PreferencesComponent() {
 					onClick={discardChanges}
 					disabled={!hasChanges}
 					style={{ marginRight: '20px' }}
+					color='secondary'
 				>
 					{translate('discard.changes')}
 				</Button>
@@ -440,9 +430,8 @@ export default function PreferencesComponent() {
 								showErrorNotification(translate('failed.to.submit.changes'));
 							})
 					}
-					disabled={!hasChanges || invalidReadingFreq() || invalidMinValue() || invalidMaxValue() || invalidMinDate() || invalidMaxDate()
-						|| invalidReadingGap() || invalidMeterErrors() || invalidFileSizeLimit() || invalidWarningFileSize()
-					}
+					disabled={!hasChanges || Object.values(invalidFuncs).some(check => check())}
+					color='primary'
 				>
 					{translate('submit')}
 				</Button>

From 3f768e66b2cc7ec0e9c9c06779c5198f665535c0 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Tue, 10 Dec 2024 09:09:12 -0600
Subject: [PATCH 117/128] minor fixes

- Put braces around implicit functions as preferred by OED.
- Reorder two functions so same as shown to user.
- Add file size limit to check functions and form feedback.
- Minor formatting.
---
 .../components/admin/PreferencesComponent.tsx | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index 64016be32..265244c48 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -56,7 +56,7 @@ export default function PreferencesComponent() {
 		minValue: (): boolean => {
 			const min = Number(localAdminPref.defaultMeterMinimumValue);
 			const max = Number(localAdminPref.defaultMeterMaximumValue);
-			return  min < MIN_VAL || min > max;
+			return min < MIN_VAL || min > max;
 		},
 		maxValue: (): boolean => {
 			const min = Number(localAdminPref.defaultMeterMinimumValue);
@@ -73,15 +73,22 @@ export default function PreferencesComponent() {
 			const maxMoment = moment(localAdminPref.defaultMeterMaximumDate);
 			return !maxMoment.isValid() || !maxMoment.isSameOrBefore(MAX_DATE_MOMENT) || !maxMoment.isSameOrAfter(minMoment);
 		},
-		readingGap: (): boolean => Number(localAdminPref.defaultMeterReadingGap) < 0,
+		readingGap: (): boolean => { return Number(localAdminPref.defaultMeterReadingGap) < 0; },
 
-		meterErrors: (): boolean => Number(localAdminPref.defaultMeterMaximumErrors) < 0
-			|| Number(localAdminPref.defaultMeterMaximumErrors) > MAX_ERRORS,
+		meterErrors: (): boolean => {
+			return Number(localAdminPref.defaultMeterMaximumErrors) < 0
+				|| Number(localAdminPref.defaultMeterMaximumErrors) > MAX_ERRORS;
+		},
 
-		fileSizeLimit: (): boolean => Number(localAdminPref.defaultFileSizeLimit) < 0,
+		warningFileSize: (): boolean => {
+			return Number(localAdminPref.defaultWarningFileSize) < 0
+				|| Number(localAdminPref.defaultWarningFileSize) > Number(localAdminPref.defaultFileSizeLimit);
+		},
 
-		warningFileSize: (): boolean => Number(localAdminPref.defaultWarningFileSize) < 0
-			|| Number(localAdminPref.defaultWarningFileSize) > Number(localAdminPref.defaultFileSizeLimit)
+		fileSizeLimit: (): boolean => {
+			return Number(localAdminPref.defaultFileSizeLimit) < 0
+				|| Number(localAdminPref.defaultWarningFileSize) > Number(localAdminPref.defaultFileSizeLimit);
+		}
 	};
 
 	return (
@@ -204,7 +211,7 @@ export default function PreferencesComponent() {
 					invalid={invalidFuncs.minValue()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: Number(localAdminPref.defaultMeterMaximumValue) }}/>
+					<FormattedMessage id="error.bounds" values={{ min: MIN_VAL, max: Number(localAdminPref.defaultMeterMaximumValue) }} />
 				</FormFeedback>
 			</div>
 			<div>
@@ -221,7 +228,7 @@ export default function PreferencesComponent() {
 					invalid={invalidFuncs.maxValue()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: Number(localAdminPref.defaultMeterMinimumValue), max: MAX_VAL }}/>
+					<FormattedMessage id="error.bounds" values={{ min: Number(localAdminPref.defaultMeterMinimumValue), max: MAX_VAL }} />
 				</FormFeedback>
 			</div>
 			<div>
@@ -267,7 +274,7 @@ export default function PreferencesComponent() {
 					invalid={invalidFuncs.readingGap()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: 0, max: Infinity }}/>
+					<FormattedMessage id="error.bounds" values={{ min: 0, max: Infinity }} />
 				</FormFeedback>
 			</div>
 			<div>
@@ -284,7 +291,7 @@ export default function PreferencesComponent() {
 					invalid={invalidFuncs.meterErrors()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: 0, max: MAX_ERRORS }}/>
+					<FormattedMessage id="error.bounds" values={{ min: 0, max: MAX_ERRORS }} />
 				</FormFeedback>
 			</div>
 			<div>
@@ -379,7 +386,7 @@ export default function PreferencesComponent() {
 					invalid={invalidFuncs.warningFileSize()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: 0, max: Number(localAdminPref.defaultFileSizeLimit) }}/>
+					<FormattedMessage id="error.bounds" values={{ min: 0, max: Number(localAdminPref.defaultFileSizeLimit) }} />
 				</FormFeedback>
 			</div>
 			<div>
@@ -395,7 +402,7 @@ export default function PreferencesComponent() {
 					invalid={invalidFuncs.fileSizeLimit()}
 				/>
 				<FormFeedback>
-					<FormattedMessage id="error.bounds" values={{ min: 0, max: Infinity }}/>
+					<FormattedMessage id="error.bounds" values={{ min: Number(localAdminPref.defaultWarningFileSize), max: Infinity }} />
 				</FormFeedback>
 			</div>
 			<div>

From 8d9aace61f828555983c0767fba7510e25bcb9d7 Mon Sep 17 00:00:00 2001
From: vladoleksiyenko <vladolek2003@gmail.com>
Date: Tue, 10 Dec 2024 17:10:40 -0800
Subject: [PATCH 118/128] added a check for the backup directory, removed
 comment that mentions errors, indicated that OED docker database container
 must be running

---
 src/scripts/backupScript.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/scripts/backupScript.sh b/src/scripts/backupScript.sh
index 0b3e5f602..91cacb41b 100755
--- a/src/scripts/backupScript.sh
+++ b/src/scripts/backupScript.sh
@@ -3,16 +3,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
+# The OED Docker database container must be running for this script to work
 
 # Input the pathname for the desired backup directory
-# ie PATH="/home/<your_username>/path_to/database_dumps/dump.sql"
-# This path MUST exist
+# ie PATH="/home/<your_username>/path_to/database_dumps/"
+# This path MUST exist, otherwise, this script will attempt to create the directory, or fail.
 
 # This could probably be programmatically populated. Currently needs to be set manually
-db_dump_path="/home/<your_username>/database_dumps" #INPUT REQUIRED
+db_dump_path="/home/<username>/database_dumps" #INPUT REQUIRED
 
-# Generate a timestamp to append to the dump file. This line has errors at the moment.
+# Checks to see if the directory is exists
+# If not, it will display a message, and attempt to create the backup directory
+if [ ! -d "$db_dump_path" ]; then
+    echo "Backup directory does not exist. Creating it now..."
+    mkdir -p "$db_dump_path" || { echo "Failed to create directory. Exiting."; exit 1; }
+fi
+
+# Generate a timestamp to append to the dump file.
 date=`date +%Y-%m-%d_%H_%M_%S`
 
 # Set the final path for the backup file

From 545a53d20b5a53ee17dcd5be520fda9d8ea0adda Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Wed, 11 Dec 2024 08:03:08 -0600
Subject: [PATCH 119/128] add simple change

I forgot to mention this in my previous comments so I added a final output
statement to tell where the backup was placed.
---
 src/scripts/backupScript.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/scripts/backupScript.sh b/src/scripts/backupScript.sh
index 91cacb41b..091dd4657 100755
--- a/src/scripts/backupScript.sh
+++ b/src/scripts/backupScript.sh
@@ -3,6 +3,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # The OED Docker database container must be running for this script to work
 
 # Input the pathname for the desired backup directory
@@ -26,4 +27,6 @@ date=`date +%Y-%m-%d_%H_%M_%S`
 final_path="${db_dump_path}/dump_${date}.sql"
 
 # Perform the backup using pg_dump
-docker compose exec database pg_dump -U oed > "$final_path"
\ No newline at end of file
+docker compose exec database pg_dump -U oed > "$final_path"
+
+echo "OED database backup placed in ${final_path}"

From e03a467b5045b0a384b5b6fd4b04f80f9371178e Mon Sep 17 00:00:00 2001
From: Miller Rosenthal <millerrosenthal@ucmerced.edu>
Date: Fri, 13 Dec 2024 03:18:45 +0000
Subject: [PATCH 120/128] added test case cg5

---
 .../test/web/readingsCompareGroupQuantity.js     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index ccb5c5a3b..f26ddf1ef 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -82,7 +82,21 @@ mocha.describe('readings API', () => {
 					expectCompareToEqualExpected(res, expected, GROUP_ID);
 				});
 
-				// Add CG5 here
+				mocha.it('CG5: 7 day shift end 2022-11-01 15:00:00 (beyond data) for 15 minute reading intervals and quantity units & kWh as kWh ', async () => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh);
+					// Get the unit ID since the DB could use any value.
+					const unitId = await getUnitId('kWh');
+					const expected = [16171.5504445167, 23010.8509932843];
+					// for compare, need the unitID, currentStart, currentEnd, shift
+					const res = await chai.request(app).get(`/api/compareReadings/groups/${GROUP_ID}`)
+						.query({
+							curr_start: '2022-10-30 00:00:00',
+							curr_end: '2022-11-01 15:00:00',
+							shift: 'P7D',
+							graphicUnitId: unitId
+						});
+					expectCompareToEqualExpected(res, expected, GROUP_ID);
+				});
 
 				// Add CG6 here
 

From 9e321361f70273d1dbbf6e8b6e86b9ebe133c6ab Mon Sep 17 00:00:00 2001
From: VanishedAIR <vanshp.1005@gmail.com>
Date: Sun, 15 Dec 2024 19:43:44 -0800
Subject: [PATCH 121/128] Final test CG6

Co-authored-by: Andre Dargani <Mad3913@gmail.com>
Co-authored-by: Regina Huang <huang.rong@northeastern.edu>
---
 docker-compose.yml                            |   4 +-
 package-lock.json                             | 251 ++++++++----------
 .../test/web/readingsCompareGroupQuantity.js  |   2 +-
 3 files changed, 108 insertions(+), 149 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 248b47250..4e5a53cf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,8 +16,8 @@ services:
             - POSTGRES_PASSWORD=pleaseChange # default postgres password that should be changed for security.
         volumes:
             - ./postgres-data:/var/lib/postgresql/data/pgdata
-        # ports:
-        #    - "5432:5432"
+        ports:
+            - "5432:5432"
         # Uncomment the above lines to enable access to the PostgreSQL server
         # from the host machine.
         # Web service runs Node
diff --git a/package-lock.json b/package-lock.json
index 0a5f656c1..3adc19b95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1809,9 +1809,9 @@
 			}
 		},
 		"node_modules/@webassemblyjs/ast": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-			"integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1820,30 +1820,30 @@
 			}
 		},
 		"node_modules/@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-			"integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-api-error": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-			"integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-			"integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-			"integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1853,16 +1853,16 @@
 			}
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-			"integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-			"integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1873,9 +1873,9 @@
 			}
 		},
 		"node_modules/@webassemblyjs/ieee754": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-			"integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1883,9 +1883,9 @@
 			}
 		},
 		"node_modules/@webassemblyjs/leb128": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-			"integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -1893,16 +1893,16 @@
 			}
 		},
 		"node_modules/@webassemblyjs/utf8": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-			"integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-			"integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1917,9 +1917,9 @@
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-			"integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1931,9 +1931,9 @@
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-			"integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1944,9 +1944,9 @@
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-			"integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1959,9 +1959,9 @@
 			}
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-			"integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2053,7 +2053,7 @@
 		},
 		"node_modules/@xtuc/ieee754": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
 			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
 			"dev": true,
 			"license": "BSD-3-Clause"
@@ -2097,17 +2097,6 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-			"deprecated": "package has been renamed to acorn-import-attributes",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"acorn": "^8"
-			}
-		},
 		"node_modules/acorn-jsx": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -2358,9 +2347,9 @@
 			}
 		},
 		"node_modules/axios": {
-			"version": "1.6.8",
-			"resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.8.tgz",
-			"integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+			"version": "1.7.9",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+			"integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
 			"license": "MIT",
 			"dependencies": {
 				"follow-redirects": "^1.15.6",
@@ -3266,9 +3255,9 @@
 			"license": "MIT"
 		},
 		"node_modules/cookie": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.6.0.tgz",
-			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+			"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
@@ -4401,9 +4390,9 @@
 			"license": "MIT"
 		},
 		"node_modules/encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+			"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
@@ -4476,9 +4465,9 @@
 			}
 		},
 		"node_modules/es-module-lexer": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+			"integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -4856,9 +4845,9 @@
 			}
 		},
 		"node_modules/express": {
-			"version": "4.19.2",
-			"resolved": "https://registry.npmmirror.com/express/-/express-4.19.2.tgz",
-			"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+			"integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
 			"license": "MIT",
 			"dependencies": {
 				"accepts": "~1.3.8",
@@ -4880,7 +4869,7 @@
 				"methods": "~1.1.2",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.10",
+				"path-to-regexp": "0.1.12",
 				"proxy-addr": "~2.0.7",
 				"qs": "6.13.0",
 				"range-parser": "~1.2.1",
@@ -4895,6 +4884,10 @@
 			},
 			"engines": {
 				"node": ">= 0.10.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/express"
 			}
 		},
 		"node_modules/express-rate-limit": {
@@ -4912,33 +4905,9 @@
 				"express": "4 || 5 || ^5.0.0-beta.1"
 			}
 		},
-		"node_modules/express/node_modules/body-parser": {
-			"version": "1.20.2",
-			"resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.2.tgz",
-			"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
-			"license": "MIT",
-			"dependencies": {
-				"bytes": "3.1.2",
-				"content-type": "~1.0.5",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"on-finished": "2.4.1",
-				"qs": "6.11.0",
-				"raw-body": "2.5.2",
-				"type-is": "~1.6.18",
-				"unpipe": "1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.8",
-				"npm": "1.2.8000 || >= 1.4.16"
-			}
-		},
 		"node_modules/express/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"license": "MIT",
 			"dependencies": {
@@ -4947,25 +4916,10 @@
 		},
 		"node_modules/express/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"license": "MIT"
 		},
-		"node_modules/express/node_modules/qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"side-channel": "^1.0.4"
-			},
-			"engines": {
-				"node": ">=0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/ext": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
@@ -5124,9 +5078,9 @@
 			}
 		},
 		"node_modules/finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+			"integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
 			"license": "MIT",
 			"dependencies": {
 				"debug": "2.6.9",
@@ -5143,7 +5097,7 @@
 		},
 		"node_modules/finalhandler/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"license": "MIT",
 			"dependencies": {
@@ -5152,7 +5106,7 @@
 		},
 		"node_modules/finalhandler/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"license": "MIT"
 		},
@@ -7000,10 +6954,13 @@
 			"license": "MIT"
 		},
 		"node_modules/merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-			"license": "MIT"
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
@@ -7068,7 +7025,7 @@
 		},
 		"node_modules/mime": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
 			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
 			"license": "MIT",
 			"bin": {
@@ -8011,9 +7968,9 @@
 			"license": "MIT"
 		},
 		"node_modules/path-to-regexp": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+			"version": "0.1.12",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+			"integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
 			"license": "MIT"
 		},
 		"node_modules/path-type": {
@@ -8839,7 +8796,7 @@
 		},
 		"node_modules/range-parser": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
 			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
 			"license": "MIT",
 			"engines": {
@@ -9643,9 +9600,9 @@
 			}
 		},
 		"node_modules/send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+			"version": "0.19.0",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+			"integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
 			"license": "MIT",
 			"dependencies": {
 				"debug": "2.6.9",
@@ -9668,7 +9625,7 @@
 		},
 		"node_modules/send/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
 			"license": "MIT",
 			"dependencies": {
@@ -9677,10 +9634,19 @@
 		},
 		"node_modules/send/node_modules/debug/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"license": "MIT"
 		},
+		"node_modules/send/node_modules/encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
 		"node_modules/serialize-javascript": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
@@ -9720,9 +9686,9 @@
 			"license": "MIT"
 		},
 		"node_modules/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+			"version": "1.16.2",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+			"integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
 			"license": "MIT",
 			"dependencies": {
 				"encodeurl": "~2.0.0",
@@ -10937,9 +10903,9 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.76.3",
-			"resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.76.3.tgz",
-			"integrity": "sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==",
+			"version": "5.96.1",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+			"integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -11064,13 +11030,6 @@
 				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/webpack/node_modules/@types/estree": {
-			"version": "0.0.51",
-			"resolved": "https://registry.npmmirror.com/@types/estree/-/estree-0.0.51.tgz",
-			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/webpack/node_modules/eslint-scope": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index 653930805..3d4762b63 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -73,7 +73,7 @@ mocha.describe('readings API', () => {
 							graphicUnitId: unitId             // Unit ID for kWh
 						});
 				
-					expectCompareToEqualExpected(res, expected, GROUP_ID); // confirm results match with expected
+					expectCompareToEqualExpected(res, expected, GROUP_ID); // confirm the results match with expected results
 				});
 
 

From 8b3d6d62ff60ba84dcba7ebaccbaee3b80247208 Mon Sep 17 00:00:00 2001
From: vladoleksiyenko <vladolek2003@gmail.com>
Date: Mon, 9 Dec 2024 19:30:14 -0800
Subject: [PATCH 122/128] added the backupScript with the fixes that Steve
 requested in the closed #792 PR

---
 src/scripts/backupScript.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 src/scripts/backupScript.sh

diff --git a/src/scripts/backupScript.sh b/src/scripts/backupScript.sh
new file mode 100755
index 000000000..0b3e5f602
--- /dev/null
+++ b/src/scripts/backupScript.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# 
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# Input the pathname for the desired backup directory
+# ie PATH="/home/<your_username>/path_to/database_dumps/dump.sql"
+# This path MUST exist
+
+# This could probably be programmatically populated. Currently needs to be set manually
+db_dump_path="/home/<your_username>/database_dumps" #INPUT REQUIRED
+
+# Generate a timestamp to append to the dump file. This line has errors at the moment.
+date=`date +%Y-%m-%d_%H_%M_%S`
+
+# Set the final path for the backup file
+final_path="${db_dump_path}/dump_${date}.sql"
+
+# Perform the backup using pg_dump
+docker compose exec database pg_dump -U oed > "$final_path"
\ No newline at end of file

From 2ceda72d9774f3bb8df76c2c7cb1193ad27db524 Mon Sep 17 00:00:00 2001
From: vladoleksiyenko <vladolek2003@gmail.com>
Date: Tue, 10 Dec 2024 17:10:40 -0800
Subject: [PATCH 123/128] added a check for the backup directory, removed
 comment that mentions errors, indicated that OED docker database container
 must be running

---
 src/scripts/backupScript.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/scripts/backupScript.sh b/src/scripts/backupScript.sh
index 0b3e5f602..91cacb41b 100755
--- a/src/scripts/backupScript.sh
+++ b/src/scripts/backupScript.sh
@@ -3,16 +3,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
+# The OED Docker database container must be running for this script to work
 
 # Input the pathname for the desired backup directory
-# ie PATH="/home/<your_username>/path_to/database_dumps/dump.sql"
-# This path MUST exist
+# ie PATH="/home/<your_username>/path_to/database_dumps/"
+# This path MUST exist, otherwise, this script will attempt to create the directory, or fail.
 
 # This could probably be programmatically populated. Currently needs to be set manually
-db_dump_path="/home/<your_username>/database_dumps" #INPUT REQUIRED
+db_dump_path="/home/<username>/database_dumps" #INPUT REQUIRED
 
-# Generate a timestamp to append to the dump file. This line has errors at the moment.
+# Checks to see if the directory is exists
+# If not, it will display a message, and attempt to create the backup directory
+if [ ! -d "$db_dump_path" ]; then
+    echo "Backup directory does not exist. Creating it now..."
+    mkdir -p "$db_dump_path" || { echo "Failed to create directory. Exiting."; exit 1; }
+fi
+
+# Generate a timestamp to append to the dump file.
 date=`date +%Y-%m-%d_%H_%M_%S`
 
 # Set the final path for the backup file

From 01546477559edfa570a35defc1253a5f90b718bc Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Wed, 11 Dec 2024 08:03:08 -0600
Subject: [PATCH 124/128] add simple change

I forgot to mention this in my previous comments so I added a final output
statement to tell where the backup was placed.
---
 src/scripts/backupScript.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/scripts/backupScript.sh b/src/scripts/backupScript.sh
index 91cacb41b..091dd4657 100755
--- a/src/scripts/backupScript.sh
+++ b/src/scripts/backupScript.sh
@@ -3,6 +3,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 # The OED Docker database container must be running for this script to work
 
 # Input the pathname for the desired backup directory
@@ -26,4 +27,6 @@ date=`date +%Y-%m-%d_%H_%M_%S`
 final_path="${db_dump_path}/dump_${date}.sql"
 
 # Perform the backup using pg_dump
-docker compose exec database pg_dump -U oed > "$final_path"
\ No newline at end of file
+docker compose exec database pg_dump -U oed > "$final_path"
+
+echo "OED database backup placed in ${final_path}"

From c359fbd703e6924af4bce78c6bc35466182b758f Mon Sep 17 00:00:00 2001
From: alecdog04 <75770101+alecdog04@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:04:04 -0800
Subject: [PATCH 125/128] Update readingsCompareMeterQuantity.js

---
 .../test/web/readingsCompareMeterQuantity.js       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index 89002d46b..6278d6aef 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -85,7 +85,19 @@ mocha.describe('readings API', () => {
 					expectCompareToEqualExpected(res, expected);
 				});
 
-				// Add C6 here
+				mocha.it('C6: 28 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as kWh', async () => {
+					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWh);
+					const unitId = await getUnitId('kWh');
+					const expected = [108269.924822581, 108889.847659507];
+					const res = await chai.request(app).get('/api/compareReadings/meters/${METER_ID}')
+						.query({
+							curr_start: '2022-10-09 00:00:00',
+							curr_end: '2022-10-31 17:00:00',
+							shift: 'P28D',
+							graphicUnitID:unitId
+						});
+					expectCompareToEqualExpected(res, expected);
+				});
 
 				mocha.it('C8: 1 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as MJ', async () => {
 					// Use predefined unit and conversion data

From d03f2a59e400c4e3211a7c202788dbeac28ea6d7 Mon Sep 17 00:00:00 2001
From: miaescobar1 <esbr.mia@gmail.com>
Date: Wed, 18 Dec 2024 06:11:26 +0000
Subject: [PATCH 126/128] Fixed errors in Test Case C6 as per requests

---
 src/server/test/web/readingsCompareMeterQuantity.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js
index 6278d6aef..3b1b0fb93 100644
--- a/src/server/test/web/readingsCompareMeterQuantity.js
+++ b/src/server/test/web/readingsCompareMeterQuantity.js
@@ -85,16 +85,16 @@ mocha.describe('readings API', () => {
 					expectCompareToEqualExpected(res, expected);
 				});
 
-				mocha.it('C6: 28 day shift end 2022-10-31 17:00:00 for 15 minute reading intervals and quantity units & kWh as kWh', async () => {
+				mocha.it('C6: 28 day shift end 2022-10-31 17:12:34 (partial hour) for 15 minute reading intervals and quantity units & kWh as kWh', async () => {
 					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWh);
 					const unitId = await getUnitId('kWh');
 					const expected = [108269.924822581, 108889.847659507];
-					const res = await chai.request(app).get('/api/compareReadings/meters/${METER_ID}')
+					const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`)
 						.query({
 							curr_start: '2022-10-09 00:00:00',
-							curr_end: '2022-10-31 17:00:00',
+							curr_end: '2022-10-31 17:12:34', 
 							shift: 'P28D',
-							graphicUnitID:unitId
+							graphicUnitId: unitId
 						});
 					expectCompareToEqualExpected(res, expected);
 				});

From 3c081d72ea0e0b8af55e451aa661d2a8f3998fb1 Mon Sep 17 00:00:00 2001
From: VanishedAIR <vanshp.1005@gmail.com>
Date: Wed, 18 Dec 2024 17:30:36 -0800
Subject: [PATCH 127/128] Updated CG6  Co-authored-by: Andre Dargani
 <Mad3913@gmail.com>  Co-authored-by: Regina Huang
 <huang.rong@northeastern.edu>

---
 docker-compose.yml                            |    6 +-
 package-lock.json                             | 6389 ++++++++---------
 package.json                                  |   13 +-
 .../test/web/readingsCompareGroupQuantity.js  |    3 +-
 4 files changed, 2972 insertions(+), 3439 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4e5a53cf0..d93db2b01 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,8 +16,8 @@ services:
             - POSTGRES_PASSWORD=pleaseChange # default postgres password that should be changed for security.
         volumes:
             - ./postgres-data:/var/lib/postgresql/data/pgdata
-        ports:
-            - "5432:5432"
+        # ports:
+        #    - "5432:5432"
         # Uncomment the above lines to enable access to the PostgreSQL server
         # from the host machine.
         # Web service runs Node
@@ -81,4 +81,4 @@ services:
                 "${install_args:-}"
             ]
         # Use this if you are using a docker-compose that is earlier than version 2 and comment out the one above.
-        # command: ["bash", "./src/scripts/installOED.sh"]
+        # command: ["bash", "./src/scripts/installOED.sh"]
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 3adc19b95..629ecbb91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,10 +9,9 @@
 			"version": "1.0.0",
 			"license": "MPL-2.0",
 			"dependencies": {
-				"@plotly/mapbox-gl": "~1.13.4",
 				"@reduxjs/toolkit": "~2.2.5",
 				"@wojtekmaj/react-daterange-picker": "~6.0.0",
-				"axios": "~1.7.7",
+				"axios": "~1.6.2",
 				"bcryptjs": "~2.4.3",
 				"body-parser": "~1.20.2",
 				"bootstrap": "~5.3.3",
@@ -21,7 +20,7 @@
 				"d3": "~7.8.5",
 				"dotenv": "~16.4.5",
 				"escape-html": "~1.0.3",
-				"express": "~4.21.1",
+				"express": "~4.19.2",
 				"express-rate-limit": "~7.2.0",
 				"history": "~5.3.0",
 				"ini": "~4.1.3",
@@ -86,91 +85,76 @@
 				"terser-webpack-plugin": "~5.3.10",
 				"ts-loader": "~9.5.1",
 				"typescript": "~5.4.5",
-				"webpack": "~5.96.1",
+				"webpack": "~5.76.0",
 				"webpack-cli": "~5.1.4"
 			}
 		},
-		"node_modules/@babel/code-frame": {
-			"version": "7.26.2",
-			"resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.26.2.tgz",
-			"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.25.9",
-				"js-tokens": "^4.0.0",
-				"picocolors": "^1.0.0"
-			},
+		"node_modules/@aashutoshrathi/word-wrap": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+			"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+			"dev": true,
 			"engines": {
-				"node": ">=6.9.0"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/@babel/generator": {
-			"version": "7.26.3",
-			"resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.26.3.tgz",
-			"integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
-			"license": "MIT",
+		"node_modules/@babel/code-frame": {
+			"version": "7.24.6",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
+			"integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==",
 			"dependencies": {
-				"@babel/parser": "^7.26.3",
-				"@babel/types": "^7.26.3",
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"jsesc": "^3.0.2"
+				"@babel/highlight": "^7.24.6",
+				"picocolors": "^1.0.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-imports": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
-			"license": "MIT",
+			"version": "7.24.6",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz",
+			"integrity": "sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==",
 			"dependencies": {
-				"@babel/traverse": "^7.25.9",
-				"@babel/types": "^7.25.9"
+				"@babel/types": "^7.24.6"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
-			"license": "MIT",
+			"version": "7.24.6",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz",
+			"integrity": "sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
-			"license": "MIT",
+			"version": "7.24.6",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz",
+			"integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/parser": {
-			"version": "7.26.3",
-			"resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.26.3.tgz",
-			"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
-			"license": "MIT",
+		"node_modules/@babel/highlight": {
+			"version": "7.24.6",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz",
+			"integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==",
 			"dependencies": {
-				"@babel/types": "^7.26.3"
-			},
-			"bin": {
-				"parser": "bin/babel-parser.js"
+				"@babel/helper-validator-identifier": "^7.24.6",
+				"chalk": "^2.4.2",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
 			},
 			"engines": {
-				"node": ">=6.0.0"
+				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/runtime": {
-			"version": "7.26.0",
-			"resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz",
-			"integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
-			"license": "MIT",
+			"version": "7.23.2",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
+			"integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
 			"dependencies": {
 				"regenerator-runtime": "^0.14.0"
 			},
@@ -178,55 +162,14 @@
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/template": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.25.9.tgz",
-			"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.25.9",
-				"@babel/parser": "^7.25.9",
-				"@babel/types": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse": {
-			"version": "7.26.4",
-			"resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.26.4.tgz",
-			"integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.26.2",
-				"@babel/generator": "^7.26.3",
-				"@babel/parser": "^7.26.3",
-				"@babel/template": "^7.25.9",
-				"@babel/types": "^7.26.3",
-				"debug": "^4.3.1",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@babel/types": {
-			"version": "7.26.3",
-			"resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.26.3.tgz",
-			"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
-			"license": "MIT",
+			"version": "7.24.6",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz",
+			"integrity": "sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==",
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.25.9",
-				"@babel/helper-validator-identifier": "^7.25.9"
+				"@babel/helper-string-parser": "^7.24.6",
+				"@babel/helper-validator-identifier": "^7.24.6",
+				"to-fast-properties": "^2.0.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -234,9 +177,8 @@
 		},
 		"node_modules/@choojs/findup": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmmirror.com/@choojs/findup/-/findup-0.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/@choojs/findup/-/findup-0.2.1.tgz",
 			"integrity": "sha512-YstAqNb0MCN8PjdLCDfRsBcGVRN41f3vgLvaI0IrIcBp4AqILRSS0DeWNGkicC+f/zRIPJLc+9RURVSepwvfBw==",
-			"license": "MIT",
 			"dependencies": {
 				"commander": "^2.15.1"
 			},
@@ -244,33 +186,25 @@
 				"findup": "bin/findup.js"
 			}
 		},
-		"node_modules/@choojs/findup/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"license": "MIT"
-		},
 		"node_modules/@discoveryjs/json-ext": {
 			"version": "0.5.7",
-			"resolved": "https://registry.npmmirror.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
 			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
 		"node_modules/@emotion/babel-plugin": {
-			"version": "11.13.5",
-			"resolved": "https://registry.npmmirror.com/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
-			"integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==",
-			"license": "MIT",
+			"version": "11.11.0",
+			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
+			"integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
 			"dependencies": {
 				"@babel/helper-module-imports": "^7.16.7",
 				"@babel/runtime": "^7.18.3",
-				"@emotion/hash": "^0.9.2",
-				"@emotion/memoize": "^0.9.0",
-				"@emotion/serialize": "^1.3.3",
+				"@emotion/hash": "^0.9.1",
+				"@emotion/memoize": "^0.8.1",
+				"@emotion/serialize": "^1.1.2",
 				"babel-plugin-macros": "^3.1.0",
 				"convert-source-map": "^1.5.0",
 				"escape-string-regexp": "^4.0.0",
@@ -279,44 +213,51 @@
 				"stylis": "4.2.0"
 			}
 		},
+		"node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/@emotion/cache": {
-			"version": "11.13.5",
-			"resolved": "https://registry.npmmirror.com/@emotion/cache/-/cache-11.13.5.tgz",
-			"integrity": "sha512-Z3xbtJ+UcK76eWkagZ1onvn/wAVb1GOMuR15s30Fm2wrMgC7jzpnO2JZXr4eujTTqoQFUrZIw/rT0c6Zzjca1g==",
-			"license": "MIT",
-			"dependencies": {
-				"@emotion/memoize": "^0.9.0",
-				"@emotion/sheet": "^1.4.0",
-				"@emotion/utils": "^1.4.2",
-				"@emotion/weak-memoize": "^0.4.0",
+			"version": "11.11.0",
+			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
+			"integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
+			"dependencies": {
+				"@emotion/memoize": "^0.8.1",
+				"@emotion/sheet": "^1.2.2",
+				"@emotion/utils": "^1.2.1",
+				"@emotion/weak-memoize": "^0.3.1",
 				"stylis": "4.2.0"
 			}
 		},
 		"node_modules/@emotion/hash": {
-			"version": "0.9.2",
-			"resolved": "https://registry.npmmirror.com/@emotion/hash/-/hash-0.9.2.tgz",
-			"integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
-			"license": "MIT"
+			"version": "0.9.1",
+			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
+			"integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
 		},
 		"node_modules/@emotion/memoize": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmmirror.com/@emotion/memoize/-/memoize-0.9.0.tgz",
-			"integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
-			"license": "MIT"
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
 		},
 		"node_modules/@emotion/react": {
-			"version": "11.13.5",
-			"resolved": "https://registry.npmmirror.com/@emotion/react/-/react-11.13.5.tgz",
-			"integrity": "sha512-6zeCUxUH+EPF1s+YF/2hPVODeV/7V07YU5x+2tfuRL8MdW6rv5vb2+CBEGTGwBdux0OIERcOS+RzxeK80k2DsQ==",
-			"license": "MIT",
+			"version": "11.11.1",
+			"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.1.tgz",
+			"integrity": "sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==",
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
-				"@emotion/babel-plugin": "^11.13.5",
-				"@emotion/cache": "^11.13.5",
-				"@emotion/serialize": "^1.3.3",
-				"@emotion/use-insertion-effect-with-fallbacks": "^1.1.0",
-				"@emotion/utils": "^1.4.2",
-				"@emotion/weak-memoize": "^0.4.0",
+				"@emotion/babel-plugin": "^11.11.0",
+				"@emotion/cache": "^11.11.0",
+				"@emotion/serialize": "^1.1.2",
+				"@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
+				"@emotion/utils": "^1.2.1",
+				"@emotion/weak-memoize": "^0.3.1",
 				"hoist-non-react-statics": "^3.3.1"
 			},
 			"peerDependencies": {
@@ -329,61 +270,51 @@
 			}
 		},
 		"node_modules/@emotion/serialize": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmmirror.com/@emotion/serialize/-/serialize-1.3.3.tgz",
-			"integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==",
-			"license": "MIT",
-			"dependencies": {
-				"@emotion/hash": "^0.9.2",
-				"@emotion/memoize": "^0.9.0",
-				"@emotion/unitless": "^0.10.0",
-				"@emotion/utils": "^1.4.2",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.2.tgz",
+			"integrity": "sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==",
+			"dependencies": {
+				"@emotion/hash": "^0.9.1",
+				"@emotion/memoize": "^0.8.1",
+				"@emotion/unitless": "^0.8.1",
+				"@emotion/utils": "^1.2.1",
 				"csstype": "^3.0.2"
 			}
 		},
 		"node_modules/@emotion/sheet": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/@emotion/sheet/-/sheet-1.4.0.tgz",
-			"integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==",
-			"license": "MIT"
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
+			"integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="
 		},
 		"node_modules/@emotion/unitless": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmmirror.com/@emotion/unitless/-/unitless-0.10.0.tgz",
-			"integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==",
-			"license": "MIT"
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
+			"integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
 		},
 		"node_modules/@emotion/use-insertion-effect-with-fallbacks": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz",
-			"integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==",
-			"license": "MIT",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
+			"integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
 			"peerDependencies": {
 				"react": ">=16.8.0"
 			}
 		},
 		"node_modules/@emotion/utils": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmmirror.com/@emotion/utils/-/utils-1.4.2.tgz",
-			"integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==",
-			"license": "MIT"
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
+			"integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
 		},
 		"node_modules/@emotion/weak-memoize": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmmirror.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",
-			"integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
-			"license": "MIT"
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
+			"integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
 		},
 		"node_modules/@es-joy/jsdoccomment": {
-			"version": "0.43.1",
-			"resolved": "https://registry.npmmirror.com/@es-joy/jsdoccomment/-/jsdoccomment-0.43.1.tgz",
-			"integrity": "sha512-I238eDtOolvCuvtxrnqtlBaw0BwdQuYqK7eA6XIonicMdOOOb75mqdIzkGDUbS04+1Di007rgm9snFRNeVrOog==",
+			"version": "0.42.0",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.42.0.tgz",
+			"integrity": "sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@types/eslint": "^8.56.5",
-				"@types/estree": "^1.0.5",
-				"@typescript-eslint/types": "^7.2.0",
 				"comment-parser": "1.4.1",
 				"esquery": "^1.5.0",
 				"jsdoc-type-pratt-parser": "~4.0.0"
@@ -392,55 +323,35 @@
 				"node": ">=16"
 			}
 		},
-		"node_modules/@es-joy/jsdoccomment/node_modules/@typescript-eslint/types": {
-			"version": "7.18.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-7.18.0.tgz",
-			"integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || >=20.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
 		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-			"integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"eslint-visitor-keys": "^3.4.3"
+				"eslint-visitor-keys": "^3.3.0"
 			},
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			},
 			"peerDependencies": {
 				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
 			}
 		},
 		"node_modules/@eslint-community/regexpp": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-			"integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+			"version": "4.10.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+			"integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
 			}
 		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-			"integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+			"integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
@@ -459,110 +370,64 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/@eslint/eslintrc/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+		"node_modules/@eslint/eslintrc/node_modules/globals": {
+			"version": "13.23.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+			"integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
-				"brace-expansion": "^1.1.7"
+				"type-fest": "^0.20.2"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/@eslint/js": {
 			"version": "8.48.0",
-			"resolved": "https://registry.npmmirror.com/@eslint/js/-/js-8.48.0.tgz",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
 			"integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			}
 		},
 		"node_modules/@floating-ui/core": {
-			"version": "1.6.8",
-			"resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.8.tgz",
-			"integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
-			"license": "MIT",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz",
+			"integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==",
 			"dependencies": {
-				"@floating-ui/utils": "^0.2.8"
+				"@floating-ui/utils": "^0.1.3"
 			}
 		},
 		"node_modules/@floating-ui/dom": {
-			"version": "1.6.12",
-			"resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.6.12.tgz",
-			"integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==",
-			"license": "MIT",
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz",
+			"integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==",
 			"dependencies": {
-				"@floating-ui/core": "^1.6.0",
-				"@floating-ui/utils": "^0.2.8"
+				"@floating-ui/core": "^1.4.2",
+				"@floating-ui/utils": "^0.1.3"
 			}
 		},
 		"node_modules/@floating-ui/utils": {
-			"version": "0.2.8",
-			"resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.8.tgz",
-			"integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
-			"license": "MIT"
-		},
-		"node_modules/@formatjs/ecma402-abstract": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
-			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
-			"license": "MIT",
-			"dependencies": {
-				"@formatjs/intl-localematcher": "0.5.4",
-				"tslib": "^2.4.0"
-			}
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz",
+			"integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
 		},
 		"node_modules/@formatjs/fast-memoize": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmmirror.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz",
 			"integrity": "sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==",
-			"license": "MIT",
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@formatjs/icu-messageformat-parser": {
-			"version": "2.7.8",
-			"resolved": "https://registry.npmmirror.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
-			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
-			"license": "MIT",
-			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"@formatjs/icu-skeleton-parser": "1.8.2",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@formatjs/icu-skeleton-parser": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmmirror.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
-			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
-			"license": "MIT",
-			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"tslib": "^2.4.0"
-			}
-		},
 		"node_modules/@formatjs/intl": {
 			"version": "2.10.4",
-			"resolved": "https://registry.npmmirror.com/@formatjs/intl/-/intl-2.10.4.tgz",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.4.tgz",
 			"integrity": "sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==",
-			"license": "MIT",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/fast-memoize": "2.2.0",
@@ -583,81 +448,113 @@
 		},
 		"node_modules/@formatjs/intl-displaynames": {
 			"version": "6.6.8",
-			"resolved": "https://registry.npmmirror.com/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz",
 			"integrity": "sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==",
-			"license": "MIT",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/intl-localematcher": "0.5.4",
 				"tslib": "^2.4.0"
 			}
 		},
+		"node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/ecma402-abstract": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
+			"dependencies": {
+				"@formatjs/intl-localematcher": "0.5.4",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/intl-localematcher": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/@formatjs/intl-listformat": {
 			"version": "7.5.7",
-			"resolved": "https://registry.npmmirror.com/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz",
 			"integrity": "sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==",
-			"license": "MIT",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/intl-localematcher": "0.5.4",
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@formatjs/intl-localematcher": {
+		"node_modules/@formatjs/intl-listformat/node_modules/@formatjs/ecma402-abstract": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
+			"dependencies": {
+				"@formatjs/intl-localematcher": "0.5.4",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@formatjs/intl-listformat/node_modules/@formatjs/intl-localematcher": {
 			"version": "0.5.4",
-			"resolved": "https://registry.npmmirror.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
 			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
-			"license": "MIT",
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@humanwhocodes/config-array": {
-			"version": "0.11.14",
-			"resolved": "https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-			"integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-			"deprecated": "Use @eslint/config-array instead",
-			"dev": true,
-			"license": "Apache-2.0",
+		"node_modules/@formatjs/intl/node_modules/@formatjs/ecma402-abstract": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
 			"dependencies": {
-				"@humanwhocodes/object-schema": "^2.0.2",
-				"debug": "^4.3.1",
-				"minimatch": "^3.0.5"
-			},
-			"engines": {
-				"node": ">=10.10.0"
+				"@formatjs/intl-localematcher": "0.5.4",
+				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"license": "MIT",
+		"node_modules/@formatjs/intl/node_modules/@formatjs/icu-messageformat-parser": {
+			"version": "2.7.8",
+			"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
+			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
 			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"@formatjs/icu-skeleton-parser": "1.8.2",
+				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+		"node_modules/@formatjs/intl/node_modules/@formatjs/icu-skeleton-parser": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
+			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@formatjs/intl/node_modules/@formatjs/intl-localematcher": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.11.13",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+			"integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
-				"brace-expansion": "^1.1.7"
+				"@humanwhocodes/object-schema": "^2.0.1",
+				"debug": "^4.1.1",
+				"minimatch": "^3.0.5"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">=10.10.0"
 			}
 		},
 		"node_modules/@humanwhocodes/module-importer": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
 			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
 			"dev": true,
-			"license": "Apache-2.0",
 			"engines": {
 				"node": ">=12.22"
 			},
@@ -667,18 +564,16 @@
 			}
 		},
 		"node_modules/@humanwhocodes/object-schema": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-			"integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-			"deprecated": "Use @eslint/object-schema instead",
-			"dev": true,
-			"license": "BSD-3-Clause"
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+			"integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+			"dev": true
 		},
 		"node_modules/@jridgewell/gen-mapping": {
 			"version": "0.3.5",
-			"resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
 			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-			"license": "MIT",
+			"dev": true,
 			"dependencies": {
 				"@jridgewell/set-array": "^1.2.1",
 				"@jridgewell/sourcemap-codec": "^1.4.10",
@@ -689,45 +584,44 @@
 			}
 		},
 		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-			"license": "MIT",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+			"integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+			"dev": true,
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/set-array": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
 			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-			"license": "MIT",
+			"dev": true,
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25"
+				"@jridgewell/gen-mapping": "^0.3.0",
+				"@jridgewell/trace-mapping": "^0.3.9"
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-			"license": "MIT"
+			"version": "1.4.15",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+			"dev": true
 		},
 		"node_modules/@jridgewell/trace-mapping": {
 			"version": "0.3.25",
-			"resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
 			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-			"license": "MIT",
+			"dev": true,
 			"dependencies": {
 				"@jridgewell/resolve-uri": "^3.1.0",
 				"@jridgewell/sourcemap-codec": "^1.4.14"
@@ -735,9 +629,8 @@
 		},
 		"node_modules/@mapbox/geojson-rewind": {
 			"version": "0.5.2",
-			"resolved": "https://registry.npmmirror.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
+			"resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz",
 			"integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
-			"license": "ISC",
 			"dependencies": {
 				"get-stream": "^6.0.1",
 				"minimist": "^1.2.6"
@@ -748,13 +641,12 @@
 		},
 		"node_modules/@mapbox/geojson-types": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz",
-			"integrity": "sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz",
+			"integrity": "sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw=="
 		},
 		"node_modules/@mapbox/jsonlint-lines-primitives": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
 			"integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==",
 			"engines": {
 				"node": ">= 0.6"
@@ -762,55 +654,48 @@
 		},
 		"node_modules/@mapbox/mapbox-gl-supported": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmmirror.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz",
 			"integrity": "sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==",
-			"license": "BSD-3-Clause",
 			"peerDependencies": {
 				"mapbox-gl": ">=0.32.1 <2.0.0"
 			}
 		},
 		"node_modules/@mapbox/point-geometry": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmmirror.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
-			"integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz",
+			"integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ=="
 		},
 		"node_modules/@mapbox/tiny-sdf": {
 			"version": "1.2.5",
-			"resolved": "https://registry.npmmirror.com/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz",
-			"integrity": "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==",
-			"license": "BSD-2-Clause"
+			"resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz",
+			"integrity": "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw=="
 		},
 		"node_modules/@mapbox/unitbezier": {
 			"version": "0.0.0",
-			"resolved": "https://registry.npmmirror.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz",
-			"integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==",
-			"license": "BSD-2-Clause"
+			"resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz",
+			"integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA=="
 		},
 		"node_modules/@mapbox/vector-tile": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmmirror.com/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz",
 			"integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@mapbox/point-geometry": "~0.1.0"
 			}
 		},
 		"node_modules/@mapbox/whoots-js": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
 			"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==",
-			"license": "ISC",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
-			"resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
 			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.stat": "2.0.5",
 				"run-parallel": "^1.1.9"
@@ -821,20 +706,18 @@
 		},
 		"node_modules/@nodelib/fs.stat": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
 			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 8"
 			}
 		},
 		"node_modules/@nodelib/fs.walk": {
 			"version": "1.2.8",
-			"resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
 			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.scandir": "2.1.5",
 				"fastq": "^1.6.0"
@@ -845,15 +728,13 @@
 		},
 		"node_modules/@plotly/d3": {
 			"version": "3.8.1",
-			"resolved": "https://registry.npmmirror.com/@plotly/d3/-/d3-3.8.1.tgz",
-			"integrity": "sha512-x49ThEu1FRA00kTso4Jdfyf2byaCPLBGmLjAYQz5OzaPyLUhHesX3/Nfv2OHEhynhdy2UB39DLXq6thYe2L2kg==",
-			"license": "BSD-3-Clause"
+			"resolved": "https://registry.npmjs.org/@plotly/d3/-/d3-3.8.1.tgz",
+			"integrity": "sha512-x49ThEu1FRA00kTso4Jdfyf2byaCPLBGmLjAYQz5OzaPyLUhHesX3/Nfv2OHEhynhdy2UB39DLXq6thYe2L2kg=="
 		},
 		"node_modules/@plotly/d3-sankey": {
 			"version": "0.7.2",
-			"resolved": "https://registry.npmmirror.com/@plotly/d3-sankey/-/d3-sankey-0.7.2.tgz",
+			"resolved": "https://registry.npmjs.org/@plotly/d3-sankey/-/d3-sankey-0.7.2.tgz",
 			"integrity": "sha512-2jdVos1N3mMp3QW0k2q1ph7Gd6j5PY1YihBrwpkFnKqO+cqtZq3AdEYUeSGXMeLsBDQYiqTVcihYfk8vr5tqhw==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"d3-array": "1",
 				"d3-collection": "1",
@@ -862,9 +743,8 @@
 		},
 		"node_modules/@plotly/d3-sankey-circular": {
 			"version": "0.33.1",
-			"resolved": "https://registry.npmmirror.com/@plotly/d3-sankey-circular/-/d3-sankey-circular-0.33.1.tgz",
+			"resolved": "https://registry.npmjs.org/@plotly/d3-sankey-circular/-/d3-sankey-circular-0.33.1.tgz",
 			"integrity": "sha512-FgBV1HEvCr3DV7RHhDsPXyryknucxtfnLwPtCKKxdolKyTFYoLX/ibEfX39iFYIL7DYbVeRtP43dbFcrHNE+KQ==",
-			"license": "MIT",
 			"dependencies": {
 				"d3-array": "^1.2.1",
 				"d3-collection": "^1.0.4",
@@ -872,53 +752,10 @@
 				"elementary-circuits-directed-graph": "^1.0.4"
 			}
 		},
-		"node_modules/@plotly/d3-sankey-circular/node_modules/d3-array": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
-			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/@plotly/d3-sankey-circular/node_modules/d3-path": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-1.0.9.tgz",
-			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/@plotly/d3-sankey-circular/node_modules/d3-shape": {
-			"version": "1.3.7",
-			"resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-1.3.7.tgz",
-			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"d3-path": "1"
-			}
-		},
-		"node_modules/@plotly/d3-sankey/node_modules/d3-array": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
-			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/@plotly/d3-sankey/node_modules/d3-path": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-1.0.9.tgz",
-			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/@plotly/d3-sankey/node_modules/d3-shape": {
-			"version": "1.3.7",
-			"resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-1.3.7.tgz",
-			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"d3-path": "1"
-			}
-		},
 		"node_modules/@plotly/mapbox-gl": {
 			"version": "1.13.4",
-			"resolved": "https://registry.npmmirror.com/@plotly/mapbox-gl/-/mapbox-gl-1.13.4.tgz",
+			"resolved": "https://registry.npmjs.org/@plotly/mapbox-gl/-/mapbox-gl-1.13.4.tgz",
 			"integrity": "sha512-sR3/Pe5LqT/fhYgp4rT4aSFf1rTsxMbGiH6Hojc7PH36ny5Bn17iVFUjpzycafETURuFbLZUfjODO8LvSI+5zQ==",
-			"license": "SEE LICENSE IN LICENSE.txt",
 			"dependencies": {
 				"@mapbox/geojson-rewind": "^0.5.2",
 				"@mapbox/geojson-types": "^1.0.2",
@@ -949,9 +786,8 @@
 		},
 		"node_modules/@plotly/point-cluster": {
 			"version": "3.1.9",
-			"resolved": "https://registry.npmmirror.com/@plotly/point-cluster/-/point-cluster-3.1.9.tgz",
+			"resolved": "https://registry.npmjs.org/@plotly/point-cluster/-/point-cluster-3.1.9.tgz",
 			"integrity": "sha512-MwaI6g9scKf68Orpr1pHZ597pYx9uP8UEFXLPbsCmuw3a84obwz6pnMXGc90VhgDNeNiLEdlmuK7CPo+5PIxXw==",
-			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"binary-search-bounds": "^2.0.4",
@@ -967,9 +803,8 @@
 		},
 		"node_modules/@popperjs/core": {
 			"version": "2.11.8",
-			"resolved": "https://registry.npmmirror.com/@popperjs/core/-/core-2.11.8.tgz",
+			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
 			"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-			"license": "MIT",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/popperjs"
@@ -977,10 +812,9 @@
 		},
 		"node_modules/@redux-devtools/extension": {
 			"version": "3.2.6",
-			"resolved": "https://registry.npmmirror.com/@redux-devtools/extension/-/extension-3.2.6.tgz",
+			"resolved": "https://registry.npmjs.org/@redux-devtools/extension/-/extension-3.2.6.tgz",
 			"integrity": "sha512-fWrqYAoFFKc5+78P/xWj+3NcoiJ07ak5qdiPTbO5CAuM5vE3dKk5fajpJyuOab+hLNEUJMTklCBYm+WTFcWWxA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.23.2",
 				"immutable": "^4.3.4"
@@ -990,10 +824,9 @@
 			}
 		},
 		"node_modules/@reduxjs/toolkit": {
-			"version": "2.2.8",
-			"resolved": "https://registry.npmmirror.com/@reduxjs/toolkit/-/toolkit-2.2.8.tgz",
-			"integrity": "sha512-eK/ieXftPRQfaBSmzsamXEyDwkntMTY0e9SG5ETsEOv5JIPKhu3mj992t6B8FJjlnSrZBAAqdT8oMkPe4j+P9g==",
-			"license": "MIT",
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.5.tgz",
+			"integrity": "sha512-aeFA/s5NCG7NoJe/MhmwREJxRkDs0ZaSqt0MxhWUrwCf1UQXpwR87RROJEql0uAkLI6U7snBOYOcKw83ew3FPg==",
 			"dependencies": {
 				"immer": "^10.0.3",
 				"redux": "^5.0.1",
@@ -1015,82 +848,73 @@
 		},
 		"node_modules/@reduxjs/toolkit/node_modules/redux": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmmirror.com/redux/-/redux-5.0.1.tgz",
-			"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+			"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
 		},
 		"node_modules/@reduxjs/toolkit/node_modules/redux-thunk": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/redux-thunk/-/redux-thunk-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
 			"integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
-			"license": "MIT",
 			"peerDependencies": {
 				"redux": "^5.0.0"
 			}
 		},
 		"node_modules/@remix-run/router": {
-			"version": "1.14.2",
-			"resolved": "https://registry.npmmirror.com/@remix-run/router/-/router-1.14.2.tgz",
-			"integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
-			"license": "MIT",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.1.tgz",
+			"integrity": "sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==",
 			"engines": {
 				"node": ">=14.0.0"
 			}
 		},
 		"node_modules/@sinonjs/commons": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
 			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"type-detect": "4.0.8"
 			}
 		},
-		"node_modules/@sinonjs/commons/node_modules/type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmmirror.com/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@sinonjs/fake-timers": {
 			"version": "11.2.2",
-			"resolved": "https://registry.npmmirror.com/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
 			"integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@sinonjs/commons": "^3.0.0"
 			}
 		},
 		"node_modules/@sinonjs/samsam": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmmirror.com/@sinonjs/samsam/-/samsam-8.0.2.tgz",
-			"integrity": "sha512-v46t/fwnhejRSFTGqbpn9u+LQ9xJDse10gNnPgAcxgdoCDMXj/G2asWAC/8Qs+BAZDicX+MNZouXT1A7c83kVw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz",
+			"integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
-				"@sinonjs/commons": "^3.0.1",
+				"@sinonjs/commons": "^2.0.0",
 				"lodash.get": "^4.4.2",
-				"type-detect": "^4.1.0"
+				"type-detect": "^4.0.8"
 			}
 		},
-		"node_modules/@sinonjs/text-encoding": {
-			"version": "0.7.3",
-			"resolved": "https://registry.npmmirror.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
-			"integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
+		"node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
+			"integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
 			"dev": true,
-			"license": "(Unlicense OR Apache-2.0)"
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/@sinonjs/text-encoding": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+			"integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
+			"dev": true
 		},
 		"node_modules/@turf/area": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmmirror.com/@turf/area/-/area-6.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/@turf/area/-/area-6.5.0.tgz",
 			"integrity": "sha512-xCZdiuojokLbQ+29qR6qoMD89hv+JAgWjLrwSEWL+3JV8IXKeNFl6XkEJz9HGkVpnXvQKJoRz4/liT+8ZZ5Jyg==",
-			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0",
 				"@turf/meta": "^6.5.0"
@@ -1101,9 +925,8 @@
 		},
 		"node_modules/@turf/bbox": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmmirror.com/@turf/bbox/-/bbox-6.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-6.5.0.tgz",
 			"integrity": "sha512-RBbLaao5hXTYyyg577iuMtDB8ehxMlUqHEJiMs8jT1GHkFhr6sYre3lmLsPeYEi/ZKj5TP5tt7fkzNdJ4GIVyw==",
-			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0",
 				"@turf/meta": "^6.5.0"
@@ -1114,9 +937,8 @@
 		},
 		"node_modules/@turf/centroid": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmmirror.com/@turf/centroid/-/centroid-6.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/@turf/centroid/-/centroid-6.5.0.tgz",
 			"integrity": "sha512-MwE1oq5E3isewPprEClbfU5pXljIK/GUOMbn22UM3IFPDJX0KeoyLNwghszkdmFp/qMGL/M13MMWvU+GNLXP/A==",
-			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0",
 				"@turf/meta": "^6.5.0"
@@ -1127,18 +949,16 @@
 		},
 		"node_modules/@turf/helpers": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmmirror.com/@turf/helpers/-/helpers-6.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz",
 			"integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://opencollective.com/turf"
 			}
 		},
 		"node_modules/@turf/meta": {
 			"version": "6.5.0",
-			"resolved": "https://registry.npmmirror.com/@turf/meta/-/meta-6.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz",
 			"integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==",
-			"license": "MIT",
 			"dependencies": {
 				"@turf/helpers": "^6.5.0"
 			},
@@ -1147,25 +967,22 @@
 			}
 		},
 		"node_modules/@types/chai": {
-			"version": "4.3.20",
-			"resolved": "https://registry.npmmirror.com/@types/chai/-/chai-4.3.20.tgz",
-			"integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.3.10",
+			"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.10.tgz",
+			"integrity": "sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg==",
+			"dev": true
 		},
 		"node_modules/@types/cookiejar": {
 			"version": "2.1.5",
-			"resolved": "https://registry.npmmirror.com/@types/cookiejar/-/cookiejar-2.1.5.tgz",
+			"resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz",
 			"integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3": {
 			"version": "7.4.3",
-			"resolved": "https://registry.npmmirror.com/@types/d3/-/d3-7.4.3.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
 			"integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-array": "*",
 				"@types/d3-axis": "*",
@@ -1201,51 +1018,45 @@
 		},
 		"node_modules/@types/d3-array": {
 			"version": "3.2.1",
-			"resolved": "https://registry.npmmirror.com/@types/d3-array/-/d3-array-3.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
 			"integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-axis": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmmirror.com/@types/d3-axis/-/d3-axis-3.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
 			"integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-brush": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmmirror.com/@types/d3-brush/-/d3-brush-3.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
 			"integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-chord": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmmirror.com/@types/d3-chord/-/d3-chord-3.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
 			"integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-color": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmmirror.com/@types/d3-color/-/d3-color-3.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
 			"integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-contour": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmmirror.com/@types/d3-contour/-/d3-contour-3.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
 			"integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-array": "*",
 				"@types/geojson": "*"
@@ -1253,203 +1064,178 @@
 		},
 		"node_modules/@types/d3-delaunay": {
 			"version": "6.0.4",
-			"resolved": "https://registry.npmmirror.com/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
 			"integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-dispatch": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmmirror.com/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
 			"integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-drag": {
 			"version": "3.0.7",
-			"resolved": "https://registry.npmmirror.com/@types/d3-drag/-/d3-drag-3.0.7.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-3.0.7.tgz",
 			"integrity": "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-dsv": {
 			"version": "3.0.7",
-			"resolved": "https://registry.npmmirror.com/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
 			"integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-ease": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmmirror.com/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
 			"integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-fetch": {
 			"version": "3.0.7",
-			"resolved": "https://registry.npmmirror.com/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
 			"integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-dsv": "*"
 			}
 		},
 		"node_modules/@types/d3-force": {
 			"version": "3.0.10",
-			"resolved": "https://registry.npmmirror.com/@types/d3-force/-/d3-force-3.0.10.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
 			"integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-format": {
 			"version": "3.0.4",
-			"resolved": "https://registry.npmmirror.com/@types/d3-format/-/d3-format-3.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
 			"integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-geo": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/@types/d3-geo/-/d3-geo-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
 			"integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/geojson": "*"
 			}
 		},
 		"node_modules/@types/d3-hierarchy": {
 			"version": "3.1.7",
-			"resolved": "https://registry.npmmirror.com/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
 			"integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-interpolate": {
 			"version": "3.0.4",
-			"resolved": "https://registry.npmmirror.com/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
 			"integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-color": "*"
 			}
 		},
 		"node_modules/@types/d3-path": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/@types/d3-path/-/d3-path-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
 			"integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-polygon": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmmirror.com/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
 			"integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-quadtree": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmmirror.com/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
 			"integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-random": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmmirror.com/@types/d3-random/-/d3-random-3.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
 			"integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-scale": {
 			"version": "4.0.8",
-			"resolved": "https://registry.npmmirror.com/@types/d3-scale/-/d3-scale-4.0.8.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
 			"integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-time": "*"
 			}
 		},
 		"node_modules/@types/d3-scale-chromatic": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
-			"integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
-			"dev": true,
-			"license": "MIT"
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz",
+			"integrity": "sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==",
+			"dev": true
 		},
 		"node_modules/@types/d3-selection": {
-			"version": "3.0.11",
-			"resolved": "https://registry.npmmirror.com/@types/d3-selection/-/d3-selection-3.0.11.tgz",
-			"integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==",
-			"dev": true,
-			"license": "MIT"
+			"version": "3.0.10",
+			"resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz",
+			"integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==",
+			"dev": true
 		},
 		"node_modules/@types/d3-shape": {
 			"version": "3.1.6",
-			"resolved": "https://registry.npmmirror.com/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
 			"integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-path": "*"
 			}
 		},
 		"node_modules/@types/d3-time": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmmirror.com/@types/d3-time/-/d3-time-3.0.4.tgz",
-			"integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-			"dev": true,
-			"license": "MIT"
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
+			"integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==",
+			"dev": true
 		},
 		"node_modules/@types/d3-time-format": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmmirror.com/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
 			"integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-timer": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmmirror.com/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
 			"integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/d3-transition": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmmirror.com/@types/d3-transition/-/d3-transition-3.0.9.tgz",
-			"integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==",
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz",
+			"integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/d3-zoom": {
 			"version": "3.0.8",
-			"resolved": "https://registry.npmmirror.com/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
+			"resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.8.tgz",
 			"integrity": "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/d3-interpolate": "*",
 				"@types/d3-selection": "*"
 			}
 		},
 		"node_modules/@types/eslint": {
-			"version": "8.56.12",
-			"resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.12.tgz",
-			"integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
+			"version": "8.44.7",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz",
+			"integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/estree": "*",
 				"@types/json-schema": "*"
@@ -1457,34 +1243,30 @@
 		},
 		"node_modules/@types/eslint-scope": {
 			"version": "3.7.7",
-			"resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
 			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/eslint": "*",
 				"@types/estree": "*"
 			}
 		},
 		"node_modules/@types/estree": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.6.tgz",
-			"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-			"dev": true,
-			"license": "MIT"
+			"version": "0.0.51",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+			"dev": true
 		},
 		"node_modules/@types/geojson": {
 			"version": "7946.0.14",
-			"resolved": "https://registry.npmmirror.com/@types/geojson/-/geojson-7946.0.14.tgz",
+			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
 			"integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/hoist-non-react-statics": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmmirror.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
-			"integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
-			"license": "MIT",
+			"version": "3.3.5",
+			"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
+			"integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
 			"dependencies": {
 				"@types/react": "*",
 				"hoist-non-react-statics": "^3.3.0"
@@ -1492,84 +1274,74 @@
 		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.15",
-			"resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
 			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/lodash": {
-			"version": "4.17.13",
-			"resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.13.tgz",
-			"integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.17.4",
+			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
+			"integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==",
+			"dev": true
 		},
 		"node_modules/@types/node": {
-			"version": "20.14.15",
-			"resolved": "https://registry.npmmirror.com/@types/node/-/node-20.14.15.tgz",
-			"integrity": "sha512-Fz1xDMCF/B00/tYSVMlmK7hVeLh7jE5f3B7X1/hmV0MJBwE27KlS7EvD/Yp+z1lm8mVhwV5w+n8jOZG8AfTlKw==",
+			"version": "20.14.10",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
+			"integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"undici-types": "~5.26.4"
 			}
 		},
 		"node_modules/@types/parse-json": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.2.tgz",
-			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
 		},
 		"node_modules/@types/plotly.js": {
-			"version": "2.29.5",
-			"resolved": "https://registry.npmmirror.com/@types/plotly.js/-/plotly.js-2.29.5.tgz",
-			"integrity": "sha512-VPaCOCUTHLbtQxur7o7RqKL7/hEDtgYZcXL41o4xe9mqZ4HVxbC70j0lTsCdiVp2SI+BYsER4oPO+ck17jtnkg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "2.29.2",
+			"resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-2.29.2.tgz",
+			"integrity": "sha512-tJqUVa6CmNHrzTANWO/ZLNmdvjZ6zHOAnM9iQUORVnnLvWmcO9DPdQCsrNumNvHD1aqGNxQJ8pla8CK/NUiZgA==",
+			"dev": true
 		},
 		"node_modules/@types/prop-types": {
-			"version": "15.7.14",
-			"resolved": "https://registry.npmmirror.com/@types/prop-types/-/prop-types-15.7.14.tgz",
-			"integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
-			"license": "MIT"
+			"version": "15.7.10",
+			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz",
+			"integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A=="
 		},
 		"node_modules/@types/react": {
-			"version": "18.3.14",
-			"resolved": "https://registry.npmmirror.com/@types/react/-/react-18.3.14.tgz",
-			"integrity": "sha512-NzahNKvjNhVjuPBQ+2G7WlxstQ+47kXZNHlUvFakDViuIEfGY926GqhMueQFZ7woG+sPiQKlF36XfrIUVSUfFg==",
-			"license": "MIT",
+			"version": "18.3.3",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
+			"integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
 			"dependencies": {
 				"@types/prop-types": "*",
 				"csstype": "^3.0.2"
 			}
 		},
 		"node_modules/@types/react-dom": {
-			"version": "18.2.25",
-			"resolved": "https://registry.npmmirror.com/@types/react-dom/-/react-dom-18.2.25.tgz",
-			"integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==",
+			"version": "18.2.24",
+			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.24.tgz",
+			"integrity": "sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==",
 			"devOptional": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/react": "*"
 			}
 		},
 		"node_modules/@types/react-plotly.js": {
 			"version": "2.6.3",
-			"resolved": "https://registry.npmmirror.com/@types/react-plotly.js/-/react-plotly.js-2.6.3.tgz",
+			"resolved": "https://registry.npmjs.org/@types/react-plotly.js/-/react-plotly.js-2.6.3.tgz",
 			"integrity": "sha512-HBQwyGuu/dGXDsWhnQrhH+xcJSsHvjkwfSRjP+YpOsCCWryIuXF78ZCBjpfgO3sCc0Jo8sYp4NOGtqT7Cn3epQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/plotly.js": "*",
 				"@types/react": "*"
 			}
 		},
 		"node_modules/@types/react-redux": {
-			"version": "7.1.34",
-			"resolved": "https://registry.npmmirror.com/@types/react-redux/-/react-redux-7.1.34.tgz",
-			"integrity": "sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==",
+			"version": "7.1.30",
+			"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.30.tgz",
+			"integrity": "sha512-i2kqM6YaUwFKduamV6QM/uHbb0eCP8f8ZQ/0yWf+BsAVVsZPRYJ9eeGWZ3uxLfWwwA0SrPRMTPTqsPFkY3HZdA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/hoist-non-react-statics": "^3.3.0",
 				"@types/react": "*",
@@ -1578,27 +1350,24 @@
 			}
 		},
 		"node_modules/@types/react-transition-group": {
-			"version": "4.4.11",
-			"resolved": "https://registry.npmmirror.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz",
-			"integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==",
-			"license": "MIT",
+			"version": "4.4.9",
+			"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.9.tgz",
+			"integrity": "sha512-ZVNmWumUIh5NhH8aMD9CR2hdW0fNuYInlocZHaZ+dgk/1K49j1w/HoAuK1ki+pgscQrOFRTlXeoURtuzEkV3dg==",
 			"dependencies": {
 				"@types/react": "*"
 			}
 		},
 		"node_modules/@types/semver": {
 			"version": "7.5.8",
-			"resolved": "https://registry.npmmirror.com/@types/semver/-/semver-7.5.8.tgz",
+			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
 			"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/@types/superagent": {
 			"version": "4.1.13",
-			"resolved": "https://registry.npmmirror.com/@types/superagent/-/superagent-4.1.13.tgz",
+			"resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.13.tgz",
 			"integrity": "sha512-YIGelp3ZyMiH0/A09PMAORO0EBGlF5xIKfDpK74wdYvWUs2o96b5CItJcWPdH409b7SAXIIG6p8NdU/4U2Maww==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/cookiejar": "*",
 				"@types/node": "*"
@@ -1606,16 +1375,14 @@
 		},
 		"node_modules/@types/use-sync-external-store": {
 			"version": "0.0.3",
-			"resolved": "https://registry.npmmirror.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
-			"integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
+			"integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA=="
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
 			"integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.5.1",
 				"@typescript-eslint/scope-manager": "6.21.0",
@@ -1648,10 +1415,9 @@
 		},
 		"node_modules/@typescript-eslint/parser": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
 			"integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"@typescript-eslint/scope-manager": "6.21.0",
 				"@typescript-eslint/types": "6.21.0",
@@ -1677,10 +1443,9 @@
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
 			"integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@typescript-eslint/types": "6.21.0",
 				"@typescript-eslint/visitor-keys": "6.21.0"
@@ -1695,10 +1460,9 @@
 		},
 		"node_modules/@typescript-eslint/type-utils": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
 			"integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@typescript-eslint/typescript-estree": "6.21.0",
 				"@typescript-eslint/utils": "6.21.0",
@@ -1723,10 +1487,9 @@
 		},
 		"node_modules/@typescript-eslint/types": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
 			"integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": "^16.0.0 || >=18.0.0"
 			},
@@ -1737,10 +1500,9 @@
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
 			"integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"@typescript-eslint/types": "6.21.0",
 				"@typescript-eslint/visitor-keys": "6.21.0",
@@ -1764,12 +1526,35 @@
 				}
 			}
 		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+			"version": "9.0.3",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/@typescript-eslint/utils": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
 			"integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
 				"@types/json-schema": "^7.0.12",
@@ -1792,10 +1577,9 @@
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
 			"integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@typescript-eslint/types": "6.21.0",
 				"eslint-visitor-keys": "^3.4.1"
@@ -1809,172 +1593,156 @@
 			}
 		},
 		"node_modules/@webassemblyjs/ast": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+			"integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/helper-numbers": "1.13.2",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+				"@webassemblyjs/helper-numbers": "1.11.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.1"
 			}
 		},
 		"node_modules/@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-			"dev": true,
-			"license": "MIT"
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+			"integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+			"dev": true
 		},
 		"node_modules/@webassemblyjs/helper-api-error": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-			"dev": true,
-			"license": "MIT"
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+			"integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+			"dev": true
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-			"dev": true,
-			"license": "MIT"
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+			"integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+			"dev": true
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+			"integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/floating-point-hex-parser": "1.13.2",
-				"@webassemblyjs/helper-api-error": "1.13.2",
+				"@webassemblyjs/floating-point-hex-parser": "1.11.1",
+				"@webassemblyjs/helper-api-error": "1.11.1",
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-			"dev": true,
-			"license": "MIT"
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+			"integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+			"dev": true
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+			"integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/wasm-gen": "1.14.1"
+				"@webassemblyjs/ast": "1.11.1",
+				"@webassemblyjs/helper-buffer": "1.11.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+				"@webassemblyjs/wasm-gen": "1.11.1"
 			}
 		},
 		"node_modules/@webassemblyjs/ieee754": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+			"integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@xtuc/ieee754": "^1.2.0"
 			}
 		},
 		"node_modules/@webassemblyjs/leb128": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+			"integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
 			"dev": true,
-			"license": "Apache-2.0",
 			"dependencies": {
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webassemblyjs/utf8": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-			"dev": true,
-			"license": "MIT"
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+			"integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+			"dev": true
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+			"integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/helper-wasm-section": "1.14.1",
-				"@webassemblyjs/wasm-gen": "1.14.1",
-				"@webassemblyjs/wasm-opt": "1.14.1",
-				"@webassemblyjs/wasm-parser": "1.14.1",
-				"@webassemblyjs/wast-printer": "1.14.1"
+				"@webassemblyjs/ast": "1.11.1",
+				"@webassemblyjs/helper-buffer": "1.11.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+				"@webassemblyjs/helper-wasm-section": "1.11.1",
+				"@webassemblyjs/wasm-gen": "1.11.1",
+				"@webassemblyjs/wasm-opt": "1.11.1",
+				"@webassemblyjs/wasm-parser": "1.11.1",
+				"@webassemblyjs/wast-printer": "1.11.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+			"integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/ieee754": "1.13.2",
-				"@webassemblyjs/leb128": "1.13.2",
-				"@webassemblyjs/utf8": "1.13.2"
+				"@webassemblyjs/ast": "1.11.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+				"@webassemblyjs/ieee754": "1.11.1",
+				"@webassemblyjs/leb128": "1.11.1",
+				"@webassemblyjs/utf8": "1.11.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+			"integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/wasm-gen": "1.14.1",
-				"@webassemblyjs/wasm-parser": "1.14.1"
+				"@webassemblyjs/ast": "1.11.1",
+				"@webassemblyjs/helper-buffer": "1.11.1",
+				"@webassemblyjs/wasm-gen": "1.11.1",
+				"@webassemblyjs/wasm-parser": "1.11.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+			"integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-api-error": "1.13.2",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/ieee754": "1.13.2",
-				"@webassemblyjs/leb128": "1.13.2",
-				"@webassemblyjs/utf8": "1.13.2"
+				"@webassemblyjs/ast": "1.11.1",
+				"@webassemblyjs/helper-api-error": "1.11.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+				"@webassemblyjs/ieee754": "1.11.1",
+				"@webassemblyjs/leb128": "1.11.1",
+				"@webassemblyjs/utf8": "1.11.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+			"integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/ast": "1.11.1",
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webpack-cli/configtest": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
 			"integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -1985,10 +1753,9 @@
 		},
 		"node_modules/@webpack-cli/info": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/@webpack-cli/info/-/info-2.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
 			"integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -1999,10 +1766,9 @@
 		},
 		"node_modules/@webpack-cli/serve": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmmirror.com/@webpack-cli/serve/-/serve-2.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
 			"integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=14.15.0"
 			},
@@ -2018,18 +1784,16 @@
 		},
 		"node_modules/@wojtekmaj/date-utils": {
 			"version": "1.5.1",
-			"resolved": "https://registry.npmmirror.com/@wojtekmaj/date-utils/-/date-utils-1.5.1.tgz",
+			"resolved": "https://registry.npmjs.org/@wojtekmaj/date-utils/-/date-utils-1.5.1.tgz",
 			"integrity": "sha512-+i7+JmNiE/3c9FKxzWFi2IjRJ+KzZl1QPu6QNrsgaa2MuBgXvUy4gA1TVzf/JMdIIloB76xSKikTWuyYAIVLww==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/date-utils?sponsor=1"
 			}
 		},
 		"node_modules/@wojtekmaj/react-daterange-picker": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmmirror.com/@wojtekmaj/react-daterange-picker/-/react-daterange-picker-6.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/@wojtekmaj/react-daterange-picker/-/react-daterange-picker-6.0.0.tgz",
 			"integrity": "sha512-bKITvR/sjjXYXWXqQtPaJ8tPIjkuMfXOrQvVDG7q6WUnODI4FC9k7+YbctVhOnYKcg2hxTWCZ/ChJKzKpwXfzg==",
-			"license": "MIT",
 			"dependencies": {
 				"clsx": "^2.0.0",
 				"make-event-props": "^1.6.0",
@@ -2051,31 +1815,47 @@
 				}
 			}
 		},
+		"node_modules/@wojtekmaj/react-daterange-picker/node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/@xtuc/ieee754": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
 			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true,
-			"license": "BSD-3-Clause"
+			"dev": true
 		},
 		"node_modules/@xtuc/long": {
 			"version": "4.2.2",
-			"resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"dev": true,
-			"license": "Apache-2.0"
+			"dev": true
+		},
+		"node_modules/abab": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+			"dev": true
+		},
+		"node_modules/abbrev": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+			"dev": true
 		},
 		"node_modules/abs-svg-path": {
 			"version": "0.1.1",
-			"resolved": "https://registry.npmmirror.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz",
-			"integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz",
+			"integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA=="
 		},
 		"node_modules/accepts": {
 			"version": "1.3.8",
-			"resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
+			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
 			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-			"license": "MIT",
 			"dependencies": {
 				"mime-types": "~2.1.34",
 				"negotiator": "0.6.3"
@@ -2085,11 +1865,10 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.14.0",
-			"resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.0.tgz",
-			"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+			"version": "8.11.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+			"integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==",
 			"dev": true,
-			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -2097,22 +1876,29 @@
 				"node": ">=0.4.0"
 			}
 		},
+		"node_modules/acorn-import-assertions": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^8"
+			}
+		},
 		"node_modules/acorn-jsx": {
 			"version": "5.3.2",
-			"resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
 			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
 			"dev": true,
-			"license": "MIT",
 			"peerDependencies": {
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
-			"resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
 			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
 				"fast-json-stable-stringify": "^2.0.0",
@@ -2126,62 +1912,52 @@
 		},
 		"node_modules/ajv-keywords": {
 			"version": "3.5.2",
-			"resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
 			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
 			"dev": true,
-			"license": "MIT",
 			"peerDependencies": {
 				"ajv": "^6.9.1"
 			}
 		},
 		"node_modules/almost-equal": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/almost-equal/-/almost-equal-1.1.0.tgz",
-			"integrity": "sha512-0V/PkoculFl5+0Lp47JoxUcO0xSxhIBvm+BxHdD/OgXNmdRpRHCFnKVuUoWyS9EzQP+otSGv0m9Lb4yVkQBn2A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/almost-equal/-/almost-equal-1.1.0.tgz",
+			"integrity": "sha512-0V/PkoculFl5+0Lp47JoxUcO0xSxhIBvm+BxHdD/OgXNmdRpRHCFnKVuUoWyS9EzQP+otSGv0m9Lb4yVkQBn2A=="
 		},
 		"node_modules/ansi-colors": {
 			"version": "4.1.1",
-			"resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
 			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/ansi-regex": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
 			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"license": "MIT",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 			"dependencies": {
-				"color-convert": "^2.0.1"
+				"color-convert": "^1.9.0"
 			},
 			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+				"node": ">=4"
 			}
 		},
 		"node_modules/anymatch": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
 			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"normalize-path": "^3.0.0",
 				"picomatch": "^2.0.4"
@@ -2192,111 +1968,98 @@
 		},
 		"node_modules/append-field": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/append-field/-/append-field-1.0.0.tgz",
-			"integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
+			"integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="
 		},
 		"node_modules/are-docs-informative": {
 			"version": "0.0.2",
-			"resolved": "https://registry.npmmirror.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
 			"integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=14"
 			}
 		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true,
-			"license": "Python-2.0"
+			"dev": true
 		},
 		"node_modules/array-bounds": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/array-bounds/-/array-bounds-1.0.1.tgz",
-			"integrity": "sha512-8wdW3ZGk6UjMPJx/glyEt0sLzzwAE1bhToPsO1W2pbpR2gULyxe3BjSiuJFheP50T/GgODVPz2fuMUmIywt8cQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/array-bounds/-/array-bounds-1.0.1.tgz",
+			"integrity": "sha512-8wdW3ZGk6UjMPJx/glyEt0sLzzwAE1bhToPsO1W2pbpR2gULyxe3BjSiuJFheP50T/GgODVPz2fuMUmIywt8cQ=="
 		},
 		"node_modules/array-find-index": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/array-find-index/-/array-find-index-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
 			"integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/array-flatten": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 		},
 		"node_modules/array-normalize": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmmirror.com/array-normalize/-/array-normalize-1.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/array-normalize/-/array-normalize-1.1.4.tgz",
 			"integrity": "sha512-fCp0wKFLjvSPmCn4F5Tiw4M3lpMZoHlCjfcs7nNzuj3vqQQ1/a8cgB9DXcpDSn18c+coLnaW7rqfcYCvKbyJXg==",
-			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.0"
 			}
 		},
 		"node_modules/array-range": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/array-range/-/array-range-1.0.1.tgz",
-			"integrity": "sha512-shdaI1zT3CVNL2hnx9c0JMc0ZogGaxDs5e85akgHWKYa0yVbIyp06Ind3dVkTj/uuFrzaHBOyqFzo+VV6aXgtA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/array-range/-/array-range-1.0.1.tgz",
+			"integrity": "sha512-shdaI1zT3CVNL2hnx9c0JMc0ZogGaxDs5e85akgHWKYa0yVbIyp06Ind3dVkTj/uuFrzaHBOyqFzo+VV6aXgtA=="
 		},
 		"node_modules/array-rearrange": {
 			"version": "2.2.2",
-			"resolved": "https://registry.npmmirror.com/array-rearrange/-/array-rearrange-2.2.2.tgz",
-			"integrity": "sha512-UfobP5N12Qm4Qu4fwLDIi2v6+wZsSf6snYSxAMeKhrh37YGnNWZPRmVEKc/2wfms53TLQnzfpG8wCx2Y/6NG1w==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/array-rearrange/-/array-rearrange-2.2.2.tgz",
+			"integrity": "sha512-UfobP5N12Qm4Qu4fwLDIi2v6+wZsSf6snYSxAMeKhrh37YGnNWZPRmVEKc/2wfms53TLQnzfpG8wCx2Y/6NG1w=="
 		},
 		"node_modules/array-union": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
 			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/asap": {
 			"version": "2.0.6",
-			"resolved": "https://registry.npmmirror.com/asap/-/asap-2.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
 			"integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/asn1.js": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmmirror.com/asn1.js/-/asn1.js-4.10.1.tgz",
-			"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.0.0",
 				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0"
+				"minimalistic-assert": "^1.0.0",
+				"safer-buffer": "^2.1.0"
 			}
 		},
 		"node_modules/asn1.js/node_modules/bn.js": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
-			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true
 		},
 		"node_modules/assert": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/assert/-/assert-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
 			"integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"is-nan": "^1.3.2",
@@ -2307,38 +2070,31 @@
 		},
 		"node_modules/assert-options": {
 			"version": "0.8.1",
-			"resolved": "https://registry.npmmirror.com/assert-options/-/assert-options-0.8.1.tgz",
+			"resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.8.1.tgz",
 			"integrity": "sha512-5lNGRB5g5i2bGIzb+J1QQE1iKU/WEMVBReFIc5pPDWjcPj23otPL0eI6PB2v7QPi0qU6Mhym5D3y0ZiSIOf3GA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
 		"node_modules/assertion-error": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/assertion-error/-/assertion-error-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
 			"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/asynckit": {
 			"version": "0.4.0",
-			"resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
 		},
 		"node_modules/available-typed-arrays": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-			"integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
 			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"possible-typed-array-names": "^1.0.0"
-			},
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -2347,21 +2103,19 @@
 			}
 		},
 		"node_modules/axios": {
-			"version": "1.7.9",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
-			"integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
-			"license": "MIT",
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+			"integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
 			"dependencies": {
-				"follow-redirects": "^1.15.6",
+				"follow-redirects": "^1.15.0",
 				"form-data": "^4.0.0",
 				"proxy-from-env": "^1.1.0"
 			}
 		},
 		"node_modules/babel-plugin-macros": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
 			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.12.5",
 				"cosmiconfig": "^7.0.0",
@@ -2374,23 +2128,21 @@
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/base64-arraybuffer": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
 			"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6.0"
 			}
 		},
 		"node_modules/base64-js": {
 			"version": "1.5.1",
-			"resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
 			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
 			"dev": true,
 			"funding": [
@@ -2406,14 +2158,12 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			],
-			"license": "MIT"
+			]
 		},
 		"node_modules/basic-auth": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/basic-auth/-/basic-auth-2.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
 			"integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
-			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "5.1.2"
 			},
@@ -2423,69 +2173,89 @@
 		},
 		"node_modules/basic-auth/node_modules/safe-buffer": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
 		"node_modules/bcryptjs": {
 			"version": "2.4.3",
-			"resolved": "https://registry.npmmirror.com/bcryptjs/-/bcryptjs-2.4.3.tgz",
-			"integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
+			"integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="
 		},
 		"node_modules/binary-extensions": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
-			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/binary-search-bounds": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmmirror.com/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz",
-			"integrity": "sha512-H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz",
+			"integrity": "sha512-H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA=="
 		},
 		"node_modules/bit-twiddle": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz",
-			"integrity": "sha512-B9UhK0DKFZhoTFcfvAzhqsjStvGJp9vYWf3+6SNTtdSQnvIgfkHbgHrg/e4+TH71N2GDu8tpmCVoyfrL1d7ntA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/bit-twiddle/-/bit-twiddle-1.0.2.tgz",
+			"integrity": "sha512-B9UhK0DKFZhoTFcfvAzhqsjStvGJp9vYWf3+6SNTtdSQnvIgfkHbgHrg/e4+TH71N2GDu8tpmCVoyfrL1d7ntA=="
 		},
 		"node_modules/bitmap-sdf": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmmirror.com/bitmap-sdf/-/bitmap-sdf-1.0.4.tgz",
-			"integrity": "sha512-1G3U4n5JE6RAiALMxu0p1XmeZkTeCwGKykzsLTCqVzfSDaN6S7fKnkIkfejogz+iwqBWc0UYAIKnKHNN7pSfDg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/bitmap-sdf/-/bitmap-sdf-1.0.4.tgz",
+			"integrity": "sha512-1G3U4n5JE6RAiALMxu0p1XmeZkTeCwGKykzsLTCqVzfSDaN6S7fKnkIkfejogz+iwqBWc0UYAIKnKHNN7pSfDg=="
 		},
 		"node_modules/bl": {
 			"version": "2.2.1",
-			"resolved": "https://registry.npmmirror.com/bl/-/bl-2.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
 			"integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
-			"license": "MIT",
 			"dependencies": {
 				"readable-stream": "^2.3.5",
 				"safe-buffer": "^5.1.1"
 			}
 		},
+		"node_modules/bl/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+		},
+		"node_modules/bl/node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/bl/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/bl/node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
 		"node_modules/bn.js": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-5.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
 			"integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/body-parser": {
-			"version": "1.20.3",
-			"resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.3.tgz",
-			"integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
-			"license": "MIT",
+			"version": "1.20.2",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+			"integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
 			"dependencies": {
 				"bytes": "3.1.2",
 				"content-type": "~1.0.5",
@@ -2495,7 +2265,7 @@
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"on-finished": "2.4.1",
-				"qs": "6.13.0",
+				"qs": "6.11.0",
 				"raw-body": "2.5.2",
 				"type-is": "~1.6.18",
 				"unpipe": "1.0.0"
@@ -2507,22 +2277,20 @@
 		},
 		"node_modules/body-parser/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/body-parser/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/bootstrap": {
 			"version": "5.3.3",
-			"resolved": "https://registry.npmmirror.com/bootstrap/-/bootstrap-5.3.3.tgz",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
 			"integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
 			"funding": [
 				{
@@ -2534,27 +2302,25 @@
 					"url": "https://opencollective.com/bootstrap"
 				}
 			],
-			"license": "MIT",
 			"peerDependencies": {
 				"@popperjs/core": "^2.11.8"
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"balanced-match": "^1.0.0"
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
 			}
 		},
 		"node_modules/braces": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
 			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"fill-range": "^7.1.1"
 			},
@@ -2564,24 +2330,21 @@
 		},
 		"node_modules/brorand": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/brorand/-/brorand-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 			"integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/browser-stdout": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmmirror.com/browser-stdout/-/browser-stdout-1.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
 			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-			"dev": true,
-			"license": "ISC"
+			"dev": true
 		},
 		"node_modules/browserify-aes": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/browserify-aes/-/browserify-aes-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
 			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"buffer-xor": "^1.0.3",
 				"cipher-base": "^1.0.0",
@@ -2593,10 +2356,9 @@
 		},
 		"node_modules/browserify-cipher": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
 			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"browserify-aes": "^1.0.4",
 				"browserify-des": "^1.0.0",
@@ -2605,10 +2367,9 @@
 		},
 		"node_modules/browserify-des": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/browserify-des/-/browserify-des-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
 			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"cipher-base": "^1.0.1",
 				"des.js": "^1.0.0",
@@ -2617,56 +2378,62 @@
 			}
 		},
 		"node_modules/browserify-rsa": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmmirror.com/browserify-rsa/-/browserify-rsa-4.1.1.tgz",
-			"integrity": "sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"bn.js": "^5.2.1",
-				"randombytes": "^2.1.0",
-				"safe-buffer": "^5.2.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
+				"bn.js": "^5.0.0",
+				"randombytes": "^2.0.1"
 			}
 		},
 		"node_modules/browserify-sign": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmmirror.com/browserify-sign/-/browserify-sign-4.2.3.tgz",
-			"integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+			"integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"bn.js": "^5.2.1",
 				"browserify-rsa": "^4.1.0",
 				"create-hash": "^1.2.0",
 				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.5",
-				"hash-base": "~3.0",
+				"elliptic": "^6.5.4",
 				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.7",
-				"readable-stream": "^2.3.8",
+				"parse-asn1": "^5.1.6",
+				"readable-stream": "^3.6.2",
 				"safe-buffer": "^5.2.1"
 			},
 			"engines": {
-				"node": ">= 0.12"
+				"node": ">= 4"
+			}
+		},
+		"node_modules/browserify-sign/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
 		"node_modules/browserify-zlib": {
 			"version": "0.2.0",
-			"resolved": "https://registry.npmmirror.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
 			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"pako": "~1.0.5"
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.24.2",
-			"resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.24.2.tgz",
-			"integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+			"version": "4.23.0",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -2682,12 +2449,11 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
-			"license": "MIT",
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001669",
-				"electron-to-chromium": "^1.5.41",
-				"node-releases": "^2.0.18",
-				"update-browserslist-db": "^1.1.1"
+				"caniuse-lite": "^1.0.30001587",
+				"electron-to-chromium": "^1.4.668",
+				"node-releases": "^2.0.14",
+				"update-browserslist-db": "^1.0.13"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -2698,7 +2464,7 @@
 		},
 		"node_modules/buffer": {
 			"version": "6.0.3",
-			"resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
 			"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
 			"dev": true,
 			"funding": [
@@ -2715,7 +2481,6 @@
 					"url": "https://feross.org/support"
 				}
 			],
-			"license": "MIT",
 			"dependencies": {
 				"base64-js": "^1.3.1",
 				"ieee754": "^1.2.1"
@@ -2723,33 +2488,41 @@
 		},
 		"node_modules/buffer-equal-constant-time": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
-			"license": "BSD-3-Clause"
+			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
 		},
 		"node_modules/buffer-from": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
 		},
 		"node_modules/buffer-xor": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/buffer-xor/-/buffer-xor-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
 			"integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+			"dev": true
+		},
+		"node_modules/builtin-modules": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
 			"dev": true,
-			"license": "MIT"
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/builtin-status-codes": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
 			"integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/busboy": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmmirror.com/busboy/-/busboy-1.6.0.tgz",
+			"resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
 			"integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",
 			"dependencies": {
 				"streamsearch": "^1.1.0"
@@ -2760,23 +2533,22 @@
 		},
 		"node_modules/bytes": {
 			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
 			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz",
-			"integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
-			"license": "MIT",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+			"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
 			"dependencies": {
-				"call-bind-apply-helpers": "^1.0.0",
 				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
 				"get-intrinsic": "^1.2.4",
-				"set-function-length": "^1.2.2"
+				"set-function-length": "^1.2.1"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -2785,34 +2557,19 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/call-bind-apply-helpers": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.0.tgz",
-			"integrity": "sha512-CCKAP2tkPau7D3GE8+V8R6sQubA9R5foIzGp+85EXCVSCivuxBNAWqcpn72PKYiIcqoViv/kcUDpaEIMBVi1lQ==",
-			"license": "MIT",
-			"dependencies": {
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
 		"node_modules/callsites": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
 			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/camelcase": {
 			"version": "6.3.0",
-			"resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
 			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -2821,9 +2578,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001686",
-			"resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz",
-			"integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==",
+			"version": "1.0.30001621",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz",
+			"integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==",
 			"dev": true,
 			"funding": [
 				{
@@ -2838,24 +2595,21 @@
 					"type": "github",
 					"url": "https://github.com/sponsors/ai"
 				}
-			],
-			"license": "CC-BY-4.0"
+			]
 		},
 		"node_modules/canvas-fit": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmmirror.com/canvas-fit/-/canvas-fit-1.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/canvas-fit/-/canvas-fit-1.5.0.tgz",
 			"integrity": "sha512-onIcjRpz69/Hx5bB5HGbYKUF2uC6QT6Gp+pfpGm3A7mPfcluSLV5v4Zu+oflDUwLdUw0rLIBhUbi0v8hM4FJQQ==",
-			"license": "MIT",
 			"dependencies": {
 				"element-size": "^1.1.1"
 			}
 		},
 		"node_modules/chai": {
 			"version": "4.4.1",
-			"resolved": "https://registry.npmmirror.com/chai/-/chai-4.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
 			"integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"assertion-error": "^1.1.0",
 				"check-error": "^1.0.3",
@@ -2870,24 +2624,22 @@
 			}
 		},
 		"node_modules/chai-as-promised": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmmirror.com/chai-as-promised/-/chai-as-promised-7.1.2.tgz",
-			"integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
+			"integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
 			"dev": true,
-			"license": "WTFPL",
 			"dependencies": {
 				"check-error": "^1.0.2"
 			},
 			"peerDependencies": {
-				"chai": ">= 2.1.2 < 6"
+				"chai": ">= 2.1.2 < 5"
 			}
 		},
 		"node_modules/chai-http": {
 			"version": "4.4.0",
-			"resolved": "https://registry.npmmirror.com/chai-http/-/chai-http-4.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/chai-http/-/chai-http-4.4.0.tgz",
 			"integrity": "sha512-uswN3rZpawlRaa5NiDUHcDZ3v2dw5QgLyAwnQ2tnVNuP7CwIsOFuYJ0xR1WiR7ymD4roBnJIzOUep7w9jQMFJA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/chai": "4",
 				"@types/superagent": "4.1.13",
@@ -2902,48 +2654,56 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+		"node_modules/chai-http/node_modules/qs": {
+			"version": "6.12.1",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
+			"integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
+				"side-channel": "^1.0.6"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=0.6"
 			},
 			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
 		"node_modules/charenc": {
 			"version": "0.0.2",
-			"resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
 			"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/charset": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/charset/-/charset-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/charset/-/charset-1.0.1.tgz",
 			"integrity": "sha512-6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=4.0.0"
 			}
 		},
 		"node_modules/check-error": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/check-error/-/check-error-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
 			"integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"get-func-name": "^2.0.2"
 			},
@@ -2953,7 +2713,7 @@
 		},
 		"node_modules/chokidar": {
 			"version": "3.5.3",
-			"resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
 			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
 			"dev": true,
 			"funding": [
@@ -2962,7 +2722,6 @@
 					"url": "https://paulmillr.com/funding/"
 				}
 			],
-			"license": "MIT",
 			"dependencies": {
 				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
@@ -2981,10 +2740,9 @@
 		},
 		"node_modules/chokidar/node_modules/glob-parent": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -2993,47 +2751,39 @@
 			}
 		},
 		"node_modules/chrome-trace-event": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6.0"
 			}
 		},
 		"node_modules/cipher-base": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmmirror.com/cipher-base/-/cipher-base-1.0.6.tgz",
-			"integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"inherits": "^2.0.4",
-				"safe-buffer": "^5.2.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
 			}
 		},
 		"node_modules/clamp": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/clamp/-/clamp-1.0.1.tgz",
-			"integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
+			"integrity": "sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA=="
 		},
 		"node_modules/classnames": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmmirror.com/classnames/-/classnames-2.5.1.tgz",
-			"integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
-			"license": "MIT"
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+			"integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
 		},
 		"node_modules/cliui": {
 			"version": "7.0.4",
-			"resolved": "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
 			"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"string-width": "^4.2.0",
 				"strip-ansi": "^6.0.0",
@@ -3042,10 +2792,9 @@
 		},
 		"node_modules/clone-deep": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
 			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"is-plain-object": "^2.0.4",
 				"kind-of": "^6.0.2",
@@ -3056,56 +2805,46 @@
 			}
 		},
 		"node_modules/clsx": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/clsx/-/clsx-2.1.1.tgz",
-			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-			"license": "MIT",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+			"integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/color-alpha": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmmirror.com/color-alpha/-/color-alpha-1.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/color-alpha/-/color-alpha-1.0.4.tgz",
 			"integrity": "sha512-lr8/t5NPozTSqli+duAN+x+no/2WaKTeWvxhHGN+aXT6AJ8vPlzLa7UriyjWak0pSC2jHol9JgjBYnnHsGha9A==",
-			"license": "MIT",
 			"dependencies": {
 				"color-parse": "^1.3.8"
 			}
 		},
 		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"license": "MIT",
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
 			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
+				"color-name": "1.1.3"
 			}
 		},
 		"node_modules/color-id": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/color-id/-/color-id-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/color-id/-/color-id-1.1.0.tgz",
 			"integrity": "sha512-2iRtAn6dC/6/G7bBIo0uupVrIne1NsQJvJxZOBCzQOfk7jRq97feaDZ3RdzuHakRXXnHGNwglto3pqtRx1sX0g==",
-			"license": "MIT",
 			"dependencies": {
 				"clamp": "^1.0.1"
 			}
 		},
 		"node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"license": "MIT"
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
 		},
 		"node_modules/color-normalize": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmmirror.com/color-normalize/-/color-normalize-1.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/color-normalize/-/color-normalize-1.5.0.tgz",
 			"integrity": "sha512-rUT/HDXMr6RFffrR53oX3HGWkDOP9goSAQGBkUaAYKjOE2JxozccdGyufageWDlInRAjm/jYPrf/Y38oa+7obw==",
-			"license": "MIT",
 			"dependencies": {
 				"clamp": "^1.0.1",
 				"color-rgba": "^2.1.1",
@@ -3114,9 +2853,8 @@
 		},
 		"node_modules/color-parse": {
 			"version": "1.3.8",
-			"resolved": "https://registry.npmmirror.com/color-parse/-/color-parse-1.3.8.tgz",
+			"resolved": "https://registry.npmjs.org/color-parse/-/color-parse-1.3.8.tgz",
 			"integrity": "sha512-1Y79qFv0n1xair3lNMTNeoFvmc3nirMVBij24zbs1f13+7fPpQClMg5b4AuKXLt3szj7BRlHMCXHplkce6XlmA==",
-			"license": "MIT",
 			"dependencies": {
 				"color-name": "^1.0.0",
 				"defined": "^1.0.0",
@@ -3125,9 +2863,8 @@
 		},
 		"node_modules/color-rgba": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/color-rgba/-/color-rgba-2.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/color-rgba/-/color-rgba-2.1.1.tgz",
 			"integrity": "sha512-VaX97wsqrMwLSOR6H7rU1Doa2zyVdmShabKrPEIFywLlHoibgD3QW9Dw6fSqM4+H/LfjprDNAUUW31qEQcGzNw==",
-			"license": "MIT",
 			"dependencies": {
 				"clamp": "^1.0.1",
 				"color-parse": "^1.3.8",
@@ -3136,9 +2873,8 @@
 		},
 		"node_modules/color-space": {
 			"version": "1.16.0",
-			"resolved": "https://registry.npmmirror.com/color-space/-/color-space-1.16.0.tgz",
+			"resolved": "https://registry.npmjs.org/color-space/-/color-space-1.16.0.tgz",
 			"integrity": "sha512-A6WMiFzunQ8KEPFmj02OnnoUnqhmSaHaZ/0LVFcPTdlvm8+3aMJ5x1HRHy3bDHPkovkf4sS0f4wsVvwk71fKkg==",
-			"license": "MIT",
 			"dependencies": {
 				"hsluv": "^0.0.3",
 				"mumath": "^3.3.4"
@@ -3146,16 +2882,14 @@
 		},
 		"node_modules/colorette": {
 			"version": "2.0.20",
-			"resolved": "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
 			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
-			"resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"license": "MIT",
 			"dependencies": {
 				"delayed-stream": "~1.0.0"
 			},
@@ -3164,49 +2898,41 @@
 			}
 		},
 		"node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 10"
-			}
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
 		},
 		"node_modules/comment-parser": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmmirror.com/comment-parser/-/comment-parser-1.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
 			"integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 12.0.0"
 			}
 		},
 		"node_modules/component-emitter": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
 			"integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
 			"dev": true,
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/concat-stream": {
 			"version": "1.6.2",
-			"resolved": "https://registry.npmmirror.com/concat-stream/-/concat-stream-1.6.2.tgz",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
 			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
 			"engines": [
 				"node >= 0.8"
 			],
-			"license": "MIT",
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"inherits": "^2.0.3",
@@ -3214,24 +2940,54 @@
 				"typedarray": "^0.0.6"
 			}
 		},
+		"node_modules/concat-stream/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+		},
+		"node_modules/concat-stream/node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/concat-stream/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/concat-stream/node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
 		"node_modules/console-browserify": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/console-browserify/-/console-browserify-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
 			"integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
 			"dev": true
 		},
 		"node_modules/constants-browserify": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
 			"integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/content-disposition": {
 			"version": "0.5.4",
-			"resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
 			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "5.2.1"
 			},
@@ -3241,52 +2997,45 @@
 		},
 		"node_modules/content-type": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
 			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/convert-source-map": {
 			"version": "1.9.0",
-			"resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
 		},
 		"node_modules/cookie": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-			"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
-			"license": "MIT",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+			"integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/cookie-signature": {
 			"version": "1.0.6",
-			"resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
 		},
 		"node_modules/cookiejar": {
 			"version": "2.1.4",
-			"resolved": "https://registry.npmmirror.com/cookiejar/-/cookiejar-2.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
 			"integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/core-util-is": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
-			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
 		},
 		"node_modules/cosmiconfig": {
 			"version": "7.1.0",
-			"resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
 			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-			"license": "MIT",
 			"dependencies": {
 				"@types/parse-json": "^4.0.0",
 				"import-fresh": "^3.2.1",
@@ -3300,34 +3049,30 @@
 		},
 		"node_modules/country-regex": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/country-regex/-/country-regex-1.1.0.tgz",
-			"integrity": "sha512-iSPlClZP8vX7MC3/u6s3lrDuoQyhQukh5LyABJ3hvfzbQ3Yyayd4fp04zjLnfi267B/B2FkumcWWgrbban7sSA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/country-regex/-/country-regex-1.1.0.tgz",
+			"integrity": "sha512-iSPlClZP8vX7MC3/u6s3lrDuoQyhQukh5LyABJ3hvfzbQ3Yyayd4fp04zjLnfi267B/B2FkumcWWgrbban7sSA=="
 		},
 		"node_modules/create-ecdh": {
 			"version": "4.0.4",
-			"resolved": "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
 			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.1.0",
 				"elliptic": "^6.5.3"
 			}
 		},
 		"node_modules/create-ecdh/node_modules/bn.js": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
-			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true
 		},
 		"node_modules/create-hash": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/create-hash/-/create-hash-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
 			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"cipher-base": "^1.0.1",
 				"inherits": "^2.0.1",
@@ -3338,10 +3083,9 @@
 		},
 		"node_modules/create-hmac": {
 			"version": "1.1.7",
-			"resolved": "https://registry.npmmirror.com/create-hmac/-/create-hmac-1.1.7.tgz",
+			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
 			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"cipher-base": "^1.0.3",
 				"create-hash": "^1.1.0",
@@ -3352,11 +3096,10 @@
 			}
 		},
 		"node_modules/cross-spawn": {
-			"version": "7.0.6",
-			"resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz",
-			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -3368,45 +3111,38 @@
 		},
 		"node_modules/crypt": {
 			"version": "0.0.2",
-			"resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
 			"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/crypto-browserify": {
-			"version": "3.12.1",
-			"resolved": "https://registry.npmmirror.com/crypto-browserify/-/crypto-browserify-3.12.1.tgz",
-			"integrity": "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==",
+			"version": "3.12.0",
+			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"browserify-cipher": "^1.0.1",
-				"browserify-sign": "^4.2.3",
-				"create-ecdh": "^4.0.4",
-				"create-hash": "^1.2.0",
-				"create-hmac": "^1.1.7",
-				"diffie-hellman": "^5.0.3",
-				"hash-base": "~3.0.4",
-				"inherits": "^2.0.4",
-				"pbkdf2": "^3.1.2",
-				"public-encrypt": "^4.0.3",
-				"randombytes": "^2.1.0",
-				"randomfill": "^1.0.4"
+				"browserify-cipher": "^1.0.0",
+				"browserify-sign": "^4.0.0",
+				"create-ecdh": "^4.0.0",
+				"create-hash": "^1.1.0",
+				"create-hmac": "^1.1.0",
+				"diffie-hellman": "^5.0.0",
+				"inherits": "^2.0.1",
+				"pbkdf2": "^3.0.3",
+				"public-encrypt": "^4.0.0",
+				"randombytes": "^2.0.0",
+				"randomfill": "^1.0.3"
 			},
 			"engines": {
-				"node": ">= 0.10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"node": "*"
 			}
 		},
 		"node_modules/css-font": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/css-font/-/css-font-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/css-font/-/css-font-1.2.0.tgz",
 			"integrity": "sha512-V4U4Wps4dPDACJ4WpgofJ2RT5Yqwe1lEH6wlOOaIxMi0gTjdIijsc5FmxQlZ7ZZyKQkkutqqvULOp07l9c7ssA==",
-			"license": "MIT",
 			"dependencies": {
 				"css-font-size-keywords": "^1.0.0",
 				"css-font-stretch-keywords": "^1.0.1",
@@ -3421,40 +3157,34 @@
 		},
 		"node_modules/css-font-size-keywords": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz",
-			"integrity": "sha512-Q+svMDbMlelgCfH/RVDKtTDaf5021O486ZThQPIpahnIjUkMUslC+WuOQSWTgGSrNCH08Y7tYNEmmy0hkfMI8Q==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz",
+			"integrity": "sha512-Q+svMDbMlelgCfH/RVDKtTDaf5021O486ZThQPIpahnIjUkMUslC+WuOQSWTgGSrNCH08Y7tYNEmmy0hkfMI8Q=="
 		},
 		"node_modules/css-font-stretch-keywords": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz",
-			"integrity": "sha512-KmugPO2BNqoyp9zmBIUGwt58UQSfyk1X5DbOlkb2pckDXFSAfjsD5wenb88fNrD6fvS+vu90a/tsPpb9vb0SLg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz",
+			"integrity": "sha512-KmugPO2BNqoyp9zmBIUGwt58UQSfyk1X5DbOlkb2pckDXFSAfjsD5wenb88fNrD6fvS+vu90a/tsPpb9vb0SLg=="
 		},
 		"node_modules/css-font-style-keywords": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz",
-			"integrity": "sha512-0Fn0aTpcDktnR1RzaBYorIxQily85M2KXRpzmxQPgh8pxUN9Fcn00I8u9I3grNr1QXVgCl9T5Imx0ZwKU973Vg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz",
+			"integrity": "sha512-0Fn0aTpcDktnR1RzaBYorIxQily85M2KXRpzmxQPgh8pxUN9Fcn00I8u9I3grNr1QXVgCl9T5Imx0ZwKU973Vg=="
 		},
 		"node_modules/css-font-weight-keywords": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz",
-			"integrity": "sha512-5So8/NH+oDD+EzsnF4iaG4ZFHQ3vaViePkL1ZbZ5iC/KrsCY+WHq/lvOgrtmuOQ9pBBZ1ADGpaf+A4lj1Z9eYA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz",
+			"integrity": "sha512-5So8/NH+oDD+EzsnF4iaG4ZFHQ3vaViePkL1ZbZ5iC/KrsCY+WHq/lvOgrtmuOQ9pBBZ1ADGpaf+A4lj1Z9eYA=="
 		},
 		"node_modules/css-global-keywords": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz",
-			"integrity": "sha512-X1xgQhkZ9n94WDwntqst5D/FKkmiU0GlJSFZSV3kLvyJ1WC5VeyoXDOuleUD+SIuH9C7W05is++0Woh0CGfKjQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/css-global-keywords/-/css-global-keywords-1.0.1.tgz",
+			"integrity": "sha512-X1xgQhkZ9n94WDwntqst5D/FKkmiU0GlJSFZSV3kLvyJ1WC5VeyoXDOuleUD+SIuH9C7W05is++0Woh0CGfKjQ=="
 		},
 		"node_modules/css-loader": {
 			"version": "6.8.1",
-			"resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-6.8.1.tgz",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
 			"integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"icss-utils": "^5.1.0",
 				"postcss": "^8.4.21",
@@ -3478,22 +3208,19 @@
 		},
 		"node_modules/css-system-font-keywords": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz",
-			"integrity": "sha512-1umTtVd/fXS25ftfjB71eASCrYhilmEsvDEI6wG/QplnmlfmVM5HkZ/ZX46DT5K3eblFPgLUHt5BRCb0YXkSFA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz",
+			"integrity": "sha512-1umTtVd/fXS25ftfjB71eASCrYhilmEsvDEI6wG/QplnmlfmVM5HkZ/ZX46DT5K3eblFPgLUHt5BRCb0YXkSFA=="
 		},
 		"node_modules/csscolorparser": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/csscolorparser/-/csscolorparser-1.0.3.tgz",
-			"integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
+			"integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w=="
 		},
 		"node_modules/cssesc": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
 			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
 			"dev": true,
-			"license": "MIT",
 			"bin": {
 				"cssesc": "bin/cssesc"
 			},
@@ -3502,16 +3229,14 @@
 			}
 		},
 		"node_modules/csstype": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
-			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-			"license": "MIT"
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
 		},
 		"node_modules/csv": {
 			"version": "5.3.2",
-			"resolved": "https://registry.npmmirror.com/csv/-/csv-5.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/csv/-/csv-5.3.2.tgz",
 			"integrity": "sha512-odDyucr9OgJTdGM2wrMbJXbOkJx3nnUX3Pt8SFOwlAMOpsUQlz1dywvLMXJWX/4Ib0rjfOsaawuuwfI5ucqBGQ==",
-			"license": "MIT",
 			"dependencies": {
 				"csv-generate": "^3.2.4",
 				"csv-parse": "^4.8.8",
@@ -3524,40 +3249,32 @@
 		},
 		"node_modules/csv-generate": {
 			"version": "3.4.3",
-			"resolved": "https://registry.npmmirror.com/csv-generate/-/csv-generate-3.4.3.tgz",
-			"integrity": "sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/csv-generate/-/csv-generate-3.4.3.tgz",
+			"integrity": "sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw=="
 		},
 		"node_modules/csv-parse": {
 			"version": "4.16.3",
-			"resolved": "https://registry.npmmirror.com/csv-parse/-/csv-parse-4.16.3.tgz",
-			"integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.3.tgz",
+			"integrity": "sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg=="
 		},
 		"node_modules/csv-stringify": {
 			"version": "5.6.5",
-			"resolved": "https://registry.npmmirror.com/csv-stringify/-/csv-stringify-5.6.5.tgz",
-			"integrity": "sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-5.6.5.tgz",
+			"integrity": "sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A=="
 		},
 		"node_modules/d": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/d/-/d-1.0.2.tgz",
-			"integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
-			"license": "ISC",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+			"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
 			"dependencies": {
-				"es5-ext": "^0.10.64",
-				"type": "^2.7.2"
-			},
-			"engines": {
-				"node": ">=0.12"
+				"es5-ext": "^0.10.50",
+				"type": "^1.0.1"
 			}
 		},
 		"node_modules/d3": {
 			"version": "7.8.5",
-			"resolved": "https://registry.npmmirror.com/d3/-/d3-7.8.5.tgz",
+			"resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
 			"integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-array": "3",
 				"d3-axis": "3",
@@ -3595,31 +3312,22 @@
 			}
 		},
 		"node_modules/d3-array": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-3.2.4.tgz",
-			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-			"license": "ISC",
-			"dependencies": {
-				"internmap": "1 - 2"
-			},
-			"engines": {
-				"node": ">=12"
-			}
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
+			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
 		},
 		"node_modules/d3-axis": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/d3-axis/-/d3-axis-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
 			"integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
-			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-brush": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/d3-brush/-/d3-brush-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
 			"integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-dispatch": "1 - 3",
 				"d3-drag": "2 - 3",
@@ -3633,9 +3341,8 @@
 		},
 		"node_modules/d3-chord": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-chord/-/d3-chord-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
 			"integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-path": "1 - 3"
 			},
@@ -3645,24 +3352,21 @@
 		},
 		"node_modules/d3-collection": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmmirror.com/d3-collection/-/d3-collection-1.0.7.tgz",
-			"integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==",
-			"license": "BSD-3-Clause"
+			"resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
+			"integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
 		},
 		"node_modules/d3-color": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/d3-color/-/d3-color-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
 			"integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-contour": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmmirror.com/d3-contour/-/d3-contour-4.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
 			"integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-array": "^3.2.0"
 			},
@@ -3670,11 +3374,21 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-contour/node_modules/d3-array": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+			"dependencies": {
+				"internmap": "1 - 2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-delaunay": {
 			"version": "6.0.4",
-			"resolved": "https://registry.npmmirror.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
 			"integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
-			"license": "ISC",
 			"dependencies": {
 				"delaunator": "5"
 			},
@@ -3683,19 +3397,14 @@
 			}
 		},
 		"node_modules/d3-dispatch": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-			"integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
+			"integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
 		},
 		"node_modules/d3-drag": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/d3-drag/-/d3-drag-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
 			"integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-dispatch": "1 - 3",
 				"d3-selection": "3"
@@ -3706,9 +3415,8 @@
 		},
 		"node_modules/d3-dsv": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-dsv/-/d3-dsv-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
 			"integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-			"license": "ISC",
 			"dependencies": {
 				"commander": "7",
 				"iconv-lite": "0.6",
@@ -3729,11 +3437,18 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-dsv/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
 		"node_modules/d3-dsv/node_modules/iconv-lite": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
 			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"license": "MIT",
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3.0.0"
 			},
@@ -3743,18 +3458,16 @@
 		},
 		"node_modules/d3-ease": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-ease/-/d3-ease-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
 			"integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-fetch": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-fetch/-/d3-fetch-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
 			"integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-dsv": "1 - 3"
 			},
@@ -3763,45 +3476,33 @@
 			}
 		},
 		"node_modules/d3-force": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/d3-force/-/d3-force-3.0.0.tgz",
-			"integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-			"license": "ISC",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
+			"integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
 			"dependencies": {
-				"d3-dispatch": "1 - 3",
-				"d3-quadtree": "1 - 3",
-				"d3-timer": "1 - 3"
-			},
-			"engines": {
-				"node": ">=12"
+				"d3-collection": "1",
+				"d3-dispatch": "1",
+				"d3-quadtree": "1",
+				"d3-timer": "1"
 			}
 		},
 		"node_modules/d3-format": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-3.1.0.tgz",
-			"integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
+			"version": "1.4.5",
+			"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz",
+			"integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ=="
 		},
 		"node_modules/d3-geo": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-3.1.1.tgz",
-			"integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
-			"license": "ISC",
+			"version": "1.12.1",
+			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz",
+			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
 			"dependencies": {
-				"d3-array": "2.5.0 - 3"
-			},
-			"engines": {
-				"node": ">=12"
+				"d3-array": "1"
 			}
 		},
 		"node_modules/d3-geo-projection": {
 			"version": "2.9.0",
-			"resolved": "https://registry.npmmirror.com/d3-geo-projection/-/d3-geo-projection-2.9.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.9.0.tgz",
 			"integrity": "sha512-ZULvK/zBn87of5rWAfFMc9mJOipeSo57O+BBitsKIXmU4rTVAnX1kSsJkE0R+TxY8pGNoM1nbyRRE7GYHhdOEQ==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"commander": "2",
 				"d3-array": "1",
@@ -3816,41 +3517,15 @@
 				"geostitch": "bin/geostitch"
 			}
 		},
-		"node_modules/d3-geo-projection/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"license": "MIT"
-		},
-		"node_modules/d3-geo-projection/node_modules/d3-array": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
-			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/d3-geo-projection/node_modules/d3-geo": {
-			"version": "1.12.1",
-			"resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-1.12.1.tgz",
-			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"d3-array": "1"
-			}
-		},
 		"node_modules/d3-hierarchy": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-			"integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
+			"integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
 		},
 		"node_modules/d3-interpolate": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
 			"integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-color": "1 - 3"
 			},
@@ -3859,46 +3534,35 @@
 			}
 		},
 		"node_modules/d3-path": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-3.1.0.tgz",
-			"integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
+			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
 		},
 		"node_modules/d3-polygon": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-polygon/-/d3-polygon-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
 			"integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
-			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-quadtree": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-			"integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
+			"integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
 		},
 		"node_modules/d3-random": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-random/-/d3-random-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
 			"integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
-			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/d3-scale": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmmirror.com/d3-scale/-/d3-scale-4.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
 			"integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-array": "2.10.0 - 3",
 				"d3-format": "1 - 3",
@@ -3912,9 +3576,8 @@
 		},
 		"node_modules/d3-scale-chromatic": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
 			"integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-color": "1 - 3",
 				"d3-interpolate": "1 - 3"
@@ -3923,32 +3586,21 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-selection": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
-			"integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/d3-shape": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-3.2.0.tgz",
-			"integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-			"license": "ISC",
+		"node_modules/d3-scale/node_modules/d3-array": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
 			"dependencies": {
-				"d3-path": "^3.1.0"
+				"internmap": "1 - 2"
 			},
 			"engines": {
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-time": {
+		"node_modules/d3-scale/node_modules/d3-time": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
 			"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-array": "2 - 3"
 			},
@@ -3956,32 +3608,44 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-time-format": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-4.1.0.tgz",
-			"integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-			"license": "ISC",
-			"dependencies": {
-				"d3-time": "1 - 3"
-			},
+		"node_modules/d3-selection": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+			"integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
 			"engines": {
 				"node": ">=12"
 			}
 		},
-		"node_modules/d3-timer": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-3.0.1.tgz",
-			"integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
+		"node_modules/d3-shape": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
+			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+			"dependencies": {
+				"d3-path": "1"
 			}
 		},
+		"node_modules/d3-time": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
+			"integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
+		},
+		"node_modules/d3-time-format": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz",
+			"integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
+			"dependencies": {
+				"d3-time": "1"
+			}
+		},
+		"node_modules/d3-timer": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
+			"integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
+		},
 		"node_modules/d3-transition": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/d3-transition/-/d3-transition-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
 			"integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-color": "1 - 3",
 				"d3-dispatch": "1 - 3",
@@ -3998,9 +3662,8 @@
 		},
 		"node_modules/d3-zoom": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/d3-zoom/-/d3-zoom-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
 			"integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
-			"license": "ISC",
 			"dependencies": {
 				"d3-dispatch": "1 - 3",
 				"d3-drag": "2 - 3",
@@ -4012,13 +3675,129 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3/node_modules/d3-array": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+			"dependencies": {
+				"internmap": "1 - 2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-dispatch": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+			"integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-force": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+			"integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+			"dependencies": {
+				"d3-dispatch": "1 - 3",
+				"d3-quadtree": "1 - 3",
+				"d3-timer": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-format": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+			"integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-geo": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+			"integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+			"dependencies": {
+				"d3-array": "2.5.0 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-hierarchy": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+			"integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-path": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+			"integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-quadtree": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+			"integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-shape": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+			"integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+			"dependencies": {
+				"d3-path": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-time": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+			"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+			"dependencies": {
+				"d3-array": "2 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-time-format": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+			"integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+			"dependencies": {
+				"d3-time": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3/node_modules/d3-timer": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+			"integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/debug": {
-			"version": "4.3.7",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
-			"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
-			"license": "MIT",
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+			"dev": true,
 			"dependencies": {
-				"ms": "^2.1.3"
+				"ms": "2.1.2"
 			},
 			"engines": {
 				"node": ">=6.0"
@@ -4031,10 +3810,9 @@
 		},
 		"node_modules/decamelize": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
 			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -4044,19 +3822,17 @@
 		},
 		"node_modules/decode-uri-component": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
 			"integrity": "sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
 			}
 		},
 		"node_modules/deep-eql": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmmirror.com/deep-eql/-/deep-eql-4.1.4.tgz",
-			"integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+			"integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"type-detect": "^4.0.0"
 			},
@@ -4066,16 +3842,13 @@
 		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
-			"resolved": "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true,
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
 		},
 		"node_modules/define-data-property": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
 			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-			"license": "MIT",
 			"dependencies": {
 				"es-define-property": "^1.0.0",
 				"es-errors": "^1.3.0",
@@ -4090,10 +3863,9 @@
 		},
 		"node_modules/define-properties": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
 			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"define-data-property": "^1.0.1",
 				"has-property-descriptors": "^1.0.0",
@@ -4108,46 +3880,41 @@
 		},
 		"node_modules/defined": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/defined/-/defined-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
 			"integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/delaunator": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmmirror.com/delaunator/-/delaunator-5.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
 			"integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
-			"license": "ISC",
 			"dependencies": {
 				"robust-predicates": "^3.0.2"
 			}
 		},
 		"node_modules/delayed-stream": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
 			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.4.0"
 			}
 		},
 		"node_modules/depd": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
 			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/des.js": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/des.js/-/des.js-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
 			"integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"minimalistic-assert": "^1.0.0"
@@ -4155,9 +3922,8 @@
 		},
 		"node_modules/destroy": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
 			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8",
 				"npm": "1.2.8000 || >= 1.4.16"
@@ -4165,25 +3931,22 @@
 		},
 		"node_modules/detect-element-overflow": {
 			"version": "1.4.2",
-			"resolved": "https://registry.npmmirror.com/detect-element-overflow/-/detect-element-overflow-1.4.2.tgz",
+			"resolved": "https://registry.npmjs.org/detect-element-overflow/-/detect-element-overflow-1.4.2.tgz",
 			"integrity": "sha512-4m6cVOtvm/GJLjo7WFkPfwXoEIIbM7GQwIh4WEa4g7IsNi1YzwUsGL5ApNLrrHL29bHeNeQ+/iZhw+YHqgE2Fw==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/detect-element-overflow?sponsor=1"
 			}
 		},
 		"node_modules/detect-kerning": {
 			"version": "2.1.2",
-			"resolved": "https://registry.npmmirror.com/detect-kerning/-/detect-kerning-2.1.2.tgz",
-			"integrity": "sha512-I3JIbrnKPAntNLl1I6TpSQQdQ4AutYzv/sKMFKbepawV/hlH0GmYKhUoOEMd4xqaUHT+Bm0f4127lh5qs1m1tw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/detect-kerning/-/detect-kerning-2.1.2.tgz",
+			"integrity": "sha512-I3JIbrnKPAntNLl1I6TpSQQdQ4AutYzv/sKMFKbepawV/hlH0GmYKhUoOEMd4xqaUHT+Bm0f4127lh5qs1m1tw=="
 		},
 		"node_modules/dezalgo": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmmirror.com/dezalgo/-/dezalgo-1.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
 			"integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"asap": "^2.0.0",
 				"wrappy": "1"
@@ -4191,20 +3954,18 @@
 		},
 		"node_modules/diff": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmmirror.com/diff/-/diff-5.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
 			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.3.1"
 			}
 		},
 		"node_modules/diffie-hellman": {
 			"version": "5.0.3",
-			"resolved": "https://registry.npmmirror.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
 			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.1.0",
 				"miller-rabin": "^4.0.0",
@@ -4212,18 +3973,16 @@
 			}
 		},
 		"node_modules/diffie-hellman/node_modules/bn.js": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
-			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true
 		},
 		"node_modules/dir-glob": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
 			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"path-type": "^4.0.0"
 			},
@@ -4233,10 +3992,9 @@
 		},
 		"node_modules/doctrine": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/doctrine/-/doctrine-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
 			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
 			"dev": true,
-			"license": "Apache-2.0",
 			"dependencies": {
 				"esutils": "^2.0.2"
 			},
@@ -4246,9 +4004,8 @@
 		},
 		"node_modules/dom-helpers": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmmirror.com/dom-helpers/-/dom-helpers-5.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
 			"integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.8.7",
 				"csstype": "^3.0.2"
@@ -4256,10 +4013,9 @@
 		},
 		"node_modules/domain-browser": {
 			"version": "4.23.0",
-			"resolved": "https://registry.npmmirror.com/domain-browser/-/domain-browser-4.23.0.tgz",
+			"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-4.23.0.tgz",
 			"integrity": "sha512-ArzcM/II1wCCujdCNyQjXrAFwS4mrLh4C7DZWlaI8mdh7h3BfKdNd3bKXITfl2PT9FtfQqaGvhi1vPRQPimjGA==",
 			"dev": true,
-			"license": "Artistic-2.0",
 			"engines": {
 				"node": ">=10"
 			},
@@ -4268,10 +4024,9 @@
 			}
 		},
 		"node_modules/dotenv": {
-			"version": "16.4.7",
-			"resolved": "https://registry.npmmirror.com/dotenv/-/dotenv-16.4.7.tgz",
-			"integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
-			"license": "BSD-2-Clause",
+			"version": "16.4.5",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+			"integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
 			"engines": {
 				"node": ">=12"
 			},
@@ -4281,9 +4036,8 @@
 		},
 		"node_modules/draw-svg-path": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/draw-svg-path/-/draw-svg-path-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/draw-svg-path/-/draw-svg-path-1.0.0.tgz",
 			"integrity": "sha512-P8j3IHxcgRMcY6sDzr0QvJDLzBnJJqpTG33UZ2Pvp8rw0apCHhJCWqYprqrXjrgHnJ6tuhP1iTJSAodPDHxwkg==",
-			"license": "MIT",
 			"dependencies": {
 				"abs-svg-path": "~0.1.1",
 				"normalize-svg-path": "~0.1.0"
@@ -4291,24 +4045,21 @@
 		},
 		"node_modules/dtype": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/dtype/-/dtype-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/dtype/-/dtype-2.0.0.tgz",
 			"integrity": "sha512-s2YVcLKdFGS0hpFqJaTwscsyt0E8nNFdmo73Ocd81xNPj4URI4rj6D60A+vFMIw7BXWlb4yRkEwfBqcZzPGiZg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8.0"
 			}
 		},
 		"node_modules/dup": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/dup/-/dup-1.0.0.tgz",
-			"integrity": "sha512-Bz5jxMMC0wgp23Zm15ip1x8IhYRqJvF3nFC0UInJUDkN1z4uNPk9jTnfCUJXbOGiQ1JbXLQsiV41Fb+HXcj5BA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/dup/-/dup-1.0.0.tgz",
+			"integrity": "sha512-Bz5jxMMC0wgp23Zm15ip1x8IhYRqJvF3nFC0UInJUDkN1z4uNPk9jTnfCUJXbOGiQ1JbXLQsiV41Fb+HXcj5BA=="
 		},
 		"node_modules/duplexify": {
 			"version": "3.7.1",
-			"resolved": "https://registry.npmmirror.com/duplexify/-/duplexify-3.7.1.tgz",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
 			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-			"license": "MIT",
 			"dependencies": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
@@ -4316,55 +4067,80 @@
 				"stream-shift": "^1.0.0"
 			}
 		},
+		"node_modules/duplexify/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+		},
+		"node_modules/duplexify/node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/duplexify/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/duplexify/node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
 		"node_modules/earcut": {
 			"version": "2.2.4",
-			"resolved": "https://registry.npmmirror.com/earcut/-/earcut-2.2.4.tgz",
-			"integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
+			"integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
 		},
 		"node_modules/ecdsa-sig-formatter": {
 			"version": "1.0.11",
-			"resolved": "https://registry.npmmirror.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
 			"integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-			"license": "Apache-2.0",
 			"dependencies": {
 				"safe-buffer": "^5.0.1"
 			}
 		},
 		"node_modules/ee-first": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.5.71",
-			"resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz",
-			"integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==",
-			"dev": true,
-			"license": "ISC"
+			"version": "1.4.782",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.782.tgz",
+			"integrity": "sha512-JUfU61e8tr+i5Y1FKXcKs+Xe+rJ+CEqm4cgv1kMihPE2EvYHmYyVr3Im/+1+Z5B29Be2EEGCZCwAc6Tazdl1Yg==",
+			"dev": true
 		},
 		"node_modules/element-size": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/element-size/-/element-size-1.1.1.tgz",
-			"integrity": "sha512-eaN+GMOq/Q+BIWy0ybsgpcYImjGIdNLyjLFJU4XsLHXYQao5jCNb36GyN6C2qwmDDYSfIBmKpPpr4VnBdLCsPQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/element-size/-/element-size-1.1.1.tgz",
+			"integrity": "sha512-eaN+GMOq/Q+BIWy0ybsgpcYImjGIdNLyjLFJU4XsLHXYQao5jCNb36GyN6C2qwmDDYSfIBmKpPpr4VnBdLCsPQ=="
 		},
 		"node_modules/elementary-circuits-directed-graph": {
 			"version": "1.3.1",
-			"resolved": "https://registry.npmmirror.com/elementary-circuits-directed-graph/-/elementary-circuits-directed-graph-1.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/elementary-circuits-directed-graph/-/elementary-circuits-directed-graph-1.3.1.tgz",
 			"integrity": "sha512-ZEiB5qkn2adYmpXGnJKkxT8uJHlW/mxmBpmeqawEHzPxh9HkLD4/1mFYX5l0On+f6rcPIt8/EWlRU2Vo3fX6dQ==",
-			"license": "MIT",
 			"dependencies": {
 				"strongly-connected-components": "^1.0.1"
 			}
 		},
 		"node_modules/elliptic": {
-			"version": "6.6.1",
-			"resolved": "https://registry.npmmirror.com/elliptic/-/elliptic-6.6.1.tgz",
-			"integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
+			"version": "6.5.4",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.11.9",
 				"brorand": "^1.1.0",
@@ -4376,43 +4152,38 @@
 			}
 		},
 		"node_modules/elliptic/node_modules/bn.js": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
-			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true
 		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
-			"resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
 			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/encodeurl": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-			"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-			"license": "MIT",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/end-of-stream": {
 			"version": "1.4.4",
-			"resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
 			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-			"license": "MIT",
 			"dependencies": {
 				"once": "^1.4.0"
 			}
 		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.17.1",
-			"resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-			"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+			"version": "5.15.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
 				"tapable": "^2.2.0"
@@ -4422,11 +4193,10 @@
 			}
 		},
 		"node_modules/envinfo": {
-			"version": "7.14.0",
-			"resolved": "https://registry.npmmirror.com/envinfo/-/envinfo-7.14.0.tgz",
-			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
+			"version": "7.11.0",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz",
+			"integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==",
 			"dev": true,
-			"license": "MIT",
 			"bin": {
 				"envinfo": "dist/cli.js"
 			},
@@ -4436,18 +4206,16 @@
 		},
 		"node_modules/error-ex": {
 			"version": "1.3.2",
-			"resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
 			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"license": "MIT",
 			"dependencies": {
 				"is-arrayish": "^0.2.1"
 			}
 		},
 		"node_modules/es-define-property": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
 			"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-			"license": "MIT",
 			"dependencies": {
 				"get-intrinsic": "^1.2.4"
 			},
@@ -4457,26 +4225,23 @@
 		},
 		"node_modules/es-errors": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
 			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			}
 		},
 		"node_modules/es-module-lexer": {
-			"version": "1.5.4",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
-			"integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
-			"dev": true,
-			"license": "MIT"
+			"version": "0.9.3",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+			"dev": true
 		},
 		"node_modules/es5-ext": {
 			"version": "0.10.64",
-			"resolved": "https://registry.npmmirror.com/es5-ext/-/es5-ext-0.10.64.tgz",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
 			"integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
 			"hasInstallScript": true,
-			"license": "ISC",
 			"dependencies": {
 				"es6-iterator": "^2.0.3",
 				"es6-symbol": "^3.1.3",
@@ -4489,9 +4254,8 @@
 		},
 		"node_modules/es6-iterator": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
 			"integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
-			"license": "MIT",
 			"dependencies": {
 				"d": "1",
 				"es5-ext": "^0.10.35",
@@ -4499,23 +4263,18 @@
 			}
 		},
 		"node_modules/es6-symbol": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz",
-			"integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
-			"license": "ISC",
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+			"integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
 			"dependencies": {
-				"d": "^1.0.2",
-				"ext": "^1.7.0"
-			},
-			"engines": {
-				"node": ">=0.12"
+				"d": "^1.0.1",
+				"ext": "^1.1.2"
 			}
 		},
 		"node_modules/es6-weak-map": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmmirror.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
 			"integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-			"license": "ISC",
 			"dependencies": {
 				"d": "1",
 				"es5-ext": "^0.10.46",
@@ -4524,71 +4283,117 @@
 			}
 		},
 		"node_modules/escalade": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz",
-			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/escape-html": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
 		},
 		"node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"license": "MIT",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
 			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
+				"node": ">=0.8.0"
 			}
 		},
 		"node_modules/escodegen": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/escodegen/-/escodegen-2.1.0.tgz",
-			"integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-			"license": "BSD-2-Clause",
+			"version": "1.14.3",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+			"integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
 			"dependencies": {
 				"esprima": "^4.0.1",
-				"estraverse": "^5.2.0",
-				"esutils": "^2.0.2"
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1"
 			},
 			"bin": {
 				"escodegen": "bin/escodegen.js",
 				"esgenerate": "bin/esgenerate.js"
 			},
 			"engines": {
-				"node": ">=6.0"
+				"node": ">=4.0"
 			},
 			"optionalDependencies": {
 				"source-map": "~0.6.1"
 			}
 		},
+		"node_modules/escodegen/node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/levn": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+			"dependencies": {
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/optionator": {
+			"version": "0.8.3",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+			"dependencies": {
+				"deep-is": "~0.1.3",
+				"fast-levenshtein": "~2.0.6",
+				"levn": "~0.3.0",
+				"prelude-ls": "~1.1.2",
+				"type-check": "~0.3.2",
+				"word-wrap": "~1.2.3"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/prelude-ls": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
 		"node_modules/escodegen/node_modules/source-map": {
 			"version": "0.6.1",
-			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"license": "BSD-3-Clause",
 			"optional": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/escodegen/node_modules/type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+			"dependencies": {
+				"prelude-ls": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
 		"node_modules/eslint": {
 			"version": "8.48.0",
-			"resolved": "https://registry.npmmirror.com/eslint/-/eslint-8.48.0.tgz",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
 			"integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
-			"deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.6.1",
@@ -4639,34 +4444,45 @@
 			}
 		},
 		"node_modules/eslint-plugin-jsdoc": {
-			"version": "48.2.15",
-			"resolved": "https://registry.npmmirror.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.15.tgz",
-			"integrity": "sha512-ScHhf9thOoJQ4dXpS+nJXTfNfslG8NBtzQ165PiXWIyGlJcAmkiEeTIEAlIcLA7uztJF7zRiuiKIqOBX4JpVzw==",
+			"version": "48.2.3",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.3.tgz",
+			"integrity": "sha512-r9DMAmFs66VNvNqRLLjHejdnJtILrt3xGi+Qx0op0oRfFGVpOR1Hb3BC++MacseHx93d8SKYPhyrC9BS7Os2QA==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
-				"@es-joy/jsdoccomment": "~0.43.1",
+				"@es-joy/jsdoccomment": "~0.42.0",
 				"are-docs-informative": "^0.0.2",
 				"comment-parser": "1.4.1",
 				"debug": "^4.3.4",
 				"escape-string-regexp": "^4.0.0",
 				"esquery": "^1.5.0",
-				"semver": "^7.6.2",
+				"is-builtin-module": "^3.2.1",
+				"semver": "^7.6.0",
 				"spdx-expression-parse": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=18"
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
 			},
-			"peerDependencies": {
-				"eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/eslint-scope": {
 			"version": "7.2.2",
-			"resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
 			"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"esrecurse": "^4.3.0",
 				"estraverse": "^5.2.0"
@@ -4680,10 +4496,9 @@
 		},
 		"node_modules/eslint-visitor-keys": {
 			"version": "3.4.3",
-			"resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
 			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
-			"license": "Apache-2.0",
 			"engines": {
 				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
 			},
@@ -4691,35 +4506,107 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/eslint/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+		"node_modules/eslint/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"node_modules/eslint/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+		"node_modules/eslint/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
-				"brace-expansion": "^1.1.7"
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/eslint/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/eslint/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/globals": {
+			"version": "13.23.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+			"integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/esniff": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/esniff/-/esniff-2.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
 			"integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
-			"license": "ISC",
 			"dependencies": {
 				"d": "^1.0.1",
 				"es5-ext": "^0.10.62",
@@ -4730,12 +4617,16 @@
 				"node": ">=0.10"
 			}
 		},
+		"node_modules/esniff/node_modules/type": {
+			"version": "2.7.2",
+			"resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+		},
 		"node_modules/espree": {
 			"version": "9.6.1",
-			"resolved": "https://registry.npmmirror.com/espree/-/espree-9.6.1.tgz",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
 			"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"acorn": "^8.9.0",
 				"acorn-jsx": "^5.3.2",
@@ -4750,9 +4641,8 @@
 		},
 		"node_modules/esprima": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
 			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"license": "BSD-2-Clause",
 			"bin": {
 				"esparse": "bin/esparse.js",
 				"esvalidate": "bin/esvalidate.js"
@@ -4762,11 +4652,10 @@
 			}
 		},
 		"node_modules/esquery": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmmirror.com/esquery/-/esquery-1.6.0.tgz",
-			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+			"integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"estraverse": "^5.1.0"
 			},
@@ -4776,10 +4665,9 @@
 		},
 		"node_modules/esrecurse": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
 			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"estraverse": "^5.2.0"
 			},
@@ -4789,36 +4677,33 @@
 		},
 		"node_modules/estraverse": {
 			"version": "5.3.0",
-			"resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
 			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"license": "BSD-2-Clause",
+			"dev": true,
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
 		"node_modules/esutils": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
 			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/etag": {
 			"version": "1.8.1",
-			"resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
 			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/event-emitter": {
 			"version": "0.3.5",
-			"resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz",
+			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
 			"integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
-			"license": "MIT",
 			"dependencies": {
 				"d": "1",
 				"es5-ext": "~0.10.14"
@@ -4826,56 +4711,53 @@
 		},
 		"node_modules/events": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
 			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.8.x"
 			}
 		},
 		"node_modules/evp_bytestokey": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
 			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"md5.js": "^1.3.4",
 				"safe-buffer": "^5.1.1"
 			}
 		},
 		"node_modules/express": {
-			"version": "4.21.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-			"integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
-			"license": "MIT",
+			"version": "4.19.2",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+			"integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
-				"body-parser": "1.20.3",
+				"body-parser": "1.20.2",
 				"content-disposition": "0.5.4",
 				"content-type": "~1.0.4",
-				"cookie": "0.7.1",
+				"cookie": "0.6.0",
 				"cookie-signature": "1.0.6",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
-				"encodeurl": "~2.0.0",
+				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
 				"etag": "~1.8.1",
-				"finalhandler": "1.3.1",
+				"finalhandler": "1.2.0",
 				"fresh": "0.5.2",
 				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.3",
+				"merge-descriptors": "1.0.1",
 				"methods": "~1.1.2",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.12",
+				"path-to-regexp": "0.1.7",
 				"proxy-addr": "~2.0.7",
-				"qs": "6.13.0",
+				"qs": "6.11.0",
 				"range-parser": "~1.2.1",
 				"safe-buffer": "5.2.1",
-				"send": "0.19.0",
-				"serve-static": "1.16.2",
+				"send": "0.18.0",
+				"serve-static": "1.15.0",
 				"setprototypeof": "1.2.0",
 				"statuses": "2.0.1",
 				"type-is": "~1.6.18",
@@ -4884,17 +4766,12 @@
 			},
 			"engines": {
 				"node": ">= 0.10.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/express"
 			}
 		},
 		"node_modules/express-rate-limit": {
 			"version": "7.2.0",
-			"resolved": "https://registry.npmmirror.com/express-rate-limit/-/express-rate-limit-7.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.2.0.tgz",
 			"integrity": "sha512-T7nul1t4TNyfZMJ7pKRKkdeVJWa2CqB8NA1P8BwYaoDI5QSBZARv5oMS43J7b7I5P+4asjVXjb7ONuwDKucahg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 16"
 			},
@@ -4909,7 +4786,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -4917,23 +4793,25 @@
 		"node_modules/express/node_modules/ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"license": "MIT"
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/ext": {
 			"version": "1.7.0",
-			"resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
+			"resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
 			"integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
-			"license": "ISC",
 			"dependencies": {
 				"type": "^2.7.2"
 			}
 		},
+		"node_modules/ext/node_modules/type": {
+			"version": "2.7.2",
+			"resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+		},
 		"node_modules/falafel": {
 			"version": "2.2.5",
-			"resolved": "https://registry.npmmirror.com/falafel/-/falafel-2.2.5.tgz",
+			"resolved": "https://registry.npmjs.org/falafel/-/falafel-2.2.5.tgz",
 			"integrity": "sha512-HuC1qF9iTnHDnML9YZAdCDQwT0yKl/U55K4XSUXqGAA2GLoafFgWRqdAbhWJxXaYD4pyoVxAJ8wH670jMpI9DQ==",
-			"license": "MIT",
 			"dependencies": {
 				"acorn": "^7.1.1",
 				"isarray": "^2.0.1"
@@ -4944,9 +4822,8 @@
 		},
 		"node_modules/falafel/node_modules/acorn": {
 			"version": "7.4.1",
-			"resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
 			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -4956,17 +4833,15 @@
 		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
 			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/fast-glob": {
 			"version": "3.3.2",
-			"resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
 			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -4980,10 +4855,9 @@
 		},
 		"node_modules/fast-glob/node_modules/glob-parent": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
 			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"is-glob": "^4.0.1"
 			},
@@ -4993,60 +4867,52 @@
 		},
 		"node_modules/fast-isnumeric": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmmirror.com/fast-isnumeric/-/fast-isnumeric-1.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/fast-isnumeric/-/fast-isnumeric-1.1.4.tgz",
 			"integrity": "sha512-1mM8qOr2LYz8zGaUdmiqRDiuue00Dxjgcb1NQR7TnhLVh6sQyngP9xvLo7Sl7LZpP/sk5eb+bcyWXw530NTBZw==",
-			"license": "MIT",
 			"dependencies": {
 				"is-string-blank": "^1.0.1"
 			}
 		},
 		"node_modules/fast-json-stable-stringify": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
 			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/fast-levenshtein": {
 			"version": "2.0.6",
-			"resolved": "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true,
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
 		},
 		"node_modules/fast-safe-stringify": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
 			"integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/fastest-levenshtein": {
 			"version": "1.0.16",
-			"resolved": "https://registry.npmmirror.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
 			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 4.9.1"
 			}
 		},
 		"node_modules/fastq": {
-			"version": "1.17.1",
-			"resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.17.1.tgz",
-			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+			"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"reusify": "^1.0.4"
 			}
 		},
 		"node_modules/file-entry-cache": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
 			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"flat-cache": "^3.0.4"
 			},
@@ -5056,10 +4922,9 @@
 		},
 		"node_modules/fill-range": {
 			"version": "7.1.1",
-			"resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
 			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
 			},
@@ -5069,22 +4934,20 @@
 		},
 		"node_modules/filter-obj": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/filter-obj/-/filter-obj-2.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.2.tgz",
 			"integrity": "sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/finalhandler": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-			"integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-			"license": "MIT",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
 			"dependencies": {
 				"debug": "2.6.9",
-				"encodeurl": "~2.0.0",
+				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
@@ -5099,7 +4962,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -5107,21 +4969,18 @@
 		"node_modules/finalhandler/node_modules/ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"license": "MIT"
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/find-root": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/find-root/-/find-root-1.1.0.tgz",
-			"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+			"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
 		},
 		"node_modules/find-up": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmmirror.com/find-up/-/find-up-5.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
 			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"locate-path": "^6.0.0",
 				"path-exists": "^4.0.0"
@@ -5135,56 +4994,51 @@
 		},
 		"node_modules/flat": {
 			"version": "5.0.2",
-			"resolved": "https://registry.npmmirror.com/flat/-/flat-5.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
 			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"bin": {
 				"flat": "cli.js"
 			}
 		},
 		"node_modules/flat-cache": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmmirror.com/flat-cache/-/flat-cache-3.2.0.tgz",
-			"integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
+			"integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"flatted": "^3.2.9",
 				"keyv": "^4.5.3",
 				"rimraf": "^3.0.2"
 			},
 			"engines": {
-				"node": "^10.12.0 || >=12.0.0"
+				"node": ">=12.0.0"
 			}
 		},
 		"node_modules/flatted": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmmirror.com/flatted/-/flatted-3.3.2.tgz",
-			"integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
-			"dev": true,
-			"license": "ISC"
+			"version": "3.2.9",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+			"integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+			"dev": true
 		},
 		"node_modules/flatten-vertex-data": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/flatten-vertex-data/-/flatten-vertex-data-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/flatten-vertex-data/-/flatten-vertex-data-1.0.2.tgz",
 			"integrity": "sha512-BvCBFK2NZqerFTdMDgqfHBwxYWnxeCkwONsw6PvBMcUXqo8U/KDWwmXhqx1x2kLIg7DqIsJfOaJFOmlua3Lxuw==",
-			"license": "MIT",
 			"dependencies": {
 				"dtype": "^2.0.0"
 			}
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.9",
-			"resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
-			"integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+			"version": "1.15.6",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+			"integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
 			"funding": [
 				{
 					"type": "individual",
 					"url": "https://github.com/sponsors/RubenVerborgh"
 				}
 			],
-			"license": "MIT",
 			"engines": {
 				"node": ">=4.0"
 			},
@@ -5196,37 +5050,33 @@
 		},
 		"node_modules/font-atlas": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/font-atlas/-/font-atlas-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/font-atlas/-/font-atlas-2.1.0.tgz",
 			"integrity": "sha512-kP3AmvX+HJpW4w3d+PiPR2X6E1yvsBXt2yhuCw+yReO9F1WYhvZwx3c95DGZGwg9xYzDGrgJYa885xmVA+28Cg==",
-			"license": "MIT",
 			"dependencies": {
 				"css-font": "^1.0.0"
 			}
 		},
 		"node_modules/font-measure": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmmirror.com/font-measure/-/font-measure-1.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/font-measure/-/font-measure-1.2.2.tgz",
 			"integrity": "sha512-mRLEpdrWzKe9hbfaF3Qpr06TAjquuBVP5cHy4b3hyeNdjc9i0PO6HniGsX5vjL5OWv7+Bd++NiooNpT/s8BvIA==",
-			"license": "MIT",
 			"dependencies": {
 				"css-font": "^1.2.0"
 			}
 		},
 		"node_modules/for-each": {
 			"version": "0.3.3",
-			"resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.3.tgz",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
 			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"is-callable": "^1.1.3"
 			}
 		},
 		"node_modules/form-data": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.1.tgz",
-			"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
-			"license": "MIT",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",
@@ -5238,10 +5088,9 @@
 		},
 		"node_modules/formidable": {
 			"version": "2.1.2",
-			"resolved": "https://registry.npmmirror.com/formidable/-/formidable-2.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
 			"integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"dezalgo": "^1.0.4",
 				"hexoid": "^1.0.0",
@@ -5254,46 +5103,73 @@
 		},
 		"node_modules/forwarded": {
 			"version": "0.2.0",
-			"resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
 			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/fresh": {
 			"version": "0.5.2",
-			"resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz",
+			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
 			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/from2": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmmirror.com/from2/-/from2-2.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
 			"integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
 			}
 		},
+		"node_modules/from2/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+		},
+		"node_modules/from2/node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/from2/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/from2/node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
 			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-			"dev": true,
-			"license": "ISC"
+			"dev": true
 		},
 		"node_modules/fsevents": {
 			"version": "2.3.3",
-			"resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
 			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
 			"dev": true,
 			"hasInstallScript": true,
-			"license": "MIT",
 			"optional": true,
 			"os": [
 				"darwin"
@@ -5304,50 +5180,44 @@
 		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
 			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/geojson-vt": {
 			"version": "3.2.1",
-			"resolved": "https://registry.npmmirror.com/geojson-vt/-/geojson-vt-3.2.1.tgz",
-			"integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
+			"integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="
 		},
 		"node_modules/get-caller-file": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true,
-			"license": "ISC",
 			"engines": {
 				"node": "6.* || 8.* || >= 10.*"
 			}
 		},
 		"node_modules/get-canvas-context": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/get-canvas-context/-/get-canvas-context-1.0.2.tgz",
-			"integrity": "sha512-LnpfLf/TNzr9zVOGiIY6aKCz8EKuXmlYNV7CM2pUjBa/B+c2I15tS7KLySep75+FuerJdmArvJLcsAXWEy2H0A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/get-canvas-context/-/get-canvas-context-1.0.2.tgz",
+			"integrity": "sha512-LnpfLf/TNzr9zVOGiIY6aKCz8EKuXmlYNV7CM2pUjBa/B+c2I15tS7KLySep75+FuerJdmArvJLcsAXWEy2H0A=="
 		},
 		"node_modules/get-func-name": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/get-func-name/-/get-func-name-2.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
 			"integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/get-intrinsic": {
 			"version": "1.2.4",
-			"resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
 			"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-			"license": "MIT",
 			"dependencies": {
 				"es-errors": "^1.3.0",
 				"function-bind": "^1.1.2",
@@ -5364,9 +5234,8 @@
 		},
 		"node_modules/get-stream": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
 			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -5376,9 +5245,8 @@
 		},
 		"node_modules/get-user-locale": {
 			"version": "2.3.2",
-			"resolved": "https://registry.npmmirror.com/get-user-locale/-/get-user-locale-2.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/get-user-locale/-/get-user-locale-2.3.2.tgz",
 			"integrity": "sha512-O2GWvQkhnbDoWFUJfaBlDIKUEdND8ATpBXD6KXcbhxlfktyD/d8w6mkzM/IlQEqGZAMz/PW6j6Hv53BiigKLUQ==",
-			"license": "MIT",
 			"dependencies": {
 				"mem": "^8.0.0"
 			},
@@ -5388,21 +5256,18 @@
 		},
 		"node_modules/gl-mat4": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/gl-mat4/-/gl-mat4-1.2.0.tgz",
-			"integrity": "sha512-sT5C0pwB1/e9G9AvAoLsoaJtbMGjfd/jfxo8jMCKqYYEnjZuFvqV5rehqar0538EmssjdDeiEWnKyBSTw7quoA==",
-			"license": "Zlib"
+			"resolved": "https://registry.npmjs.org/gl-mat4/-/gl-mat4-1.2.0.tgz",
+			"integrity": "sha512-sT5C0pwB1/e9G9AvAoLsoaJtbMGjfd/jfxo8jMCKqYYEnjZuFvqV5rehqar0538EmssjdDeiEWnKyBSTw7quoA=="
 		},
 		"node_modules/gl-matrix": {
 			"version": "3.4.3",
-			"resolved": "https://registry.npmmirror.com/gl-matrix/-/gl-matrix-3.4.3.tgz",
-			"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
+			"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="
 		},
 		"node_modules/gl-text": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/gl-text/-/gl-text-1.4.0.tgz",
-			"integrity": "sha512-o47+XBqLCj1efmuNyCHt7/UEJmB9l66ql7pnobD6p+sgmBUdzfMZXIF0zD2+KRfpd99DJN+QXdvTFAGCKCVSmQ==",
-			"license": "MIT",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/gl-text/-/gl-text-1.3.1.tgz",
+			"integrity": "sha512-/f5gcEMiZd+UTBJLTl3D+CkCB/0UFGTx3nflH8ZmyWcLkZhsZ1+Xx5YYkw2rgWAzgPeE35xCqBuHSoMKQVsR+w==",
 			"dependencies": {
 				"bit-twiddle": "^1.0.2",
 				"color-normalize": "^1.5.0",
@@ -5425,9 +5290,8 @@
 		},
 		"node_modules/gl-util": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmmirror.com/gl-util/-/gl-util-3.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/gl-util/-/gl-util-3.1.3.tgz",
 			"integrity": "sha512-dvRTggw5MSkJnCbh74jZzSoTOGnVYK+Bt+Ckqm39CVcl6+zSsxqWk4lr5NKhkqXHL6qvZAU9h17ZF8mIskY9mA==",
-			"license": "MIT",
 			"dependencies": {
 				"is-browser": "^2.0.1",
 				"is-firefox": "^1.0.3",
@@ -5439,21 +5303,20 @@
 			}
 		},
 		"node_modules/glob": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz",
-			"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-			"deprecated": "Glob versions prior to v9 are no longer supported",
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
 				"inherits": "2",
-				"minimatch": "^5.0.1",
-				"once": "^1.3.0"
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": "*"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/isaacs"
@@ -5461,10 +5324,9 @@
 		},
 		"node_modules/glob-parent": {
 			"version": "6.0.2",
-			"resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
 			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"is-glob": "^4.0.3"
 			},
@@ -5474,46 +5336,15 @@
 		},
 		"node_modules/glob-to-regexp": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
 			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-			"dev": true,
-			"license": "BSD-2-Clause"
-		},
-		"node_modules/glob/node_modules/minimatch": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz",
-			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/globals": {
-			"version": "13.24.0",
-			"resolved": "https://registry.npmmirror.com/globals/-/globals-13.24.0.tgz",
-			"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"type-fest": "^0.20.2"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
+			"dev": true
 		},
 		"node_modules/globby": {
 			"version": "11.1.0",
-			"resolved": "https://registry.npmmirror.com/globby/-/globby-11.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
 			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"array-union": "^2.1.0",
 				"dir-glob": "^3.0.1",
@@ -5531,9 +5362,8 @@
 		},
 		"node_modules/glsl-inject-defines": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/glsl-inject-defines/-/glsl-inject-defines-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/glsl-inject-defines/-/glsl-inject-defines-1.0.3.tgz",
 			"integrity": "sha512-W49jIhuDtF6w+7wCMcClk27a2hq8znvHtlGnrYkSWEr8tHe9eA2dcnohlcAmxLYBSpSSdzOkRdyPTrx9fw49+A==",
-			"license": "MIT",
 			"dependencies": {
 				"glsl-token-inject-block": "^1.0.0",
 				"glsl-token-string": "^1.0.1",
@@ -5542,9 +5372,8 @@
 		},
 		"node_modules/glsl-resolve": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmmirror.com/glsl-resolve/-/glsl-resolve-0.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/glsl-resolve/-/glsl-resolve-0.0.1.tgz",
 			"integrity": "sha512-xxFNsfnhZTK9NBhzJjSBGX6IOqYpvBHxxmo+4vapiljyGNCY0Bekzn0firQkQrazK59c1hYxMDxYS8MDlhw4gA==",
-			"license": "MIT",
 			"dependencies": {
 				"resolve": "^0.6.1",
 				"xtend": "^2.1.2"
@@ -5552,13 +5381,12 @@
 		},
 		"node_modules/glsl-resolve/node_modules/resolve": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmmirror.com/resolve/-/resolve-0.6.3.tgz",
-			"integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
+			"integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg=="
 		},
 		"node_modules/glsl-resolve/node_modules/xtend": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmmirror.com/xtend/-/xtend-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz",
 			"integrity": "sha512-SLt5uylT+4aoXxXuwtQp5ZnMMzhDb1Xkg4pEqc00WUJCQifPfV9Ub1VrNhp9kXkrjZD2I2Hl8WnjP37jzZLPZw==",
 			"engines": {
 				"node": ">=0.4"
@@ -5566,30 +5394,26 @@
 		},
 		"node_modules/glsl-token-assignments": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/glsl-token-assignments/-/glsl-token-assignments-2.0.2.tgz",
-			"integrity": "sha512-OwXrxixCyHzzA0U2g4btSNAyB2Dx8XrztY5aVUCjRSh4/D0WoJn8Qdps7Xub3sz6zE73W3szLrmWtQ7QMpeHEQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/glsl-token-assignments/-/glsl-token-assignments-2.0.2.tgz",
+			"integrity": "sha512-OwXrxixCyHzzA0U2g4btSNAyB2Dx8XrztY5aVUCjRSh4/D0WoJn8Qdps7Xub3sz6zE73W3szLrmWtQ7QMpeHEQ=="
 		},
 		"node_modules/glsl-token-defines": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/glsl-token-defines/-/glsl-token-defines-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/glsl-token-defines/-/glsl-token-defines-1.0.0.tgz",
 			"integrity": "sha512-Vb5QMVeLjmOwvvOJuPNg3vnRlffscq2/qvIuTpMzuO/7s5kT+63iL6Dfo2FYLWbzuiycWpbC0/KV0biqFwHxaQ==",
-			"license": "MIT",
 			"dependencies": {
 				"glsl-tokenizer": "^2.0.0"
 			}
 		},
 		"node_modules/glsl-token-depth": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/glsl-token-depth/-/glsl-token-depth-1.1.2.tgz",
-			"integrity": "sha512-eQnIBLc7vFf8axF9aoi/xW37LSWd2hCQr/3sZui8aBJnksq9C7zMeUYHVJWMhFzXrBU7fgIqni4EhXVW4/krpg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/glsl-token-depth/-/glsl-token-depth-1.1.2.tgz",
+			"integrity": "sha512-eQnIBLc7vFf8axF9aoi/xW37LSWd2hCQr/3sZui8aBJnksq9C7zMeUYHVJWMhFzXrBU7fgIqni4EhXVW4/krpg=="
 		},
 		"node_modules/glsl-token-descope": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/glsl-token-descope/-/glsl-token-descope-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/glsl-token-descope/-/glsl-token-descope-1.0.2.tgz",
 			"integrity": "sha512-kS2PTWkvi/YOeicVjXGgX5j7+8N7e56srNDEHDTVZ1dcESmbmpmgrnpjPcjxJjMxh56mSXYoFdZqb90gXkGjQw==",
-			"license": "MIT",
 			"dependencies": {
 				"glsl-token-assignments": "^2.0.0",
 				"glsl-token-depth": "^1.1.0",
@@ -5599,54 +5423,46 @@
 		},
 		"node_modules/glsl-token-inject-block": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/glsl-token-inject-block/-/glsl-token-inject-block-1.1.0.tgz",
-			"integrity": "sha512-q/m+ukdUBuHCOtLhSr0uFb/qYQr4/oKrPSdIK2C4TD+qLaJvqM9wfXIF/OOBjuSA3pUoYHurVRNao6LTVVUPWA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/glsl-token-inject-block/-/glsl-token-inject-block-1.1.0.tgz",
+			"integrity": "sha512-q/m+ukdUBuHCOtLhSr0uFb/qYQr4/oKrPSdIK2C4TD+qLaJvqM9wfXIF/OOBjuSA3pUoYHurVRNao6LTVVUPWA=="
 		},
 		"node_modules/glsl-token-properties": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/glsl-token-properties/-/glsl-token-properties-1.0.1.tgz",
-			"integrity": "sha512-dSeW1cOIzbuUoYH0y+nxzwK9S9O3wsjttkq5ij9ZGw0OS41BirKJzzH48VLm8qLg+au6b0sINxGC0IrGwtQUcA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/glsl-token-properties/-/glsl-token-properties-1.0.1.tgz",
+			"integrity": "sha512-dSeW1cOIzbuUoYH0y+nxzwK9S9O3wsjttkq5ij9ZGw0OS41BirKJzzH48VLm8qLg+au6b0sINxGC0IrGwtQUcA=="
 		},
 		"node_modules/glsl-token-scope": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/glsl-token-scope/-/glsl-token-scope-1.1.2.tgz",
-			"integrity": "sha512-YKyOMk1B/tz9BwYUdfDoHvMIYTGtVv2vbDSLh94PT4+f87z21FVdou1KNKgF+nECBTo0fJ20dpm0B1vZB1Q03A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/glsl-token-scope/-/glsl-token-scope-1.1.2.tgz",
+			"integrity": "sha512-YKyOMk1B/tz9BwYUdfDoHvMIYTGtVv2vbDSLh94PT4+f87z21FVdou1KNKgF+nECBTo0fJ20dpm0B1vZB1Q03A=="
 		},
 		"node_modules/glsl-token-string": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/glsl-token-string/-/glsl-token-string-1.0.1.tgz",
-			"integrity": "sha512-1mtQ47Uxd47wrovl+T6RshKGkRRCYWhnELmkEcUAPALWGTFe2XZpH3r45XAwL2B6v+l0KNsCnoaZCSnhzKEksg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/glsl-token-string/-/glsl-token-string-1.0.1.tgz",
+			"integrity": "sha512-1mtQ47Uxd47wrovl+T6RshKGkRRCYWhnELmkEcUAPALWGTFe2XZpH3r45XAwL2B6v+l0KNsCnoaZCSnhzKEksg=="
 		},
 		"node_modules/glsl-token-whitespace-trim": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/glsl-token-whitespace-trim/-/glsl-token-whitespace-trim-1.0.0.tgz",
-			"integrity": "sha512-ZJtsPut/aDaUdLUNtmBYhaCmhIjpKNg7IgZSfX5wFReMc2vnj8zok+gB/3Quqs0TsBSX/fGnqUUYZDqyuc2xLQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/glsl-token-whitespace-trim/-/glsl-token-whitespace-trim-1.0.0.tgz",
+			"integrity": "sha512-ZJtsPut/aDaUdLUNtmBYhaCmhIjpKNg7IgZSfX5wFReMc2vnj8zok+gB/3Quqs0TsBSX/fGnqUUYZDqyuc2xLQ=="
 		},
 		"node_modules/glsl-tokenizer": {
 			"version": "2.1.5",
-			"resolved": "https://registry.npmmirror.com/glsl-tokenizer/-/glsl-tokenizer-2.1.5.tgz",
+			"resolved": "https://registry.npmjs.org/glsl-tokenizer/-/glsl-tokenizer-2.1.5.tgz",
 			"integrity": "sha512-XSZEJ/i4dmz3Pmbnpsy3cKh7cotvFlBiZnDOwnj/05EwNp2XrhQ4XKJxT7/pDt4kp4YcpRSKz8eTV7S+mwV6MA==",
-			"license": "MIT",
 			"dependencies": {
 				"through2": "^0.6.3"
 			}
 		},
 		"node_modules/glsl-tokenizer/node_modules/isarray": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmmirror.com/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
 		},
 		"node_modules/glsl-tokenizer/node_modules/readable-stream": {
 			"version": "1.0.34",
-			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-1.0.34.tgz",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
 			"integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-			"license": "MIT",
 			"dependencies": {
 				"core-util-is": "~1.0.0",
 				"inherits": "~2.0.1",
@@ -5656,15 +5472,13 @@
 		},
 		"node_modules/glsl-tokenizer/node_modules/string_decoder": {
 			"version": "0.10.31",
-			"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-0.10.31.tgz",
-			"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+			"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
 		},
 		"node_modules/glsl-tokenizer/node_modules/through2": {
 			"version": "0.6.5",
-			"resolved": "https://registry.npmmirror.com/through2/-/through2-0.6.5.tgz",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
 			"integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-			"license": "MIT",
 			"dependencies": {
 				"readable-stream": ">=1.0.33-1 <1.1.0-0",
 				"xtend": ">=4.0.0 <4.1.0-0"
@@ -5672,9 +5486,8 @@
 		},
 		"node_modules/glslify": {
 			"version": "7.1.1",
-			"resolved": "https://registry.npmmirror.com/glslify/-/glslify-7.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/glslify/-/glslify-7.1.1.tgz",
 			"integrity": "sha512-bud98CJ6kGZcP9Yxcsi7Iz647wuDz3oN+IZsjCRi5X1PI7t/xPKeL0mOwXJjo+CRZMqvq0CkSJiywCcY7kVYog==",
-			"license": "MIT",
 			"dependencies": {
 				"bl": "^2.2.1",
 				"concat-stream": "^1.5.2",
@@ -5698,9 +5511,8 @@
 		},
 		"node_modules/glslify-bundle": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmmirror.com/glslify-bundle/-/glslify-bundle-5.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/glslify-bundle/-/glslify-bundle-5.1.1.tgz",
 			"integrity": "sha512-plaAOQPv62M1r3OsWf2UbjN0hUYAB7Aph5bfH58VxJZJhloRNbxOL9tl/7H71K7OLJoSJ2ZqWOKk3ttQ6wy24A==",
-			"license": "MIT",
 			"dependencies": {
 				"glsl-inject-defines": "^1.0.1",
 				"glsl-token-defines": "^1.0.0",
@@ -5716,9 +5528,8 @@
 		},
 		"node_modules/glslify-deps": {
 			"version": "1.3.2",
-			"resolved": "https://registry.npmmirror.com/glslify-deps/-/glslify-deps-1.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/glslify-deps/-/glslify-deps-1.3.2.tgz",
 			"integrity": "sha512-7S7IkHWygJRjcawveXQjRXLO2FTjijPDYC7QfZyAQanY+yGLCFHYnPtsGT9bdyHiwPTw/5a1m1M9hamT2aBpag==",
-			"license": "ISC",
 			"dependencies": {
 				"@choojs/findup": "^0.2.0",
 				"events": "^3.2.0",
@@ -5731,12 +5542,11 @@
 			}
 		},
 		"node_modules/gopd": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
-			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+			"dependencies": {
+				"get-intrinsic": "^1.1.3"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -5744,56 +5554,48 @@
 		},
 		"node_modules/graceful-fs": {
 			"version": "4.2.11",
-			"resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
 		},
 		"node_modules/graphemer": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/graphemer/-/graphemer-1.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
 			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/grid-index": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/grid-index/-/grid-index-1.1.0.tgz",
-			"integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
+			"integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="
 		},
 		"node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"license": "MIT",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
 			"engines": {
-				"node": ">=8"
+				"node": ">=4"
 			}
 		},
 		"node_modules/has-hover": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/has-hover/-/has-hover-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/has-hover/-/has-hover-1.0.1.tgz",
 			"integrity": "sha512-0G6w7LnlcpyDzpeGUTuT0CEw05+QlMuGVk1IHNAlHrGJITGodjZu3x8BNDUMfKJSZXNB2ZAclqc1bvrd+uUpfg==",
-			"license": "MIT",
 			"dependencies": {
 				"is-browser": "^2.0.1"
 			}
 		},
 		"node_modules/has-passive-events": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/has-passive-events/-/has-passive-events-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/has-passive-events/-/has-passive-events-1.0.0.tgz",
 			"integrity": "sha512-2vSj6IeIsgvsRMyeQ0JaCX5Q3lX4zMn5HpoVc7MEhQ6pv8Iq9rsXjsp+E5ZwaT7T0xhMT0KmU8gtt1EFVdbJiw==",
-			"license": "MIT",
 			"dependencies": {
 				"is-browser": "^2.0.1"
 			}
 		},
 		"node_modules/has-property-descriptors": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
 			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-			"license": "MIT",
 			"dependencies": {
 				"es-define-property": "^1.0.0"
 			},
@@ -5802,13 +5604,9 @@
 			}
 		},
 		"node_modules/has-proto": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.1.0.tgz",
-			"integrity": "sha512-QLdzI9IIO1Jg7f9GT1gXpPpXArAn6cS31R1eEZqz08Gc+uQ8/XiqHWt17Fiw+2p6oTTIq5GXEpQkAlA88YRl/Q==",
-			"license": "MIT",
-			"dependencies": {
-				"call-bind": "^1.0.7"
-			},
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -5817,10 +5615,9 @@
 			}
 		},
 		"node_modules/has-symbols": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
-			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-			"license": "MIT",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -5829,13 +5626,12 @@
 			}
 		},
 		"node_modules/has-tostringtag": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-			"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"has-symbols": "^1.0.3"
+				"has-symbols": "^1.0.2"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -5845,35 +5641,47 @@
 			}
 		},
 		"node_modules/hash-base": {
-			"version": "3.0.5",
-			"resolved": "https://registry.npmmirror.com/hash-base/-/hash-base-3.0.5.tgz",
-			"integrity": "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.4",
-				"safe-buffer": "^5.2.1"
+				"readable-stream": "^3.6.0",
+				"safe-buffer": "^5.2.0"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=4"
+			}
+		},
+		"node_modules/hash-base/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
 		"node_modules/hash.js": {
 			"version": "1.1.7",
-			"resolved": "https://registry.npmmirror.com/hash.js/-/hash.js-1.1.7.tgz",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
 			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"minimalistic-assert": "^1.0.1"
 			}
 		},
 		"node_modules/hasown": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
-			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-			"license": "MIT",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+			"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
 			"dependencies": {
 				"function-bind": "^1.1.2"
 			},
@@ -5883,39 +5691,35 @@
 		},
 		"node_modules/he": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true,
-			"license": "MIT",
 			"bin": {
 				"he": "bin/he"
 			}
 		},
 		"node_modules/hexoid": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/hexoid/-/hexoid-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
 			"integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/history": {
 			"version": "5.3.0",
-			"resolved": "https://registry.npmmirror.com/history/-/history-5.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
 			"integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
-			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.7.6"
 			}
 		},
 		"node_modules/hmac-drbg": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
 			"integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"hash.js": "^1.0.3",
 				"minimalistic-assert": "^1.0.0",
@@ -5924,24 +5728,21 @@
 		},
 		"node_modules/hoist-non-react-statics": {
 			"version": "3.3.2",
-			"resolved": "https://registry.npmmirror.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
 			"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"react-is": "^16.7.0"
 			}
 		},
 		"node_modules/hsluv": {
 			"version": "0.0.3",
-			"resolved": "https://registry.npmmirror.com/hsluv/-/hsluv-0.0.3.tgz",
-			"integrity": "sha512-08iL2VyCRbkQKBySkSh6m8zMUa3sADAxGVWs3Z1aPcUkTJeK0ETG4Fc27tEmQBGUAXZjIsXOZqBvacuVNSC/fQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/hsluv/-/hsluv-0.0.3.tgz",
+			"integrity": "sha512-08iL2VyCRbkQKBySkSh6m8zMUa3sADAxGVWs3Z1aPcUkTJeK0ETG4Fc27tEmQBGUAXZjIsXOZqBvacuVNSC/fQ=="
 		},
 		"node_modules/http-errors": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
 			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-			"license": "MIT",
 			"dependencies": {
 				"depd": "2.0.0",
 				"inherits": "2.0.4",
@@ -5955,16 +5756,14 @@
 		},
 		"node_modules/https-browserify": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/https-browserify/-/https-browserify-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
 			"integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/iconv-lite": {
 			"version": "0.4.24",
-			"resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"license": "MIT",
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			},
@@ -5974,10 +5773,9 @@
 		},
 		"node_modules/icss-utils": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
 			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
 			"dev": true,
-			"license": "ISC",
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
 			},
@@ -5987,7 +5785,7 @@
 		},
 		"node_modules/ieee754": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
 			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
 			"funding": [
 				{
@@ -6002,48 +5800,42 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			],
-			"license": "BSD-3-Clause"
+			]
 		},
 		"node_modules/ignore": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmmirror.com/ignore/-/ignore-5.3.2.tgz",
-			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+			"version": "5.2.4",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 4"
 			}
 		},
 		"node_modules/ignore-by-default": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
 			"integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
-			"dev": true,
-			"license": "ISC"
+			"dev": true
 		},
 		"node_modules/immer": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmmirror.com/immer/-/immer-10.1.1.tgz",
-			"integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
-			"license": "MIT",
+			"version": "10.0.3",
+			"resolved": "https://registry.npmjs.org/immer/-/immer-10.0.3.tgz",
+			"integrity": "sha512-pwupu3eWfouuaowscykeckFmVTpqbzW+rXFCX8rQLkZzM9ftBmU/++Ra+o+L27mz03zJTlyV4UUr+fdKNffo4A==",
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/immer"
 			}
 		},
 		"node_modules/immutable": {
-			"version": "4.3.7",
-			"resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
-			"integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
+			"integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
+			"dev": true
 		},
 		"node_modules/import-fresh": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
 			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"license": "MIT",
 			"dependencies": {
 				"parent-module": "^1.0.0",
 				"resolve-from": "^4.0.0"
@@ -6056,11 +5848,10 @@
 			}
 		},
 		"node_modules/import-local": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmmirror.com/import-local/-/import-local-3.2.0.tgz",
-			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"pkg-dir": "^4.2.0",
 				"resolve-cwd": "^3.0.0"
@@ -6077,21 +5868,18 @@
 		},
 		"node_modules/imurmurhash": {
 			"version": "0.1.4",
-			"resolved": "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
 			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.8.19"
 			}
 		},
 		"node_modules/inflight": {
 			"version": "1.0.6",
-			"resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
 			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"once": "^1.3.0",
 				"wrappy": "1"
@@ -6099,75 +5887,103 @@
 		},
 		"node_modules/inherits": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
 		"node_modules/ini": {
 			"version": "4.1.3",
-			"resolved": "https://registry.npmmirror.com/ini/-/ini-4.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
 			"integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
-			"license": "ISC",
 			"engines": {
 				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
 		"node_modules/internmap": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmmirror.com/internmap/-/internmap-2.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
 			"integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
-		"node_modules/interpret": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmmirror.com/interpret/-/interpret-3.1.1.tgz",
-			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.13.0"
+		"node_modules/interpret": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/intl-messageformat": {
+			"version": "10.5.14",
+			"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.5.14.tgz",
+			"integrity": "sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"@formatjs/fast-memoize": "2.2.0",
+				"@formatjs/icu-messageformat-parser": "2.7.8",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/intl-messageformat/node_modules/@formatjs/ecma402-abstract": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
+			"dependencies": {
+				"@formatjs/intl-localematcher": "0.5.4",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/intl-messageformat/node_modules/@formatjs/icu-messageformat-parser": {
+			"version": "2.7.8",
+			"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
+			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"@formatjs/icu-skeleton-parser": "1.8.2",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/intl-messageformat/node_modules/@formatjs/icu-skeleton-parser": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
+			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"tslib": "^2.4.0"
 			}
 		},
-		"node_modules/intl-messageformat": {
-			"version": "10.5.14",
-			"resolved": "https://registry.npmmirror.com/intl-messageformat/-/intl-messageformat-10.5.14.tgz",
-			"integrity": "sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==",
-			"license": "BSD-3-Clause",
+		"node_modules/intl-messageformat/node_modules/@formatjs/intl-localematcher": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
 			"dependencies": {
-				"@formatjs/ecma402-abstract": "2.0.0",
-				"@formatjs/fast-memoize": "2.2.0",
-				"@formatjs/icu-messageformat-parser": "2.7.8",
 				"tslib": "^2.4.0"
 			}
 		},
 		"node_modules/ip-regex": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/ip-regex/-/ip-regex-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
 			"integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/ipaddr.js": {
 			"version": "1.9.1",
-			"resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
 			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.10"
 			}
 		},
 		"node_modules/is-arguments": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
 			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -6181,16 +5997,14 @@
 		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
 		},
 		"node_modules/is-binary-path": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
 			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"binary-extensions": "^2.0.0"
 			},
@@ -6200,22 +6014,34 @@
 		},
 		"node_modules/is-browser": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/is-browser/-/is-browser-2.1.0.tgz",
-			"integrity": "sha512-F5rTJxDQ2sW81fcfOR1GnCXT6sVJC104fCyfj+mjpwNEwaPYSn5fte5jiHmBg3DHsIoL/l8Kvw5VN5SsTRcRFQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/is-browser/-/is-browser-2.1.0.tgz",
+			"integrity": "sha512-F5rTJxDQ2sW81fcfOR1GnCXT6sVJC104fCyfj+mjpwNEwaPYSn5fte5jiHmBg3DHsIoL/l8Kvw5VN5SsTRcRFQ=="
 		},
 		"node_modules/is-buffer": {
 			"version": "1.1.6",
-			"resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+		},
+		"node_modules/is-builtin-module": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+			"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+			"dev": true,
+			"dependencies": {
+				"builtin-modules": "^3.3.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/is-callable": {
 			"version": "1.2.7",
-			"resolved": "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.7.tgz",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
 			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -6224,15 +6050,11 @@
 			}
 		},
 		"node_modules/is-core-module": {
-			"version": "2.15.1",
-			"resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.15.1.tgz",
-			"integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
-			"license": "MIT",
+			"version": "2.13.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+			"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
 			"dependencies": {
-				"hasown": "^2.0.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
+				"hasown": "^2.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -6240,19 +6062,17 @@
 		},
 		"node_modules/is-extglob": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
 			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-finite": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/is-finite/-/is-finite-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
 			"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			},
@@ -6262,29 +6082,26 @@
 		},
 		"node_modules/is-firefox": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/is-firefox/-/is-firefox-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/is-firefox/-/is-firefox-1.0.3.tgz",
 			"integrity": "sha512-6Q9ITjvWIm0Xdqv+5U12wgOKEM2KoBw4Y926m0OFkvlCxnbG94HKAsVz8w3fWcfAS5YA2fJORXX1dLrkprCCxA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/is-generator-function": {
 			"version": "1.0.10",
-			"resolved": "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.0.10.tgz",
+			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
 			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"has-tostringtag": "^1.0.0"
 			},
@@ -6297,10 +6114,9 @@
 		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
 			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"is-extglob": "^2.1.1"
 			},
@@ -6310,19 +6126,17 @@
 		},
 		"node_modules/is-iexplorer": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/is-iexplorer/-/is-iexplorer-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-iexplorer/-/is-iexplorer-1.0.0.tgz",
 			"integrity": "sha512-YeLzceuwg3K6O0MLM3UyUUjKAlyULetwryFp1mHy1I5PfArK0AEqlfa+MR4gkJjcbuJXoDJCvXbyqZVf5CR2Sg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-ip": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/is-ip/-/is-ip-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz",
 			"integrity": "sha512-9MTn0dteHETtyUx8pxqMwg5hMBi3pvlyglJ+b79KOCca0po23337LbVV2Hl4xmMvfw++ljnO0/+5G6G+0Szh6g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"ip-regex": "^2.0.0"
 			},
@@ -6332,16 +6146,14 @@
 		},
 		"node_modules/is-mobile": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/is-mobile/-/is-mobile-4.0.0.tgz",
-			"integrity": "sha512-mlcHZA84t1qLSuWkt2v0I2l61PYdyQDt4aG1mLIXF5FDMm4+haBCxCPYSr/uwqQNRk1MiTizn0ypEuRAOLRAew==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-4.0.0.tgz",
+			"integrity": "sha512-mlcHZA84t1qLSuWkt2v0I2l61PYdyQDt4aG1mLIXF5FDMm4+haBCxCPYSr/uwqQNRk1MiTizn0ypEuRAOLRAew=="
 		},
 		"node_modules/is-nan": {
 			"version": "1.3.2",
-			"resolved": "https://registry.npmmirror.com/is-nan/-/is-nan-1.3.2.tgz",
+			"resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
 			"integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3"
@@ -6355,48 +6167,43 @@
 		},
 		"node_modules/is-number": {
 			"version": "7.0.0",
-			"resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
 			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.12.0"
 			}
 		},
 		"node_modules/is-obj": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/is-obj/-/is-obj-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
 			"integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-path-inside": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmmirror.com/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
 			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/is-plain-obj": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
 			"integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/is-plain-object": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"isobject": "^3.0.1"
 			},
@@ -6406,24 +6213,21 @@
 		},
 		"node_modules/is-string-blank": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/is-string-blank/-/is-string-blank-1.0.1.tgz",
-			"integrity": "sha512-9H+ZBCVs3L9OYqv8nuUAzpcT9OTgMD1yAWrG7ihlnibdkbtB850heAmYWxHuXc4CHy4lKeK69tN+ny1K7gBIrw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/is-string-blank/-/is-string-blank-1.0.1.tgz",
+			"integrity": "sha512-9H+ZBCVs3L9OYqv8nuUAzpcT9OTgMD1yAWrG7ihlnibdkbtB850heAmYWxHuXc4CHy4lKeK69tN+ny1K7gBIrw=="
 		},
 		"node_modules/is-svg-path": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/is-svg-path/-/is-svg-path-1.0.2.tgz",
-			"integrity": "sha512-Lj4vePmqpPR1ZnRctHv8ltSh1OrSxHkhUkd7wi+VQdcdP15/KvQFyk7LhNuM7ZW0EVbJz8kZLVmL9quLrfq4Kg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/is-svg-path/-/is-svg-path-1.0.2.tgz",
+			"integrity": "sha512-Lj4vePmqpPR1ZnRctHv8ltSh1OrSxHkhUkd7wi+VQdcdP15/KvQFyk7LhNuM7ZW0EVbJz8kZLVmL9quLrfq4Kg=="
 		},
 		"node_modules/is-typed-array": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.13.tgz",
-			"integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+			"integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"which-typed-array": "^1.1.14"
+				"which-typed-array": "^1.1.11"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -6434,10 +6238,9 @@
 		},
 		"node_modules/is-unicode-supported": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
 			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -6447,33 +6250,29 @@
 		},
 		"node_modules/isarray": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
-			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
 		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
 			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-			"dev": true,
-			"license": "ISC"
+			"dev": true
 		},
 		"node_modules/isobject": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
 			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/jest-worker": {
 			"version": "27.5.1",
-			"resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
 			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/node": "*",
 				"merge-stream": "^2.0.0",
@@ -6483,12 +6282,20 @@
 				"node": ">= 10.13.0"
 			}
 		},
+		"node_modules/jest-worker/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/jest-worker/node_modules/supports-color": {
 			"version": "8.1.1",
-			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -6501,16 +6308,14 @@
 		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
 		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -6520,67 +6325,48 @@
 		},
 		"node_modules/jsdoc-type-pratt-parser": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
 			"integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=12.0.0"
 			}
 		},
-		"node_modules/jsesc": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-3.0.2.tgz",
-			"integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-			"license": "MIT",
-			"bin": {
-				"jsesc": "bin/jsesc"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/json-buffer/-/json-buffer-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
 			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
 		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
 			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/jsonschema": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmmirror.com/jsonschema/-/jsonschema-1.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
 			"integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
-			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/jsonwebtoken": {
 			"version": "9.0.2",
-			"resolved": "https://registry.npmmirror.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
 			"integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
-			"license": "MIT",
 			"dependencies": {
 				"jws": "^3.2.2",
 				"lodash.includes": "^4.3.0",
@@ -6600,16 +6386,14 @@
 		},
 		"node_modules/just-extend": {
 			"version": "6.2.0",
-			"resolved": "https://registry.npmmirror.com/just-extend/-/just-extend-6.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz",
 			"integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/jwa": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmmirror.com/jwa/-/jwa-1.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
 			"integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-			"license": "MIT",
 			"dependencies": {
 				"buffer-equal-constant-time": "1.0.1",
 				"ecdsa-sig-formatter": "1.0.11",
@@ -6618,9 +6402,8 @@
 		},
 		"node_modules/jws": {
 			"version": "3.2.2",
-			"resolved": "https://registry.npmmirror.com/jws/-/jws-3.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
 			"integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-			"license": "MIT",
 			"dependencies": {
 				"jwa": "^1.4.1",
 				"safe-buffer": "^5.0.1"
@@ -6628,36 +6411,32 @@
 		},
 		"node_modules/kdbush": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/kdbush/-/kdbush-3.0.0.tgz",
-			"integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz",
+			"integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="
 		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
-			"resolved": "https://registry.npmmirror.com/keyv/-/keyv-4.5.4.tgz",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
 			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"json-buffer": "3.0.1"
 			}
 		},
 		"node_modules/kind-of": {
 			"version": "6.0.3",
-			"resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
 			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/levn": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
 			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"prelude-ls": "^1.2.1",
 				"type-check": "~0.4.0"
@@ -6668,26 +6447,23 @@
 		},
 		"node_modules/lines-and-columns": {
 			"version": "1.2.4",
-			"resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
 		},
 		"node_modules/loader-runner": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
 			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6.11.5"
 			}
 		},
 		"node_modules/locate-path": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-6.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
 			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"p-locate": "^5.0.0"
 			},
@@ -6700,16 +6476,14 @@
 		},
 		"node_modules/lodash": {
 			"version": "4.17.21",
-			"resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
 		"node_modules/lodash-webpack-plugin": {
 			"version": "0.11.6",
-			"resolved": "https://registry.npmmirror.com/lodash-webpack-plugin/-/lodash-webpack-plugin-0.11.6.tgz",
+			"resolved": "https://registry.npmjs.org/lodash-webpack-plugin/-/lodash-webpack-plugin-0.11.6.tgz",
 			"integrity": "sha512-nsHN/+IxZK/C425vGC8pAxkKJ8KQH2+NJnhDul14zYNWr6HJcA95w+oRR7Cp0oZpOdMplDZXmjVROp8prPk7ig==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"lodash": "^4.17.20"
 			},
@@ -6719,71 +6493,60 @@
 		},
 		"node_modules/lodash.debounce": {
 			"version": "4.0.8",
-			"resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
 		},
 		"node_modules/lodash.get": {
 			"version": "4.4.2",
-			"resolved": "https://registry.npmmirror.com/lodash.get/-/lodash.get-4.4.2.tgz",
+			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
 			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/lodash.includes": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmmirror.com/lodash.includes/-/lodash.includes-4.3.0.tgz",
-			"integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+			"integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
 		},
 		"node_modules/lodash.isboolean": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmmirror.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-			"integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+			"integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
 		},
 		"node_modules/lodash.isinteger": {
 			"version": "4.0.4",
-			"resolved": "https://registry.npmmirror.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-			"integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+			"integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
 		},
 		"node_modules/lodash.isnumber": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmmirror.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-			"integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+			"integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
 		},
 		"node_modules/lodash.isplainobject": {
 			"version": "4.0.6",
-			"resolved": "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-			"integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+			"integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
 		},
 		"node_modules/lodash.isstring": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmmirror.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-			"integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+			"integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
 		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
-			"resolved": "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
 		},
 		"node_modules/lodash.once": {
 			"version": "4.1.1",
-			"resolved": "https://registry.npmmirror.com/lodash.once/-/lodash.once-4.1.1.tgz",
-			"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+			"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
 		},
 		"node_modules/log-symbols": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmmirror.com/log-symbols/-/log-symbols-4.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
 			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"chalk": "^4.1.0",
 				"is-unicode-supported": "^0.1.0"
@@ -6795,11 +6558,80 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/log-symbols/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/log-symbols/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/log-symbols/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/loose-envify": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
 			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-			"license": "MIT",
 			"dependencies": {
 				"js-tokens": "^3.0.0 || ^4.0.0"
 			},
@@ -6809,28 +6641,25 @@
 		},
 		"node_modules/loupe": {
 			"version": "2.3.7",
-			"resolved": "https://registry.npmmirror.com/loupe/-/loupe-2.3.7.tgz",
+			"resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
 			"integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"get-func-name": "^2.0.1"
 			}
 		},
 		"node_modules/make-event-props": {
 			"version": "1.6.2",
-			"resolved": "https://registry.npmmirror.com/make-event-props/-/make-event-props-1.6.2.tgz",
+			"resolved": "https://registry.npmjs.org/make-event-props/-/make-event-props-1.6.2.tgz",
 			"integrity": "sha512-iDwf7mA03WPiR8QxvcVHmVWEPfMY1RZXerDVNCRYW7dUr2ppH3J58Rwb39/WG39yTZdRSxr3x+2v22tvI0VEvA==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/make-event-props?sponsor=1"
 			}
 		},
 		"node_modules/map-age-cleaner": {
 			"version": "0.1.3",
-			"resolved": "https://registry.npmmirror.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
 			"integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-			"license": "MIT",
 			"dependencies": {
 				"p-defer": "^1.0.0"
 			},
@@ -6840,27 +6669,24 @@
 		},
 		"node_modules/map-limit": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmmirror.com/map-limit/-/map-limit-0.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/map-limit/-/map-limit-0.0.1.tgz",
 			"integrity": "sha512-pJpcfLPnIF/Sk3taPW21G/RQsEEirGaFpCW3oXRwH9dnFHPHNGjNyvh++rdmC2fNqEaTw2MhYJraoJWAHx8kEg==",
-			"license": "MIT",
 			"dependencies": {
 				"once": "~1.3.0"
 			}
 		},
 		"node_modules/map-limit/node_modules/once": {
 			"version": "1.3.3",
-			"resolved": "https://registry.npmmirror.com/once/-/once-1.3.3.tgz",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
 			"integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==",
-			"license": "ISC",
 			"dependencies": {
 				"wrappy": "1"
 			}
 		},
 		"node_modules/mapbox-gl": {
 			"version": "1.13.3",
-			"resolved": "https://registry.npmmirror.com/mapbox-gl/-/mapbox-gl-1.13.3.tgz",
+			"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.3.tgz",
 			"integrity": "sha512-p8lJFEiqmEQlyv+DQxFAOG/XPWN0Wp7j/Psq93Zywz7qt9CcUKFYDBOoOEKzqe6gudHVJY8/Bhqw6VDpX2lSBg==",
-			"license": "SEE LICENSE IN LICENSE.txt",
 			"peer": true,
 			"dependencies": {
 				"@mapbox/geojson-rewind": "^0.5.2",
@@ -6892,18 +6718,16 @@
 		},
 		"node_modules/math-log2": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/math-log2/-/math-log2-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/math-log2/-/math-log2-1.0.1.tgz",
 			"integrity": "sha512-9W0yGtkaMAkf74XGYVy4Dqw3YUMnTNB2eeiw9aQbUl4A3KmuCEHTt2DgAB07ENzOYAjsYSAYufkAq0Zd+jU7zA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/md5": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
 			"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"charenc": "0.0.2",
 				"crypt": "0.0.2",
@@ -6912,10 +6736,9 @@
 		},
 		"node_modules/md5.js": {
 			"version": "1.3.5",
-			"resolved": "https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz",
+			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
 			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"hash-base": "^3.0.0",
 				"inherits": "^2.0.1",
@@ -6924,18 +6747,16 @@
 		},
 		"node_modules/media-typer": {
 			"version": "0.3.0",
-			"resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
 			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/mem": {
 			"version": "8.1.1",
-			"resolved": "https://registry.npmmirror.com/mem/-/mem-8.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz",
 			"integrity": "sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==",
-			"license": "MIT",
 			"dependencies": {
 				"map-age-cleaner": "^0.1.3",
 				"mimic-fn": "^3.1.0"
@@ -6949,53 +6770,44 @@
 		},
 		"node_modules/memoize-one": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz",
-			"integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+			"integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
 		},
 		"node_modules/merge-descriptors": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
 		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
 			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/merge2": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
 			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 8"
 			}
 		},
 		"node_modules/methods": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
 			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/micromatch": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
-			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"braces": "^3.0.3",
+				"braces": "^3.0.2",
 				"picomatch": "^2.3.1"
 			},
 			"engines": {
@@ -7004,10 +6816,9 @@
 		},
 		"node_modules/miller-rabin": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmmirror.com/miller-rabin/-/miller-rabin-4.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
 			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.0.0",
 				"brorand": "^1.0.1"
@@ -7017,17 +6828,15 @@
 			}
 		},
 		"node_modules/miller-rabin/node_modules/bn.js": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
-			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true
 		},
 		"node_modules/mime": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
 			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-			"license": "MIT",
 			"bin": {
 				"mime": "cli.js"
 			},
@@ -7037,18 +6846,16 @@
 		},
 		"node_modules/mime-db": {
 			"version": "1.52.0",
-			"resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
 			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/mime-types": {
 			"version": "2.1.35",
-			"resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
 			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"license": "MIT",
 			"dependencies": {
 				"mime-db": "1.52.0"
 			},
@@ -7058,66 +6865,56 @@
 		},
 		"node_modules/mimic-fn": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
 			"integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/minimalistic-assert": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-			"dev": true,
-			"license": "ISC"
+			"dev": true
 		},
 		"node_modules/minimalistic-crypto-utils": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
 			"integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/minimatch": {
-			"version": "9.0.3",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.3.tgz",
-			"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
-				"brace-expansion": "^2.0.1"
+				"brace-expansion": "^1.1.7"
 			},
 			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+				"node": "*"
 			}
 		},
 		"node_modules/minimist": {
 			"version": "1.2.8",
-			"resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
 			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/mixme": {
-			"version": "0.5.10",
-			"resolved": "https://registry.npmmirror.com/mixme/-/mixme-0.5.10.tgz",
-			"integrity": "sha512-5H76ANWinB1H3twpJ6JY8uvAtpmFvHNArpilJAjXRKXSDDLPIMoZArw5SH0q9z+lLs8IrMw7Q2VWpWimFKFT1Q==",
-			"license": "MIT",
+			"version": "0.5.9",
+			"resolved": "https://registry.npmjs.org/mixme/-/mixme-0.5.9.tgz",
+			"integrity": "sha512-VC5fg6ySUscaWUpI4gxCBTQMH2RdUpNrk+MsbpCYtIvf9SBJdiUey4qE7BXviJsJR4nDQxCZ+3yaYNW3guz/Pw==",
 			"engines": {
 				"node": ">= 8.0.0"
 			}
 		},
 		"node_modules/mkdirp": {
 			"version": "0.5.6",
-			"resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
 			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-			"license": "MIT",
 			"dependencies": {
 				"minimist": "^1.2.6"
 			},
@@ -7127,10 +6924,9 @@
 		},
 		"node_modules/mocha": {
 			"version": "10.4.0",
-			"resolved": "https://registry.npmmirror.com/mocha/-/mocha-10.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz",
 			"integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"ansi-colors": "4.1.1",
 				"browser-stdout": "1.3.1",
@@ -7161,37 +6957,51 @@
 				"node": ">= 14.0.0"
 			}
 		},
-		"node_modules/mocha/node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+		"node_modules/mocha/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/mocha/node_modules/glob": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+			"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"ms": "2.1.2"
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^5.0.1",
+				"once": "^1.3.0"
 			},
 			"engines": {
-				"node": ">=6.0"
+				"node": ">=12"
 			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/mocha/node_modules/debug/node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+		"node_modules/mocha/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"license": "MIT"
+			"engines": {
+				"node": ">=8"
+			}
 		},
 		"node_modules/mocha/node_modules/minimatch": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
 			"integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
 			},
@@ -7199,12 +7009,26 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/mocha/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"dev": true
+		},
 		"node_modules/mocha/node_modules/supports-color": {
 			"version": "8.1.1",
-			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -7217,18 +7041,16 @@
 		},
 		"node_modules/moment": {
 			"version": "2.30.1",
-			"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
 			"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/moment-timezone": {
-			"version": "0.5.46",
-			"resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.46.tgz",
-			"integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
-			"license": "MIT",
+			"version": "0.5.45",
+			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
+			"integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
 			"dependencies": {
 				"moment": "^2.29.4"
 			},
@@ -7238,9 +7060,8 @@
 		},
 		"node_modules/morgan": {
 			"version": "1.10.0",
-			"resolved": "https://registry.npmmirror.com/morgan/-/morgan-1.10.0.tgz",
+			"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
 			"integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
-			"license": "MIT",
 			"dependencies": {
 				"basic-auth": "~2.0.1",
 				"debug": "2.6.9",
@@ -7254,24 +7075,21 @@
 		},
 		"node_modules/morgan/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/morgan/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/morgan/node_modules/on-finished": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
 			"integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-			"license": "MIT",
 			"dependencies": {
 				"ee-first": "1.1.1"
 			},
@@ -7281,30 +7099,26 @@
 		},
 		"node_modules/mouse-change": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/mouse-change/-/mouse-change-1.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/mouse-change/-/mouse-change-1.4.0.tgz",
 			"integrity": "sha512-vpN0s+zLL2ykyyUDh+fayu9Xkor5v/zRD9jhSqjRS1cJTGS0+oakVZzNm5n19JvvEj0you+MXlYTpNxUDQUjkQ==",
-			"license": "MIT",
 			"dependencies": {
 				"mouse-event": "^1.0.0"
 			}
 		},
 		"node_modules/mouse-event": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmmirror.com/mouse-event/-/mouse-event-1.0.5.tgz",
-			"integrity": "sha512-ItUxtL2IkeSKSp9cyaX2JLUuKk2uMoxBg4bbOWVd29+CskYJR9BGsUqtXenNzKbnDshvupjUewDIYVrOB6NmGw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/mouse-event/-/mouse-event-1.0.5.tgz",
+			"integrity": "sha512-ItUxtL2IkeSKSp9cyaX2JLUuKk2uMoxBg4bbOWVd29+CskYJR9BGsUqtXenNzKbnDshvupjUewDIYVrOB6NmGw=="
 		},
 		"node_modules/mouse-event-offset": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmmirror.com/mouse-event-offset/-/mouse-event-offset-3.0.2.tgz",
-			"integrity": "sha512-s9sqOs5B1Ykox3Xo8b3Ss2IQju4UwlW6LSR+Q5FXWpprJ5fzMLefIIItr3PH8RwzfGy6gxs/4GAmiNuZScE25w==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/mouse-event-offset/-/mouse-event-offset-3.0.2.tgz",
+			"integrity": "sha512-s9sqOs5B1Ykox3Xo8b3Ss2IQju4UwlW6LSR+Q5FXWpprJ5fzMLefIIItr3PH8RwzfGy6gxs/4GAmiNuZScE25w=="
 		},
 		"node_modules/mouse-wheel": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/mouse-wheel/-/mouse-wheel-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/mouse-wheel/-/mouse-wheel-1.2.0.tgz",
 			"integrity": "sha512-+OfYBiUOCTWcTECES49neZwL5AoGkXE+lFjIvzwNCnYRlso+EnfvovcBxGoyQ0yQt806eSPjS675K0EwWknXmw==",
-			"license": "MIT",
 			"dependencies": {
 				"right-now": "^1.0.0",
 				"signum": "^1.0.0",
@@ -7312,16 +7126,14 @@
 			}
 		},
 		"node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"license": "MIT"
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
 		},
 		"node_modules/multer": {
 			"version": "1.4.5-lts.1",
-			"resolved": "https://registry.npmmirror.com/multer/-/multer-1.4.5-lts.1.tgz",
+			"resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz",
 			"integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==",
-			"license": "MIT",
 			"dependencies": {
 				"append-field": "^1.0.0",
 				"busboy": "^1.0.0",
@@ -7337,57 +7149,33 @@
 		},
 		"node_modules/mumath": {
 			"version": "3.3.4",
-			"resolved": "https://registry.npmmirror.com/mumath/-/mumath-3.3.4.tgz",
+			"resolved": "https://registry.npmjs.org/mumath/-/mumath-3.3.4.tgz",
 			"integrity": "sha512-VAFIOG6rsxoc7q/IaY3jdjmrsuX9f15KlRLYTHmixASBZkZEKC1IFqE2BC5CdhXmK6WLM1Re33z//AGmeRI6FA==",
 			"deprecated": "Redundant dependency in your project.",
-			"license": "Unlicense",
 			"dependencies": {
 				"almost-equal": "^1.1.0"
 			}
 		},
 		"node_modules/murmurhash-js": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
-			"integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==",
-			"license": "MIT"
-		},
-		"node_modules/nanoid": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.8.tgz",
-			"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
-			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-			}
+			"resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz",
+			"integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw=="
 		},
 		"node_modules/native-promise-only": {
 			"version": "0.8.1",
-			"resolved": "https://registry.npmmirror.com/native-promise-only/-/native-promise-only-0.8.1.tgz",
-			"integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz",
+			"integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg=="
 		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
 			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/needle": {
 			"version": "2.9.1",
-			"resolved": "https://registry.npmmirror.com/needle/-/needle-2.9.1.tgz",
+			"resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
 			"integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
-			"license": "MIT",
 			"dependencies": {
 				"debug": "^3.2.6",
 				"iconv-lite": "^0.4.4",
@@ -7402,96 +7190,73 @@
 		},
 		"node_modules/needle/node_modules/debug": {
 			"version": "3.2.7",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
 			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-			"license": "MIT",
 			"dependencies": {
 				"ms": "^2.1.1"
 			}
 		},
 		"node_modules/negotiator": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
 			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/neo-async": {
 			"version": "2.6.2",
-			"resolved": "https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz",
+			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
 			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/next-tick": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz",
-			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+			"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
 		},
 		"node_modules/ngraph.events": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmmirror.com/ngraph.events/-/ngraph.events-1.2.2.tgz",
-			"integrity": "sha512-JsUbEOzANskax+WSYiAPETemLWYXmixuPAlmZmhIbIj6FH/WDgEGCGnRwUQBK0GjOnVm8Ui+e5IJ+5VZ4e32eQ==",
-			"license": "BSD-3-Clause"
+			"resolved": "https://registry.npmjs.org/ngraph.events/-/ngraph.events-1.2.2.tgz",
+			"integrity": "sha512-JsUbEOzANskax+WSYiAPETemLWYXmixuPAlmZmhIbIj6FH/WDgEGCGnRwUQBK0GjOnVm8Ui+e5IJ+5VZ4e32eQ=="
 		},
 		"node_modules/ngraph.graph": {
 			"version": "20.0.1",
-			"resolved": "https://registry.npmmirror.com/ngraph.graph/-/ngraph.graph-20.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/ngraph.graph/-/ngraph.graph-20.0.1.tgz",
 			"integrity": "sha512-VFsQ+EMkT+7lcJO1QP8Ik3w64WbHJl27Q53EO9hiFU9CRyxJ8HfcXtfWz/U8okuoYKDctbciL6pX3vG5dt1rYA==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"ngraph.events": "^1.2.1"
 			}
 		},
 		"node_modules/ngraph.path": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmmirror.com/ngraph.path/-/ngraph.path-1.5.0.tgz",
-			"integrity": "sha512-2IdmqfBYq2zbGHtpmskdWF6x/nIWZkhfs1taMgg2waBJRn4xNqe7gBiRtD1YS5ZcKhp0trK+Gw94Rli2emMs1Q==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/ngraph.path/-/ngraph.path-1.5.0.tgz",
+			"integrity": "sha512-2IdmqfBYq2zbGHtpmskdWF6x/nIWZkhfs1taMgg2waBJRn4xNqe7gBiRtD1YS5ZcKhp0trK+Gw94Rli2emMs1Q=="
 		},
 		"node_modules/nise": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmmirror.com/nise/-/nise-6.1.1.tgz",
-			"integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/nise/-/nise-6.0.0.tgz",
+			"integrity": "sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
-				"@sinonjs/commons": "^3.0.1",
-				"@sinonjs/fake-timers": "^13.0.1",
-				"@sinonjs/text-encoding": "^0.7.3",
+				"@sinonjs/commons": "^3.0.0",
+				"@sinonjs/fake-timers": "^11.2.2",
+				"@sinonjs/text-encoding": "^0.7.2",
 				"just-extend": "^6.2.0",
-				"path-to-regexp": "^8.1.0"
-			}
-		},
-		"node_modules/nise/node_modules/@sinonjs/fake-timers": {
-			"version": "13.0.5",
-			"resolved": "https://registry.npmmirror.com/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
-			"integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@sinonjs/commons": "^3.0.1"
+				"path-to-regexp": "^6.2.1"
 			}
 		},
 		"node_modules/nise/node_modules/path-to-regexp": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
-			"integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=16"
-			}
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
+			"integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
+			"dev": true
 		},
 		"node_modules/node-polyfill-webpack-plugin": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmmirror.com/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/node-polyfill-webpack-plugin/-/node-polyfill-webpack-plugin-1.1.4.tgz",
 			"integrity": "sha512-Z0XTKj1wRWO8o/Vjobsw5iOJCN+Sua3EZEUc2Ziy9CyVvmHKu6o+t4gUH9GOE0czyPR94LI6ZCV/PpcM8b5yow==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"assert": "^2.0.0",
 				"browserify-zlib": "^0.2.0",
@@ -7527,10 +7292,9 @@
 		},
 		"node_modules/node-polyfill-webpack-plugin/node_modules/readable-stream": {
 			"version": "3.6.2",
-			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -7541,27 +7305,24 @@
 			}
 		},
 		"node_modules/node-releases": {
-			"version": "2.0.18",
-			"resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.18.tgz",
-			"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-			"dev": true,
-			"license": "MIT"
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+			"dev": true
 		},
 		"node_modules/nodemailer": {
-			"version": "6.9.16",
-			"resolved": "https://registry.npmmirror.com/nodemailer/-/nodemailer-6.9.16.tgz",
-			"integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==",
-			"license": "MIT-0",
+			"version": "6.9.13",
+			"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.13.tgz",
+			"integrity": "sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/nodemon": {
-			"version": "3.1.7",
-			"resolved": "https://registry.npmmirror.com/nodemon/-/nodemon-3.1.7.tgz",
-			"integrity": "sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.1.tgz",
+			"integrity": "sha512-k43xGaDtaDIcufn0Fc6fTtsdKSkV/hQzoQFigNH//GaKta28yoKVYXCnV+KXRqfT/YzsFaQU9VdeEG+HEyxr6A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"chokidar": "^3.5.2",
 				"debug": "^4",
@@ -7585,74 +7346,39 @@
 				"url": "https://opencollective.com/nodemon"
 			}
 		},
-		"node_modules/nodemon/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/nodemon/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/nodemon/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/nodemon/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+		"node_modules/nopt": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+			"integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"has-flag": "^3.0.0"
+				"abbrev": "1"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": "*"
 			}
 		},
 		"node_modules/normalize-path": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
 			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/normalize-svg-path": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmmirror.com/normalize-svg-path/-/normalize-svg-path-0.1.0.tgz",
-			"integrity": "sha512-1/kmYej2iedi5+ROxkRESL/pI02pkg0OBnaR4hJkSIX6+ORzepwbuUXfrdZaPjysTsJInj0Rj5NuX027+dMBvA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/normalize-svg-path/-/normalize-svg-path-0.1.0.tgz",
+			"integrity": "sha512-1/kmYej2iedi5+ROxkRESL/pI02pkg0OBnaR4hJkSIX6+ORzepwbuUXfrdZaPjysTsJInj0Rj5NuX027+dMBvA=="
 		},
 		"node_modules/number-is-integer": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/number-is-integer/-/number-is-integer-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/number-is-integer/-/number-is-integer-1.0.1.tgz",
 			"integrity": "sha512-Dq3iuiFBkrbmuQjGFFF3zckXNCQoSD37/SdSbgcBailUx6knDvDwb5CympBgcoWHy36sfS12u74MHYkXyHq6bg==",
-			"license": "MIT",
 			"dependencies": {
 				"is-finite": "^1.0.1"
 			},
@@ -7662,34 +7388,28 @@
 		},
 		"node_modules/object-assign": {
 			"version": "4.1.1",
-			"resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
 			"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/object-inspect": {
-			"version": "1.13.3",
-			"resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.3.tgz",
-			"integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+			"integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/object-is": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.6.tgz",
-			"integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"call-bind": "^1.0.7",
-				"define-properties": "^1.2.1"
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.3"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -7700,23 +7420,21 @@
 		},
 		"node_modules/object-keys": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
 			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			}
 		},
 		"node_modules/object.assign": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.5.tgz",
-			"integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+			"version": "4.1.4",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"call-bind": "^1.0.5",
-				"define-properties": "^1.2.1",
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
 				"has-symbols": "^1.0.3",
 				"object-keys": "^1.1.1"
 			},
@@ -7729,9 +7447,8 @@
 		},
 		"node_modules/on-finished": {
 			"version": "2.4.1",
-			"resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
 			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-			"license": "MIT",
 			"dependencies": {
 				"ee-first": "1.1.1"
 			},
@@ -7741,35 +7458,32 @@
 		},
 		"node_modules/on-headers": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/on-headers/-/on-headers-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
 			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/once": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"license": "ISC",
 			"dependencies": {
 				"wrappy": "1"
 			}
 		},
 		"node_modules/optionator": {
-			"version": "0.9.4",
-			"resolved": "https://registry.npmmirror.com/optionator/-/optionator-0.9.4.tgz",
-			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+			"version": "0.9.3",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+			"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
+				"@aashutoshrathi/word-wrap": "^1.2.3",
 				"deep-is": "^0.1.3",
 				"fast-levenshtein": "^2.0.6",
 				"levn": "^0.4.1",
 				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.5"
+				"type-check": "^0.4.0"
 			},
 			"engines": {
 				"node": ">= 0.8.0"
@@ -7777,26 +7491,23 @@
 		},
 		"node_modules/os-browserify": {
 			"version": "0.3.0",
-			"resolved": "https://registry.npmmirror.com/os-browserify/-/os-browserify-0.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
 			"integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/p-defer": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/p-defer/-/p-defer-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
 			"integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/p-limit": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
 			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"yocto-queue": "^0.1.0"
 			},
@@ -7809,10 +7520,9 @@
 		},
 		"node_modules/p-locate": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
 			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"p-limit": "^3.0.2"
 			},
@@ -7825,26 +7535,23 @@
 		},
 		"node_modules/p-try": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
 			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/pako": {
 			"version": "1.0.11",
-			"resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
+			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
 			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-			"dev": true,
-			"license": "(MIT AND Zlib)"
+			"dev": true
 		},
 		"node_modules/parent-module": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
 			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"license": "MIT",
 			"dependencies": {
 				"callsites": "^3.0.0"
 			},
@@ -7854,33 +7561,26 @@
 		},
 		"node_modules/parenthesis": {
 			"version": "3.1.8",
-			"resolved": "https://registry.npmmirror.com/parenthesis/-/parenthesis-3.1.8.tgz",
-			"integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.8.tgz",
+			"integrity": "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw=="
 		},
 		"node_modules/parse-asn1": {
-			"version": "5.1.7",
-			"resolved": "https://registry.npmmirror.com/parse-asn1/-/parse-asn1-5.1.7.tgz",
-			"integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
-				"asn1.js": "^4.10.1",
-				"browserify-aes": "^1.2.0",
-				"evp_bytestokey": "^1.0.3",
-				"hash-base": "~3.0",
-				"pbkdf2": "^3.1.2",
-				"safe-buffer": "^5.2.1"
-			},
-			"engines": {
-				"node": ">= 0.10"
+				"asn1.js": "^5.2.0",
+				"browserify-aes": "^1.0.0",
+				"evp_bytestokey": "^1.0.0",
+				"pbkdf2": "^3.0.3",
+				"safe-buffer": "^5.1.1"
 			}
 		},
 		"node_modules/parse-json": {
 			"version": "5.2.0",
-			"resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
 			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"license": "MIT",
 			"dependencies": {
 				"@babel/code-frame": "^7.0.0",
 				"error-ex": "^1.3.1",
@@ -7896,107 +7596,94 @@
 		},
 		"node_modules/parse-rect": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/parse-rect/-/parse-rect-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/parse-rect/-/parse-rect-1.2.0.tgz",
 			"integrity": "sha512-4QZ6KYbnE6RTwg9E0HpLchUM9EZt6DnDxajFZZDSV4p/12ZJEvPO702DZpGvRYEPo00yKDys7jASi+/w7aO8LA==",
-			"license": "MIT",
 			"dependencies": {
 				"pick-by-alias": "^1.2.0"
 			}
 		},
 		"node_modules/parse-svg-path": {
 			"version": "0.1.2",
-			"resolved": "https://registry.npmmirror.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz",
-			"integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz",
+			"integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ=="
 		},
 		"node_modules/parse-unit": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/parse-unit/-/parse-unit-1.0.1.tgz",
-			"integrity": "sha512-hrqldJHokR3Qj88EIlV/kAyAi/G5R2+R56TBANxNMy0uPlYcttx0jnMW6Yx5KsKPSbC3KddM/7qQm3+0wEXKxg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/parse-unit/-/parse-unit-1.0.1.tgz",
+			"integrity": "sha512-hrqldJHokR3Qj88EIlV/kAyAi/G5R2+R56TBANxNMy0uPlYcttx0jnMW6Yx5KsKPSbC3KddM/7qQm3+0wEXKxg=="
 		},
 		"node_modules/parseurl": {
 			"version": "1.3.3",
-			"resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",
+			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
 			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/path-browserify": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/path-browserify/-/path-browserify-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
 			"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/path-exists": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/path-key": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
 			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/path-parse": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
 		"node_modules/path-to-regexp": {
-			"version": "0.1.12",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-			"integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
-			"license": "MIT"
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/pathval": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/pathval/-/pathval-1.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
 			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/pbf": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmmirror.com/pbf/-/pbf-3.3.0.tgz",
-			"integrity": "sha512-XDF38WCH3z5OV/OVa8GKUNtLAyneuzbCisx7QUCF8Q6Nutx0WnJrQe5O+kOtBlLfRNUws98Y58Lblp+NJG5T4Q==",
-			"license": "BSD-3-Clause",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
+			"integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
 			"dependencies": {
 				"ieee754": "^1.1.12",
 				"resolve-protobuf-schema": "^2.1.0"
@@ -8007,10 +7694,9 @@
 		},
 		"node_modules/pbkdf2": {
 			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/pbkdf2/-/pbkdf2-3.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
 			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"create-hash": "^1.1.2",
 				"create-hmac": "^1.1.4",
@@ -8024,15 +7710,13 @@
 		},
 		"node_modules/performance-now": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
 		},
 		"node_modules/pg": {
 			"version": "8.12.0",
-			"resolved": "https://registry.npmmirror.com/pg/-/pg-8.12.0.tgz",
+			"resolved": "https://registry.npmjs.org/pg/-/pg-8.12.0.tgz",
 			"integrity": "sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==",
-			"license": "MIT",
 			"dependencies": {
 				"pg-connection-string": "^2.6.4",
 				"pg-pool": "^3.6.2",
@@ -8057,49 +7741,43 @@
 		},
 		"node_modules/pg-cloudflare": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
 			"integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
-			"license": "MIT",
 			"optional": true
 		},
 		"node_modules/pg-connection-string": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmmirror.com/pg-connection-string/-/pg-connection-string-2.7.0.tgz",
-			"integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==",
-			"license": "MIT"
+			"version": "2.6.4",
+			"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz",
+			"integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA=="
 		},
 		"node_modules/pg-int8": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/pg-int8/-/pg-int8-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
 			"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
-			"license": "ISC",
 			"engines": {
 				"node": ">=4.0.0"
 			}
 		},
 		"node_modules/pg-minify": {
 			"version": "1.6.4",
-			"resolved": "https://registry.npmmirror.com/pg-minify/-/pg-minify-1.6.4.tgz",
+			"resolved": "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.4.tgz",
 			"integrity": "sha512-cf6hBt1YqzqPX0OznXKSv4U7e4o7eUU4zp2zQsbJ+4OCNNr7EnnAVWkIz4k0dv6UN4ouS1ZL4WlXxCrZHHl69g==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=14.0.0"
 			}
 		},
 		"node_modules/pg-pool": {
-			"version": "3.7.0",
-			"resolved": "https://registry.npmmirror.com/pg-pool/-/pg-pool-3.7.0.tgz",
-			"integrity": "sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==",
-			"license": "MIT",
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.2.tgz",
+			"integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==",
 			"peerDependencies": {
 				"pg": ">=8.0"
 			}
 		},
 		"node_modules/pg-promise": {
 			"version": "11.8.0",
-			"resolved": "https://registry.npmmirror.com/pg-promise/-/pg-promise-11.8.0.tgz",
+			"resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-11.8.0.tgz",
 			"integrity": "sha512-w9hTFpkM4FByJTJ7KCWLtZSOtQa2BKC+XIV8+3ZvDlfYfBYdz8V4V+BttnqhUPY/d12Itug7Bft4XdILihsY+w==",
-			"license": "MIT",
 			"dependencies": {
 				"assert-options": "0.8.1",
 				"pg": "8.11.5",
@@ -8112,9 +7790,8 @@
 		},
 		"node_modules/pg-promise/node_modules/pg": {
 			"version": "8.11.5",
-			"resolved": "https://registry.npmmirror.com/pg/-/pg-8.11.5.tgz",
+			"resolved": "https://registry.npmjs.org/pg/-/pg-8.11.5.tgz",
 			"integrity": "sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==",
-			"license": "MIT",
 			"dependencies": {
 				"pg-connection-string": "^2.6.4",
 				"pg-pool": "^3.6.2",
@@ -8138,16 +7815,14 @@
 			}
 		},
 		"node_modules/pg-protocol": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmmirror.com/pg-protocol/-/pg-protocol-1.7.0.tgz",
-			"integrity": "sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ==",
-			"license": "MIT"
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz",
+			"integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg=="
 		},
 		"node_modules/pg-types": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmmirror.com/pg-types/-/pg-types-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
 			"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
-			"license": "MIT",
 			"dependencies": {
 				"pg-int8": "1.0.1",
 				"postgres-array": "~2.0.0",
@@ -8161,31 +7836,27 @@
 		},
 		"node_modules/pgpass": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmmirror.com/pgpass/-/pgpass-1.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
 			"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
-			"license": "MIT",
 			"dependencies": {
 				"split2": "^4.1.0"
 			}
 		},
 		"node_modules/pick-by-alias": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/pick-by-alias/-/pick-by-alias-1.2.0.tgz",
-			"integrity": "sha512-ESj2+eBxhGrcA1azgHs7lARG5+5iLakc/6nlfbpjcLl00HuuUOIuORhYXN4D1HfvMSKuVtFQjAlnwi1JHEeDIw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/pick-by-alias/-/pick-by-alias-1.2.0.tgz",
+			"integrity": "sha512-ESj2+eBxhGrcA1azgHs7lARG5+5iLakc/6nlfbpjcLl00HuuUOIuORhYXN4D1HfvMSKuVtFQjAlnwi1JHEeDIw=="
 		},
 		"node_modules/picocolors": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
-			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-			"license": "ISC"
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
 		},
 		"node_modules/picomatch": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
 			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8.6"
 			},
@@ -8195,10 +7866,9 @@
 		},
 		"node_modules/pkg-dir": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
 			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"find-up": "^4.0.0"
 			},
@@ -8208,10 +7878,9 @@
 		},
 		"node_modules/pkg-dir/node_modules/find-up": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
 			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"locate-path": "^5.0.0",
 				"path-exists": "^4.0.0"
@@ -8222,10 +7891,9 @@
 		},
 		"node_modules/pkg-dir/node_modules/locate-path": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
 			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"p-locate": "^4.1.0"
 			},
@@ -8235,10 +7903,9 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-limit": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"p-try": "^2.0.0"
 			},
@@ -8251,10 +7918,9 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-locate": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
 			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"p-limit": "^2.2.0"
 			},
@@ -8264,9 +7930,8 @@
 		},
 		"node_modules/plotly.js": {
 			"version": "2.29.1",
-			"resolved": "https://registry.npmmirror.com/plotly.js/-/plotly.js-2.29.1.tgz",
+			"resolved": "https://registry.npmjs.org/plotly.js/-/plotly.js-2.29.1.tgz",
 			"integrity": "sha512-+XirhgCh42JF/iVu/RtBRbhcs328ipinajy7hd3mnZdnQv2Th6F441DSXer5S+P0nNluNs10vAFTELo4k/icjg==",
-			"license": "MIT",
 			"dependencies": {
 				"@plotly/d3": "3.8.1",
 				"@plotly/d3-sankey": "0.7.2",
@@ -8320,104 +7985,20 @@
 				"world-calendars": "^1.0.3"
 			}
 		},
-		"node_modules/plotly.js/node_modules/d3-array": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-1.2.4.tgz",
-			"integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/plotly.js/node_modules/d3-dispatch": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
-			"integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/plotly.js/node_modules/d3-force": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/d3-force/-/d3-force-1.2.1.tgz",
-			"integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"d3-collection": "1",
-				"d3-dispatch": "1",
-				"d3-quadtree": "1",
-				"d3-timer": "1"
-			}
-		},
-		"node_modules/plotly.js/node_modules/d3-format": {
-			"version": "1.4.5",
-			"resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-1.4.5.tgz",
-			"integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/plotly.js/node_modules/d3-geo": {
-			"version": "1.12.1",
-			"resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-1.12.1.tgz",
-			"integrity": "sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"d3-array": "1"
-			}
-		},
-		"node_modules/plotly.js/node_modules/d3-hierarchy": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmmirror.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
-			"integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/plotly.js/node_modules/d3-quadtree": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmmirror.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
-			"integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/plotly.js/node_modules/d3-time": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-1.1.0.tgz",
-			"integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/plotly.js/node_modules/d3-time-format": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-2.3.0.tgz",
-			"integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==",
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"d3-time": "1"
-			}
-		},
-		"node_modules/plotly.js/node_modules/d3-timer": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-1.0.10.tgz",
-			"integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==",
-			"license": "BSD-3-Clause"
-		},
 		"node_modules/point-in-polygon": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/point-in-polygon/-/point-in-polygon-1.1.0.tgz",
-			"integrity": "sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/point-in-polygon/-/point-in-polygon-1.1.0.tgz",
+			"integrity": "sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw=="
 		},
 		"node_modules/polybooljs": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmmirror.com/polybooljs/-/polybooljs-1.2.2.tgz",
-			"integrity": "sha512-ziHW/02J0XuNuUtmidBc6GXE8YohYydp3DWPWXYsd7O721TjcmN+k6ezjdwkDqep+gnWnFY+yqZHvzElra2oCg==",
-			"license": "MIT"
-		},
-		"node_modules/possible-typed-array-names": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-			"integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			}
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/polybooljs/-/polybooljs-1.2.0.tgz",
+			"integrity": "sha512-mKjR5nolISvF+q2BtC1fi/llpxBPTQ3wLWN8+ldzdw2Hocpc8C72ZqnamCM4Z6z+68GVVjkeM01WJegQmZ8MEQ=="
 		},
 		"node_modules/postcss": {
-			"version": "8.4.49",
-			"resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.49.tgz",
-			"integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+			"version": "8.4.31",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+			"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -8433,22 +8014,20 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
-			"license": "MIT",
 			"dependencies": {
-				"nanoid": "^3.3.7",
-				"picocolors": "^1.1.1",
-				"source-map-js": "^1.2.1"
+				"nanoid": "^3.3.6",
+				"picocolors": "^1.0.0",
+				"source-map-js": "^1.0.2"
 			},
 			"engines": {
 				"node": "^10 || ^12 || >=14"
 			}
 		},
 		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
 			"dev": true,
-			"license": "ISC",
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
 			},
@@ -8457,14 +8036,13 @@
 			}
 		},
 		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz",
-			"integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+			"integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^7.0.0",
+				"postcss-selector-parser": "^6.0.2",
 				"postcss-value-parser": "^4.1.0"
 			},
 			"engines": {
@@ -8475,13 +8053,12 @@
 			}
 		},
 		"node_modules/postcss-modules-scope": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
-			"integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
-				"postcss-selector-parser": "^7.0.0"
+				"postcss-selector-parser": "^6.0.4"
 			},
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
@@ -8492,10 +8069,9 @@
 		},
 		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
 			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"icss-utils": "^5.0.0"
 			},
@@ -8507,11 +8083,10 @@
 			}
 		},
 		"node_modules/postcss-selector-parser": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
-			"integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+			"version": "6.0.13",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+			"integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"cssesc": "^3.0.0",
 				"util-deprecate": "^1.0.2"
@@ -8522,43 +8097,56 @@
 		},
 		"node_modules/postcss-value-parser": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+			"dev": true
+		},
+		"node_modules/postcss/node_modules/nanoid": {
+			"version": "3.3.7",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+			"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
 			"dev": true,
-			"license": "MIT"
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
 		},
 		"node_modules/postgres-array": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/postgres-array/-/postgres-array-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
 			"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/postgres-bytea": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
 			"integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/postgres-date": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmmirror.com/postgres-date/-/postgres-date-1.0.7.tgz",
+			"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
 			"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/postgres-interval": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/postgres-interval/-/postgres-interval-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
 			"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-			"license": "MIT",
 			"dependencies": {
 				"xtend": "^4.0.0"
 			},
@@ -8568,25 +8156,22 @@
 		},
 		"node_modules/potpack": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/potpack/-/potpack-1.0.2.tgz",
-			"integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz",
+			"integrity": "sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ=="
 		},
 		"node_modules/prelude-ls": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
 			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8.0"
 			}
 		},
 		"node_modules/probe-image-size": {
 			"version": "7.2.3",
-			"resolved": "https://registry.npmmirror.com/probe-image-size/-/probe-image-size-7.2.3.tgz",
+			"resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.2.3.tgz",
 			"integrity": "sha512-HubhG4Rb2UH8YtV4ba0Vp5bQ7L78RTONYu/ujmCu5nBI8wGv24s4E9xSKBi0N1MowRpxk76pFCpJtW0KPzOK0w==",
-			"license": "MIT",
 			"dependencies": {
 				"lodash.merge": "^4.6.2",
 				"needle": "^2.5.2",
@@ -8595,25 +8180,22 @@
 		},
 		"node_modules/process": {
 			"version": "0.11.10",
-			"resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
+			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
 			"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6.0"
 			}
 		},
 		"node_modules/process-nextick-args": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
 		},
 		"node_modules/prop-types": {
 			"version": "15.8.1",
-			"resolved": "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz",
+			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
 			"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-			"license": "MIT",
 			"dependencies": {
 				"loose-envify": "^1.4.0",
 				"object-assign": "^4.1.1",
@@ -8622,15 +8204,13 @@
 		},
 		"node_modules/protocol-buffers-schema": {
 			"version": "3.6.0",
-			"resolved": "https://registry.npmmirror.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
-			"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
+			"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
 		},
 		"node_modules/proxy-addr": {
 			"version": "2.0.7",
-			"resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz",
+			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
 			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-			"license": "MIT",
 			"dependencies": {
 				"forwarded": "0.2.0",
 				"ipaddr.js": "1.9.1"
@@ -8641,23 +8221,20 @@
 		},
 		"node_modules/proxy-from-env": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
 		},
 		"node_modules/pstree.remy": {
 			"version": "1.1.8",
-			"resolved": "https://registry.npmmirror.com/pstree.remy/-/pstree.remy-1.1.8.tgz",
+			"resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
 			"integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/public-encrypt": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmmirror.com/public-encrypt/-/public-encrypt-4.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
 			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"bn.js": "^4.1.0",
 				"browserify-rsa": "^4.0.0",
@@ -8668,29 +8245,26 @@
 			}
 		},
 		"node_modules/public-encrypt/node_modules/bn.js": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmmirror.com/bn.js/-/bn.js-4.12.1.tgz",
-			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+			"dev": true
 		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
 			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/qs": {
-			"version": "6.13.0",
-			"resolved": "https://registry.npmmirror.com/qs/-/qs-6.13.0.tgz",
-			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-			"license": "BSD-3-Clause",
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
 			"dependencies": {
-				"side-channel": "^1.0.6"
+				"side-channel": "^1.0.4"
 			},
 			"engines": {
 				"node": ">=0.6"
@@ -8701,9 +8275,8 @@
 		},
 		"node_modules/query-string": {
 			"version": "9.0.0",
-			"resolved": "https://registry.npmmirror.com/query-string/-/query-string-9.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/query-string/-/query-string-9.0.0.tgz",
 			"integrity": "sha512-4EWwcRGsO2H+yzq6ddHcVqkCQ2EFUSfDMEjF8ryp8ReymyZhIuaFRGLomeOQLkrzacMHoyky2HW0Qe30UbzkKw==",
-			"license": "MIT",
 			"dependencies": {
 				"decode-uri-component": "^0.4.1",
 				"filter-obj": "^5.1.0",
@@ -8718,9 +8291,8 @@
 		},
 		"node_modules/query-string/node_modules/filter-obj": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmmirror.com/filter-obj/-/filter-obj-5.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
 			"integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
 			},
@@ -8730,7 +8302,7 @@
 		},
 		"node_modules/querystring-es3": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmmirror.com/querystring-es3/-/querystring-es3-0.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
 			"integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
 			"dev": true,
 			"engines": {
@@ -8739,7 +8311,7 @@
 		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
-			"resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
 			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true,
 			"funding": [
@@ -8755,40 +8327,35 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			],
-			"license": "MIT"
+			]
 		},
 		"node_modules/quickselect": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/quickselect/-/quickselect-2.0.0.tgz",
-			"integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
+			"integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
 		},
 		"node_modules/raf": {
 			"version": "3.4.1",
-			"resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
 			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-			"license": "MIT",
 			"dependencies": {
 				"performance-now": "^2.1.0"
 			}
 		},
 		"node_modules/randombytes": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "^5.1.0"
 			}
 		},
 		"node_modules/randomfill": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmmirror.com/randomfill/-/randomfill-1.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
 			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"randombytes": "^2.0.5",
 				"safe-buffer": "^5.1.0"
@@ -8798,16 +8365,14 @@
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
 			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.6"
 			}
 		},
 		"node_modules/raw-body": {
 			"version": "2.5.2",
-			"resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.2.tgz",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
 			"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-			"license": "MIT",
 			"dependencies": {
 				"bytes": "3.1.2",
 				"http-errors": "2.0.0",
@@ -8820,9 +8385,8 @@
 		},
 		"node_modules/react": {
 			"version": "18.3.1",
-			"resolved": "https://registry.npmmirror.com/react/-/react-18.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
 			"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-			"license": "MIT",
 			"dependencies": {
 				"loose-envify": "^1.1.0"
 			},
@@ -8831,10 +8395,9 @@
 			}
 		},
 		"node_modules/react-calendar": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmmirror.com/react-calendar/-/react-calendar-5.1.0.tgz",
-			"integrity": "sha512-09o/rQHPZGEi658IXAJtWfra1N69D1eFnuJ3FQm9qUVzlzNnos1+GWgGiUeSs22QOpNm32aoVFOimq0p3Ug9Eg==",
-			"license": "MIT",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-5.0.0.tgz",
+			"integrity": "sha512-bHcE5e5f+VUKLd4R19BGkcSQLpuwjKBVG0fKz74cwPW5xDfNsReHdDbfd4z3mdjuUuZzVtw4Q920mkwK5/ZOEg==",
 			"dependencies": {
 				"@wojtekmaj/date-utils": "^1.1.3",
 				"clsx": "^2.0.0",
@@ -8855,11 +8418,26 @@
 				}
 			}
 		},
+		"node_modules/react-calendar/node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/react-calendar/node_modules/warning": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+			"dependencies": {
+				"loose-envify": "^1.0.0"
+			}
+		},
 		"node_modules/react-date-picker": {
 			"version": "11.0.0",
-			"resolved": "https://registry.npmmirror.com/react-date-picker/-/react-date-picker-11.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/react-date-picker/-/react-date-picker-11.0.0.tgz",
 			"integrity": "sha512-l+siu5HSZ/ciGL1293KCAHl4o9aD5rw16V4tB0C43h7QbMv2dWGgj7Dxgt8iztLaPVtEfOt/+sxNiTYw4WVq6A==",
-			"license": "MIT",
 			"dependencies": {
 				"@wojtekmaj/date-utils": "^1.1.3",
 				"clsx": "^2.0.0",
@@ -8883,11 +8461,18 @@
 				}
 			}
 		},
+		"node_modules/react-date-picker/node_modules/clsx": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/react-dom": {
 			"version": "18.2.0",
-			"resolved": "https://registry.npmmirror.com/react-dom/-/react-dom-18.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
 			"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-			"license": "MIT",
 			"dependencies": {
 				"loose-envify": "^1.1.0",
 				"scheduler": "^0.23.0"
@@ -8898,15 +8483,13 @@
 		},
 		"node_modules/react-fast-compare": {
 			"version": "3.2.2",
-			"resolved": "https://registry.npmmirror.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
-			"integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+			"integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
 		},
 		"node_modules/react-fit": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/react-fit/-/react-fit-2.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/react-fit/-/react-fit-2.0.1.tgz",
 			"integrity": "sha512-Eip6ALs/+6Jv82Si0I9UnfysdwVlAhkkZRycgmMdnj7jwUg69SVFp84ICxwB8zszkfvJJ2MGAAo9KAYM8ZUykQ==",
-			"license": "MIT",
 			"dependencies": {
 				"detect-element-overflow": "^1.4.0",
 				"warning": "^4.0.0"
@@ -8928,11 +8511,18 @@
 				}
 			}
 		},
+		"node_modules/react-fit/node_modules/warning": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+			"dependencies": {
+				"loose-envify": "^1.0.0"
+			}
+		},
 		"node_modules/react-intl": {
 			"version": "6.6.8",
-			"resolved": "https://registry.npmmirror.com/react-intl/-/react-intl-6.6.8.tgz",
+			"resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.6.8.tgz",
 			"integrity": "sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@formatjs/ecma402-abstract": "2.0.0",
 				"@formatjs/icu-messageformat-parser": "2.7.8",
@@ -8955,17 +8545,51 @@
 				}
 			}
 		},
+		"node_modules/react-intl/node_modules/@formatjs/ecma402-abstract": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+			"integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
+			"dependencies": {
+				"@formatjs/intl-localematcher": "0.5.4",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/react-intl/node_modules/@formatjs/icu-messageformat-parser": {
+			"version": "2.7.8",
+			"resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz",
+			"integrity": "sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"@formatjs/icu-skeleton-parser": "1.8.2",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/react-intl/node_modules/@formatjs/icu-skeleton-parser": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz",
+			"integrity": "sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==",
+			"dependencies": {
+				"@formatjs/ecma402-abstract": "2.0.0",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/react-intl/node_modules/@formatjs/intl-localematcher": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+			"integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/react-is": {
 			"version": "16.13.1",
-			"resolved": "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz",
-			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
 		},
 		"node_modules/react-plotly.js": {
 			"version": "2.6.0",
-			"resolved": "https://registry.npmmirror.com/react-plotly.js/-/react-plotly.js-2.6.0.tgz",
+			"resolved": "https://registry.npmjs.org/react-plotly.js/-/react-plotly.js-2.6.0.tgz",
 			"integrity": "sha512-g93xcyhAVCSt9kV1svqG1clAEdL6k3U+jjuSzfTV7owaSU9Go6Ph8bl25J+jKfKvIGAEYpe4qj++WHJuc9IaeA==",
-			"license": "MIT",
 			"dependencies": {
 				"prop-types": "^15.8.1"
 			},
@@ -8976,9 +8600,8 @@
 		},
 		"node_modules/react-popper": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmmirror.com/react-popper/-/react-popper-2.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
 			"integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
-			"license": "MIT",
 			"dependencies": {
 				"react-fast-compare": "^3.0.1",
 				"warning": "^4.0.2"
@@ -8989,11 +8612,18 @@
 				"react-dom": "^16.8.0 || ^17 || ^18"
 			}
 		},
+		"node_modules/react-popper/node_modules/warning": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+			"dependencies": {
+				"loose-envify": "^1.0.0"
+			}
+		},
 		"node_modules/react-redux": {
 			"version": "8.1.3",
-			"resolved": "https://registry.npmmirror.com/react-redux/-/react-redux-8.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.1.3.tgz",
 			"integrity": "sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==",
-			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.12.1",
 				"@types/hoist-non-react-statics": "^3.3.1",
@@ -9029,18 +8659,16 @@
 			}
 		},
 		"node_modules/react-redux/node_modules/react-is": {
-			"version": "18.3.1",
-			"resolved": "https://registry.npmmirror.com/react-is/-/react-is-18.3.1.tgz",
-			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-			"license": "MIT"
+			"version": "18.2.0",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
 		},
 		"node_modules/react-router": {
-			"version": "6.21.3",
-			"resolved": "https://registry.npmmirror.com/react-router/-/react-router-6.21.3.tgz",
-			"integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
-			"license": "MIT",
+			"version": "6.21.1",
+			"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.1.tgz",
+			"integrity": "sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==",
 			"dependencies": {
-				"@remix-run/router": "1.14.2"
+				"@remix-run/router": "1.14.1"
 			},
 			"engines": {
 				"node": ">=14.0.0"
@@ -9050,13 +8678,12 @@
 			}
 		},
 		"node_modules/react-router-dom": {
-			"version": "6.21.3",
-			"resolved": "https://registry.npmmirror.com/react-router-dom/-/react-router-dom-6.21.3.tgz",
-			"integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
-			"license": "MIT",
+			"version": "6.21.1",
+			"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.1.tgz",
+			"integrity": "sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA==",
 			"dependencies": {
-				"@remix-run/router": "1.14.2",
-				"react-router": "6.21.3"
+				"@remix-run/router": "1.14.1",
+				"react-router": "6.21.1"
 			},
 			"engines": {
 				"node": ">=14.0.0"
@@ -9067,10 +8694,9 @@
 			}
 		},
 		"node_modules/react-select": {
-			"version": "5.8.3",
-			"resolved": "https://registry.npmmirror.com/react-select/-/react-select-5.8.3.tgz",
-			"integrity": "sha512-lVswnIq8/iTj1db7XCG74M/3fbGB6ZaluCzvwPGT5ZOjCdL/k0CLWhEK0vCBLuU5bHTEf6Gj8jtSvi+3v+tO1w==",
-			"license": "MIT",
+			"version": "5.8.0",
+			"resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz",
+			"integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==",
 			"dependencies": {
 				"@babel/runtime": "^7.12.0",
 				"@emotion/cache": "^11.4.0",
@@ -9089,9 +8715,8 @@
 		},
 		"node_modules/react-toastify": {
 			"version": "9.1.3",
-			"resolved": "https://registry.npmmirror.com/react-toastify/-/react-toastify-9.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.3.tgz",
 			"integrity": "sha512-fPfb8ghtn/XMxw3LkxQBk3IyagNpF/LIKjOBflbexr2AWxAH1MJgvnESwEwBn9liLFXgTKWgBSdZpw9m4OTHTg==",
-			"license": "MIT",
 			"dependencies": {
 				"clsx": "^1.1.1"
 			},
@@ -9100,20 +8725,10 @@
 				"react-dom": ">=16"
 			}
 		},
-		"node_modules/react-toastify/node_modules/clsx": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/clsx/-/clsx-1.2.1.tgz",
-			"integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/react-tooltip": {
 			"version": "4.5.1",
-			"resolved": "https://registry.npmmirror.com/react-tooltip/-/react-tooltip-4.5.1.tgz",
+			"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.5.1.tgz",
 			"integrity": "sha512-Zo+CSFUGXar1uV+bgXFFDe7VeS2iByeIp5rTgTcc2HqtuOS5D76QapejNNfx320MCY91TlhTQat36KGFTqgcvw==",
-			"license": "MIT",
 			"dependencies": {
 				"prop-types": "^15.8.1",
 				"uuid": "^7.0.3"
@@ -9128,9 +8743,8 @@
 		},
 		"node_modules/react-transition-group": {
 			"version": "4.4.5",
-			"resolved": "https://registry.npmmirror.com/react-transition-group/-/react-transition-group-4.4.5.tgz",
+			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
 			"integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@babel/runtime": "^7.5.5",
 				"dom-helpers": "^5.0.1",
@@ -9143,10 +8757,9 @@
 			}
 		},
 		"node_modules/reactstrap": {
-			"version": "9.2.3",
-			"resolved": "https://registry.npmmirror.com/reactstrap/-/reactstrap-9.2.3.tgz",
-			"integrity": "sha512-1nXy7FIBIoOgXr3AIHOpgzcZXdj6rZE5YvNSPd1hYgwv8X64m6TAJsU0ExlieJdlRXhaRfTYRSZoTWa127b0gw==",
-			"license": "MIT",
+			"version": "9.2.2",
+			"resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.2.2.tgz",
+			"integrity": "sha512-4KroiGOdqZLAnMGzHjpErW3G7bLB+QbKzzMLIDXydPIV0y74lpdL7WtXHkLWAGInd97WCPNx4+R0NQDPyzIfhw==",
 			"dependencies": {
 				"@babel/runtime": "^7.12.5",
 				"@popperjs/core": "^2.6.0",
@@ -9160,48 +8773,11 @@
 				"react-dom": ">=16.8.0"
 			}
 		},
-		"node_modules/readable-stream": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
-			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-			"license": "MIT",
-			"dependencies": {
-				"core-util-is": "~1.0.0",
-				"inherits": "~2.0.3",
-				"isarray": "~1.0.0",
-				"process-nextick-args": "~2.0.0",
-				"safe-buffer": "~5.1.1",
-				"string_decoder": "~1.1.1",
-				"util-deprecate": "~1.0.1"
-			}
-		},
-		"node_modules/readable-stream/node_modules/isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-			"license": "MIT"
-		},
-		"node_modules/readable-stream/node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"license": "MIT"
-		},
-		"node_modules/readable-stream/node_modules/string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"license": "MIT",
-			"dependencies": {
-				"safe-buffer": "~5.1.0"
-			}
-		},
 		"node_modules/readdirp": {
 			"version": "3.6.0",
-			"resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
 			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"picomatch": "^2.2.1"
 			},
@@ -9211,10 +8787,9 @@
 		},
 		"node_modules/rechoir": {
 			"version": "0.8.0",
-			"resolved": "https://registry.npmmirror.com/rechoir/-/rechoir-0.8.0.tgz",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
 			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"resolve": "^1.20.0"
 			},
@@ -9224,40 +8799,35 @@
 		},
 		"node_modules/redux": {
 			"version": "4.2.1",
-			"resolved": "https://registry.npmmirror.com/redux/-/redux-4.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
 			"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-			"license": "MIT",
 			"dependencies": {
 				"@babel/runtime": "^7.9.2"
 			}
 		},
 		"node_modules/redux-thunk": {
 			"version": "2.4.2",
-			"resolved": "https://registry.npmmirror.com/redux-thunk/-/redux-thunk-2.4.2.tgz",
+			"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
 			"integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
-			"license": "MIT",
 			"peerDependencies": {
 				"redux": "^4"
 			}
 		},
 		"node_modules/regenerator-runtime": {
-			"version": "0.14.1",
-			"resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-			"license": "MIT"
+			"version": "0.14.0",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+			"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
 		},
 		"node_modules/regl": {
 			"name": "@plotly/regl",
 			"version": "2.1.2",
-			"resolved": "https://registry.npmmirror.com/@plotly/regl/-/regl-2.1.2.tgz",
-			"integrity": "sha512-Mdk+vUACbQvjd0m/1JJjOOafmkp/EpmHjISsopEz5Av44CBq7rPC05HHNbYGKVyNUF2zmEoBS/TT0pd0SPFFyw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/@plotly/regl/-/regl-2.1.2.tgz",
+			"integrity": "sha512-Mdk+vUACbQvjd0m/1JJjOOafmkp/EpmHjISsopEz5Av44CBq7rPC05HHNbYGKVyNUF2zmEoBS/TT0pd0SPFFyw=="
 		},
 		"node_modules/regl-error2d": {
 			"version": "2.0.12",
-			"resolved": "https://registry.npmmirror.com/regl-error2d/-/regl-error2d-2.0.12.tgz",
+			"resolved": "https://registry.npmjs.org/regl-error2d/-/regl-error2d-2.0.12.tgz",
 			"integrity": "sha512-r7BUprZoPO9AbyqM5qlJesrSRkl+hZnVKWKsVp7YhOl/3RIpi4UDGASGJY0puQ96u5fBYw/OlqV24IGcgJ0McA==",
-			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"color-normalize": "^1.5.0",
@@ -9269,10 +8839,9 @@
 			}
 		},
 		"node_modules/regl-line2d": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmmirror.com/regl-line2d/-/regl-line2d-3.1.3.tgz",
-			"integrity": "sha512-fkgzW+tTn4QUQLpFKsUIE0sgWdCmXAM3ctXcCgoGBZTSX5FE2A0M7aynz7nrZT5baaftLrk9te54B+MEq4QcSA==",
-			"license": "MIT",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-3.1.2.tgz",
+			"integrity": "sha512-nmT7WWS/WxmXAQMkgaMKWXaVmwJ65KCrjbqHGOUjjqQi6shfT96YbBOvelXwO9hG7/hjvbzjtQ2UO0L3e7YaXQ==",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"array-find-index": "^1.0.2",
@@ -9281,6 +8850,7 @@
 				"earcut": "^2.1.5",
 				"es6-weak-map": "^2.0.3",
 				"flatten-vertex-data": "^1.0.2",
+				"glslify": "^7.0.0",
 				"object-assign": "^4.1.1",
 				"parse-rect": "^1.2.0",
 				"pick-by-alias": "^1.2.0",
@@ -9289,9 +8859,8 @@
 		},
 		"node_modules/regl-scatter2d": {
 			"version": "3.3.1",
-			"resolved": "https://registry.npmmirror.com/regl-scatter2d/-/regl-scatter2d-3.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.3.1.tgz",
 			"integrity": "sha512-seOmMIVwaCwemSYz/y4WE0dbSO9svNFSqtTh5RE57I7PjGo3tcUYKtH0MTSoshcAsreoqN8HoCtnn8wfHXXfKQ==",
-			"license": "MIT",
 			"dependencies": {
 				"@plotly/point-cluster": "^3.1.9",
 				"array-range": "^1.0.1",
@@ -9312,9 +8881,8 @@
 		},
 		"node_modules/regl-splom": {
 			"version": "1.0.14",
-			"resolved": "https://registry.npmmirror.com/regl-splom/-/regl-splom-1.0.14.tgz",
+			"resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.14.tgz",
 			"integrity": "sha512-OiLqjmPRYbd7kDlHC6/zDf6L8lxgDC65BhC8JirhP4ykrK4x22ZyS+BnY8EUinXKDeMgmpRwCvUmk7BK4Nweuw==",
-			"license": "MIT",
 			"dependencies": {
 				"array-bounds": "^1.0.1",
 				"array-range": "^1.0.1",
@@ -9328,25 +8896,22 @@
 		},
 		"node_modules/require-directory": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
 			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/reselect": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmmirror.com/reselect/-/reselect-5.1.1.tgz",
-			"integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
-			"license": "MIT"
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.0.tgz",
+			"integrity": "sha512-aw7jcGLDpSgNDyWBQLv2cedml85qd95/iszJjN988zX1t7AVRJi19d9kto5+W7oCfQ94gyo40dVbT6g2k4/kXg=="
 		},
 		"node_modules/resolve": {
 			"version": "1.22.8",
-			"resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
 			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-			"license": "MIT",
 			"dependencies": {
 				"is-core-module": "^2.13.0",
 				"path-parse": "^1.0.7",
@@ -9361,10 +8926,9 @@
 		},
 		"node_modules/resolve-cwd": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
 			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"resolve-from": "^5.0.0"
 			},
@@ -9374,38 +8938,34 @@
 		},
 		"node_modules/resolve-cwd/node_modules/resolve-from": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-5.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
 			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/resolve-from": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
 			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/resolve-protobuf-schema": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
 			"integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
-			"license": "MIT",
 			"dependencies": {
 				"protocol-buffers-schema": "^3.3.1"
 			}
 		},
 		"node_modules/reusify": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
 			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"iojs": ">=1.0.0",
 				"node": ">=0.10.0"
@@ -9413,17 +8973,14 @@
 		},
 		"node_modules/right-now": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/right-now/-/right-now-1.0.0.tgz",
-			"integrity": "sha512-DA8+YS+sMIVpbsuKgy+Z67L9Lxb1p05mNxRpDPNksPDEFir4vmBlUtuN9jkTGn9YMMdlBuK7XQgFiz6ws+yhSg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/right-now/-/right-now-1.0.0.tgz",
+			"integrity": "sha512-DA8+YS+sMIVpbsuKgy+Z67L9Lxb1p05mNxRpDPNksPDEFir4vmBlUtuN9jkTGn9YMMdlBuK7XQgFiz6ws+yhSg=="
 		},
 		"node_modules/rimraf": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
 			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-			"deprecated": "Rimraf versions prior to v4 are no longer supported",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"glob": "^7.1.3"
 			},
@@ -9434,58 +8991,11 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"node_modules/rimraf/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/rimraf/node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"deprecated": "Glob versions prior to v9 are no longer supported",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/rimraf/node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
 		"node_modules/ripemd160": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/ripemd160/-/ripemd160-2.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
 			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"hash-base": "^3.0.0",
 				"inherits": "^2.0.1"
@@ -9493,13 +9003,12 @@
 		},
 		"node_modules/robust-predicates": {
 			"version": "3.0.2",
-			"resolved": "https://registry.npmmirror.com/robust-predicates/-/robust-predicates-3.0.2.tgz",
-			"integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
-			"license": "Unlicense"
+			"resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+			"integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
 		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
 			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
 			"dev": true,
 			"funding": [
@@ -9516,20 +9025,18 @@
 					"url": "https://feross.org/support"
 				}
 			],
-			"license": "MIT",
 			"dependencies": {
 				"queue-microtask": "^1.2.2"
 			}
 		},
 		"node_modules/rw": {
 			"version": "1.3.3",
-			"resolved": "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz",
-			"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
-			"license": "BSD-3-Clause"
+			"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+			"integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
 		},
 		"node_modules/safe-buffer": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
 			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 			"funding": [
 				{
@@ -9544,54 +9051,30 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			],
-			"license": "MIT"
+			]
 		},
 		"node_modules/safer-buffer": {
 			"version": "2.1.2",
-			"resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"node_modules/sax": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmmirror.com/sax/-/sax-1.4.1.tgz",
-			"integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
-			"license": "ISC"
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+			"integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
 		},
 		"node_modules/scheduler": {
-			"version": "0.23.2",
-			"resolved": "https://registry.npmmirror.com/scheduler/-/scheduler-0.23.2.tgz",
-			"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-			"license": "MIT",
+			"version": "0.23.0",
+			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+			"integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
 			"dependencies": {
 				"loose-envify": "^1.1.0"
 			}
 		},
-		"node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
 		"node_modules/semver": {
-			"version": "7.6.3",
-			"resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.3.tgz",
-			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-			"license": "ISC",
+			"version": "7.6.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
+			"integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -9600,10 +9083,9 @@
 			}
 		},
 		"node_modules/send": {
-			"version": "0.19.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-			"integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-			"license": "MIT",
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
 			"dependencies": {
 				"debug": "2.6.9",
 				"depd": "2.0.0",
@@ -9627,7 +9109,6 @@
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
@@ -9635,33 +9116,26 @@
 		"node_modules/send/node_modules/debug/node_modules/ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"license": "MIT"
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
-		"node_modules/send/node_modules/encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.8"
-			}
+		"node_modules/send/node_modules/ms": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
 		},
 		"node_modules/serialize-javascript": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
 			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
 		},
 		"node_modules/serve-favicon": {
 			"version": "2.5.0",
-			"resolved": "https://registry.npmmirror.com/serve-favicon/-/serve-favicon-2.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz",
 			"integrity": "sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==",
-			"license": "MIT",
 			"dependencies": {
 				"etag": "~1.8.1",
 				"fresh": "0.5.2",
@@ -9675,26 +9149,23 @@
 		},
 		"node_modules/serve-favicon/node_modules/ms": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.1.tgz",
-			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
 		},
 		"node_modules/serve-favicon/node_modules/safe-buffer": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.1.tgz",
-			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 		},
 		"node_modules/serve-static": {
-			"version": "1.16.2",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-			"integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-			"license": "MIT",
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
 			"dependencies": {
-				"encodeurl": "~2.0.0",
+				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
 				"parseurl": "~1.3.3",
-				"send": "0.19.0"
+				"send": "0.18.0"
 			},
 			"engines": {
 				"node": ">= 0.8.0"
@@ -9702,9 +9173,8 @@
 		},
 		"node_modules/set-function-length": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
 			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-			"license": "MIT",
 			"dependencies": {
 				"define-data-property": "^1.1.4",
 				"es-errors": "^1.3.0",
@@ -9719,23 +9189,20 @@
 		},
 		"node_modules/setimmediate": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
 			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/setprototypeof": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
-			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
 		},
 		"node_modules/sha.js": {
 			"version": "2.4.11",
-			"resolved": "https://registry.npmmirror.com/sha.js/-/sha.js-2.4.11.tgz",
+			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
 			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 			"dev": true,
-			"license": "(MIT AND BSD-3-Clause)",
 			"dependencies": {
 				"inherits": "^2.0.1",
 				"safe-buffer": "^5.0.1"
@@ -9746,10 +9213,9 @@
 		},
 		"node_modules/shallow-clone": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
 			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"kind-of": "^6.0.2"
 			},
@@ -9759,16 +9225,14 @@
 		},
 		"node_modules/shallow-copy": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmmirror.com/shallow-copy/-/shallow-copy-0.0.1.tgz",
-			"integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+			"integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw=="
 		},
 		"node_modules/shebang-command": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
 			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"shebang-regex": "^3.0.0"
 			},
@@ -9778,19 +9242,17 @@
 		},
 		"node_modules/shebang-regex": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/side-channel": {
 			"version": "1.0.6",
-			"resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.6.tgz",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
 			"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-			"license": "MIT",
 			"dependencies": {
 				"call-bind": "^1.0.7",
 				"es-errors": "^1.3.0",
@@ -9806,16 +9268,14 @@
 		},
 		"node_modules/signum": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/signum/-/signum-1.0.0.tgz",
-			"integrity": "sha512-yodFGwcyt59XRh7w5W3jPcIQb3Bwi21suEfT7MAWnBX3iCdklJpgDgvGT9o04UonglZN5SNMfJFkHIR/jO8GHw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/signum/-/signum-1.0.0.tgz",
+			"integrity": "sha512-yodFGwcyt59XRh7w5W3jPcIQb3Bwi21suEfT7MAWnBX3iCdklJpgDgvGT9o04UonglZN5SNMfJFkHIR/jO8GHw=="
 		},
 		"node_modules/simple-update-notifier": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
 			"integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"semver": "^7.5.3"
 			},
@@ -9824,14 +9284,13 @@
 			}
 		},
 		"node_modules/sinon": {
-			"version": "18.0.1",
-			"resolved": "https://registry.npmmirror.com/sinon/-/sinon-18.0.1.tgz",
-			"integrity": "sha512-a2N2TDY1uGviajJ6r4D1CyRAkzE9NNVlYOV1wX5xQDuAk0ONgzgRl0EjCQuRCPxOwp13ghsMwt9Gdldujs39qw==",
+			"version": "18.0.0",
+			"resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.0.tgz",
+			"integrity": "sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@sinonjs/commons": "^3.0.1",
-				"@sinonjs/fake-timers": "11.2.2",
+				"@sinonjs/fake-timers": "^11.2.2",
 				"@sinonjs/samsam": "^8.0.0",
 				"diff": "^5.2.0",
 				"nise": "^6.0.0",
@@ -9844,50 +9303,67 @@
 		},
 		"node_modules/sinon/node_modules/diff": {
 			"version": "5.2.0",
-			"resolved": "https://registry.npmmirror.com/diff/-/diff-5.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
 			"integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.3.1"
 			}
 		},
+		"node_modules/sinon/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/sinon/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/slash": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
 			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/source-map": {
 			"version": "0.5.7",
-			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
 			"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/source-map-js": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
-			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/source-map-loader": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmmirror.com/source-map-loader/-/source-map-loader-4.0.2.tgz",
-			"integrity": "sha512-oYwAqCuL0OZhBoSgmdrLa7mv9MjommVMiQIWgcztf+eS4+8BfcUee6nenFnDhKOhzAVnk5gpZdfnz1iiBv+5sg==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz",
+			"integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
+				"abab": "^2.0.6",
 				"iconv-lite": "^0.6.3",
 				"source-map-js": "^1.0.2"
 			},
@@ -9904,10 +9380,9 @@
 		},
 		"node_modules/source-map-loader/node_modules/iconv-lite": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
 			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"safer-buffer": ">= 2.1.2 < 3.0.0"
 			},
@@ -9917,10 +9392,9 @@
 		},
 		"node_modules/source-map-support": {
 			"version": "0.5.21",
-			"resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
 			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
@@ -9928,53 +9402,47 @@
 		},
 		"node_modules/source-map-support/node_modules/source-map": {
 			"version": "0.6.1",
-			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/spdx-exceptions": {
 			"version": "2.5.0",
-			"resolved": "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
 			"integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-			"dev": true,
-			"license": "CC-BY-3.0"
+			"dev": true
 		},
 		"node_modules/spdx-expression-parse": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
 			"integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"spdx-exceptions": "^2.1.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
 		"node_modules/spdx-license-ids": {
-			"version": "3.0.20",
-			"resolved": "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
-			"integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
-			"dev": true,
-			"license": "CC0-1.0"
+			"version": "3.0.17",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+			"integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
+			"dev": true
 		},
 		"node_modules/spex": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmmirror.com/spex/-/spex-3.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/spex/-/spex-3.3.0.tgz",
 			"integrity": "sha512-VNiXjFp6R4ldPbVRYbpxlD35yRHceecVXlct1J4/X80KuuPnW2AXMq3sGwhnJOhKkUsOxAT6nRGfGE5pocVw5w==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			}
 		},
 		"node_modules/split-on-first": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/split-on-first/-/split-on-first-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-3.0.0.tgz",
 			"integrity": "sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=12"
 			},
@@ -9984,45 +9452,41 @@
 		},
 		"node_modules/split2": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmmirror.com/split2/-/split2-4.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
 			"integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
-			"license": "ISC",
 			"engines": {
 				"node": ">= 10.x"
 			}
 		},
 		"node_modules/stack-trace": {
 			"version": "0.0.9",
-			"resolved": "https://registry.npmmirror.com/stack-trace/-/stack-trace-0.0.9.tgz",
+			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
 			"integrity": "sha512-vjUc6sfgtgY0dxCdnc40mK6Oftjo9+2K8H/NG81TMhgL392FtiPA9tn9RLyTxXmTLPJPjF3VyzFp6bsWFLisMQ==",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/static-eval": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmmirror.com/static-eval/-/static-eval-2.1.1.tgz",
-			"integrity": "sha512-MgWpQ/ZjGieSVB3eOJVs4OA2LT/q1vx98KPCTTQPzq/aLr0YUXTsgryTXr4SLfR0ZfUUCiedM9n/ABeDIyy4mA==",
-			"license": "MIT",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz",
+			"integrity": "sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw==",
 			"dependencies": {
-				"escodegen": "^2.1.0"
+				"escodegen": "^1.11.1"
 			}
 		},
 		"node_modules/statuses": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
 			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/stream-browserify": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmmirror.com/stream-browserify/-/stream-browserify-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
 			"integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "~2.0.4",
 				"readable-stream": "^3.5.0"
@@ -10030,10 +9494,9 @@
 		},
 		"node_modules/stream-browserify/node_modules/readable-stream": {
 			"version": "3.6.2",
-			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -10045,10 +9508,9 @@
 		},
 		"node_modules/stream-http": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmmirror.com/stream-http/-/stream-http-3.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
 			"integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"builtin-status-codes": "^3.0.0",
 				"inherits": "^2.0.4",
@@ -10058,10 +9520,9 @@
 		},
 		"node_modules/stream-http/node_modules/readable-stream": {
 			"version": "3.6.2",
-			"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
 			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -10073,46 +9534,41 @@
 		},
 		"node_modules/stream-parser": {
 			"version": "0.3.1",
-			"resolved": "https://registry.npmmirror.com/stream-parser/-/stream-parser-0.3.1.tgz",
+			"resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz",
 			"integrity": "sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==",
-			"license": "MIT",
 			"dependencies": {
 				"debug": "2"
 			}
 		},
 		"node_modules/stream-parser/node_modules/debug": {
 			"version": "2.6.9",
-			"resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
 			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"license": "MIT",
 			"dependencies": {
 				"ms": "2.0.0"
 			}
 		},
 		"node_modules/stream-parser/node_modules/ms": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/stream-shift": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/stream-shift/-/stream-shift-1.0.3.tgz",
-			"integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
-			"license": "MIT"
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+			"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
 		},
 		"node_modules/stream-transform": {
 			"version": "2.1.3",
-			"resolved": "https://registry.npmmirror.com/stream-transform/-/stream-transform-2.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-2.1.3.tgz",
 			"integrity": "sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==",
-			"license": "MIT",
 			"dependencies": {
 				"mixme": "^0.5.1"
 			}
 		},
 		"node_modules/streamsearch": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/streamsearch/-/streamsearch-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
 			"integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
 			"engines": {
 				"node": ">=10.0.0"
@@ -10120,29 +9576,26 @@
 		},
 		"node_modules/string_decoder": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
 			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "~5.2.0"
 			}
 		},
 		"node_modules/string-split-by": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/string-split-by/-/string-split-by-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/string-split-by/-/string-split-by-1.0.0.tgz",
 			"integrity": "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A==",
-			"license": "MIT",
 			"dependencies": {
 				"parenthesis": "^3.1.5"
 			}
 		},
 		"node_modules/string-width": {
 			"version": "4.2.3",
-			"resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
 			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"emoji-regex": "^8.0.0",
 				"is-fullwidth-code-point": "^3.0.0",
@@ -10154,10 +9607,9 @@
 		},
 		"node_modules/strip-ansi": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
 			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"ansi-regex": "^5.0.1"
 			},
@@ -10167,10 +9619,9 @@
 		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			},
@@ -10180,16 +9631,14 @@
 		},
 		"node_modules/strongly-connected-components": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/strongly-connected-components/-/strongly-connected-components-1.0.1.tgz",
-			"integrity": "sha512-i0TFx4wPcO0FwX+4RkLJi1MxmcTv90jNZgxMu9XRnMXMeFUY1VJlIoXpZunPUvUUqbCT1pg5PEkFqqpcaElNaA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/strongly-connected-components/-/strongly-connected-components-1.0.1.tgz",
+			"integrity": "sha512-i0TFx4wPcO0FwX+4RkLJi1MxmcTv90jNZgxMu9XRnMXMeFUY1VJlIoXpZunPUvUUqbCT1pg5PEkFqqpcaElNaA=="
 		},
 		"node_modules/style-loader": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmmirror.com/style-loader/-/style-loader-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-4.0.0.tgz",
 			"integrity": "sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">= 18.12.0"
 			},
@@ -10203,17 +9652,15 @@
 		},
 		"node_modules/stylis": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmmirror.com/stylis/-/stylis-4.2.0.tgz",
-			"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
+			"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
 		},
 		"node_modules/superagent": {
 			"version": "8.1.2",
-			"resolved": "https://registry.npmmirror.com/superagent/-/superagent-8.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz",
 			"integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==",
 			"deprecated": "Please upgrade to v9.0.0+ as we have fixed a public vulnerability with formidable dependency. Note that v9.0.0+ requires Node.js v14.18.0+. See https://github.com/ladjs/superagent/pull/1800 for insight. This project is supported and maintained by the team at Forward Email @ https://forwardemail.net",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"component-emitter": "^1.3.0",
 				"cookiejar": "^2.1.4",
@@ -10232,10 +9679,9 @@
 		},
 		"node_modules/superagent/node_modules/mime": {
 			"version": "2.6.0",
-			"resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
 			"integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
 			"dev": true,
-			"license": "MIT",
 			"bin": {
 				"mime": "cli.js"
 			},
@@ -10245,37 +9691,32 @@
 		},
 		"node_modules/supercluster": {
 			"version": "7.1.5",
-			"resolved": "https://registry.npmmirror.com/supercluster/-/supercluster-7.1.5.tgz",
+			"resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz",
 			"integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==",
-			"license": "ISC",
 			"dependencies": {
 				"kdbush": "^3.0.0"
 			}
 		},
 		"node_modules/superscript-text": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/superscript-text/-/superscript-text-1.0.0.tgz",
-			"integrity": "sha512-gwu8l5MtRZ6koO0icVTlmN5pm7Dhh1+Xpe9O4x6ObMAsW+3jPbW14d1DsBq1F4wiI+WOFjXF35pslgec/G8yCQ==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/superscript-text/-/superscript-text-1.0.0.tgz",
+			"integrity": "sha512-gwu8l5MtRZ6koO0icVTlmN5pm7Dhh1+Xpe9O4x6ObMAsW+3jPbW14d1DsBq1F4wiI+WOFjXF35pslgec/G8yCQ=="
 		},
 		"node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"license": "MIT",
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 			"dependencies": {
-				"has-flag": "^4.0.0"
+				"has-flag": "^3.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=4"
 			}
 		},
 		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
 			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -10285,15 +9726,13 @@
 		},
 		"node_modules/svg-arc-to-cubic-bezier": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmmirror.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz",
-			"integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz",
+			"integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g=="
 		},
 		"node_modules/svg-path-bounds": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/svg-path-bounds/-/svg-path-bounds-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/svg-path-bounds/-/svg-path-bounds-1.0.2.tgz",
 			"integrity": "sha512-H4/uAgLWrppIC0kHsb2/dWUYSmb4GE5UqH06uqWBcg6LBjX2fu0A8+JrO2/FJPZiSsNOKZAhyFFgsLTdYUvSqQ==",
-			"license": "MIT",
 			"dependencies": {
 				"abs-svg-path": "^0.1.1",
 				"is-svg-path": "^1.0.1",
@@ -10303,18 +9742,16 @@
 		},
 		"node_modules/svg-path-bounds/node_modules/normalize-svg-path": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz",
 			"integrity": "sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg==",
-			"license": "MIT",
 			"dependencies": {
 				"svg-arc-to-cubic-bezier": "^3.0.0"
 			}
 		},
 		"node_modules/svg-path-sdf": {
 			"version": "1.1.3",
-			"resolved": "https://registry.npmmirror.com/svg-path-sdf/-/svg-path-sdf-1.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/svg-path-sdf/-/svg-path-sdf-1.1.3.tgz",
 			"integrity": "sha512-vJJjVq/R5lSr2KLfVXVAStktfcfa1pNFjFOgyJnzZFXlO/fDZ5DmM8FpnSKKzLPfEYTVeXuVBTHF296TpxuJVg==",
-			"license": "MIT",
 			"dependencies": {
 				"bitmap-sdf": "^1.0.0",
 				"draw-svg-path": "^1.0.0",
@@ -10325,20 +9762,18 @@
 		},
 		"node_modules/tapable": {
 			"version": "2.2.1",
-			"resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
 			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/terser": {
-			"version": "5.37.0",
-			"resolved": "https://registry.npmmirror.com/terser/-/terser-5.37.0.tgz",
-			"integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
+			"version": "5.29.1",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz",
+			"integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",
@@ -10354,10 +9789,9 @@
 		},
 		"node_modules/terser-webpack-plugin": {
 			"version": "5.3.10",
-			"resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
 			"integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/trace-mapping": "^0.3.20",
 				"jest-worker": "^27.4.5",
@@ -10387,46 +9821,85 @@
 				}
 			}
 		},
-		"node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"dependencies": {
-				"randombytes": "^2.1.0"
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"node_modules/terser/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+		"node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
 			"dev": true,
-			"license": "MIT"
+			"dependencies": {
+				"randombytes": "^2.1.0"
+			}
 		},
 		"node_modules/text-table": {
 			"version": "0.2.0",
-			"resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/through2": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmmirror.com/through2/-/through2-2.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
 			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-			"license": "MIT",
 			"dependencies": {
 				"readable-stream": "~2.3.6",
 				"xtend": "~4.0.1"
 			}
 		},
+		"node_modules/through2/node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+		},
+		"node_modules/through2/node_modules/readable-stream": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+			"integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.3",
+				"isarray": "~1.0.0",
+				"process-nextick-args": "~2.0.0",
+				"safe-buffer": "~5.1.1",
+				"string_decoder": "~1.1.1",
+				"util-deprecate": "~1.0.1"
+			}
+		},
+		"node_modules/through2/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/through2/node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
+		},
 		"node_modules/timers-browserify": {
 			"version": "2.0.12",
-			"resolved": "https://registry.npmmirror.com/timers-browserify/-/timers-browserify-2.0.12.tgz",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
 			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"setimmediate": "^1.0.4"
 			},
@@ -10436,37 +9909,40 @@
 		},
 		"node_modules/tinycolor2": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.6.0.tgz",
-			"integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
+			"integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="
 		},
 		"node_modules/tinyqueue": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmmirror.com/tinyqueue/-/tinyqueue-2.0.3.tgz",
-			"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
+			"integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
+		},
+		"node_modules/to-fast-properties": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
 		"node_modules/to-float32": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/to-float32/-/to-float32-1.1.0.tgz",
-			"integrity": "sha512-keDnAusn/vc+R3iEiSDw8TOF7gPiTLdK1ArvWtYbJQiVfmRg6i/CAvbKq3uIS0vWroAC7ZecN3DjQKw3aSklUg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/to-float32/-/to-float32-1.1.0.tgz",
+			"integrity": "sha512-keDnAusn/vc+R3iEiSDw8TOF7gPiTLdK1ArvWtYbJQiVfmRg6i/CAvbKq3uIS0vWroAC7ZecN3DjQKw3aSklUg=="
 		},
 		"node_modules/to-px": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/to-px/-/to-px-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/to-px/-/to-px-1.0.1.tgz",
 			"integrity": "sha512-2y3LjBeIZYL19e5gczp14/uRWFDtDUErJPVN3VU9a7SJO+RjGRtYR47aMN2bZgGlxvW4ZcEz2ddUPVHXcMfuXw==",
-			"license": "MIT",
 			"dependencies": {
 				"parse-unit": "^1.0.1"
 			}
 		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
 			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"is-number": "^7.0.0"
 			},
@@ -10476,18 +9952,16 @@
 		},
 		"node_modules/toidentifier": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
 			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.6"
 			}
 		},
 		"node_modules/topojson-client": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/topojson-client/-/topojson-client-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz",
 			"integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
-			"license": "ISC",
 			"dependencies": {
 				"commander": "2"
 			},
@@ -10497,30 +9971,25 @@
 				"topoquantize": "bin/topoquantize"
 			}
 		},
-		"node_modules/topojson-client/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"license": "MIT"
-		},
 		"node_modules/touch": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmmirror.com/touch/-/touch-3.1.1.tgz",
-			"integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
+			"integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
 			"dev": true,
-			"license": "ISC",
+			"dependencies": {
+				"nopt": "~1.0.10"
+			},
 			"bin": {
 				"nodetouch": "bin/nodetouch.js"
 			}
 		},
 		"node_modules/ts-api-utils": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
-			"integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
+			"integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
-				"node": ">=16"
+				"node": ">=16.13.0"
 			},
 			"peerDependencies": {
 				"typescript": ">=4.2.0"
@@ -10528,10 +9997,9 @@
 		},
 		"node_modules/ts-loader": {
 			"version": "9.5.1",
-			"resolved": "https://registry.npmmirror.com/ts-loader/-/ts-loader-9.5.1.tgz",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
 			"integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"chalk": "^4.1.0",
 				"enhanced-resolve": "^5.0.0",
@@ -10547,41 +10015,106 @@
 				"webpack": "^5.0.0"
 			}
 		},
+		"node_modules/ts-loader/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/ts-loader/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/ts-loader/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/ts-loader/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/ts-loader/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/ts-loader/node_modules/source-map": {
 			"version": "0.7.4",
-			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
 			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
 			"dev": true,
-			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">= 8"
 			}
 		},
+		"node_modules/ts-loader/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/tslib": {
-			"version": "2.8.1",
-			"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz",
-			"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-			"license": "0BSD"
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+			"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
 		},
 		"node_modules/tty-browserify": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmmirror.com/tty-browserify/-/tty-browserify-0.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
 			"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/type": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmmirror.com/type/-/type-2.7.3.tgz",
-			"integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
-			"license": "ISC"
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+			"integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
 		},
 		"node_modules/type-check": {
 			"version": "0.4.0",
-			"resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
 			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"prelude-ls": "^1.2.1"
 			},
@@ -10590,21 +10123,19 @@
 			}
 		},
 		"node_modules/type-detect": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmmirror.com/type-detect/-/type-detect-4.1.0.tgz",
-			"integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/type-fest": {
 			"version": "0.20.2",
-			"resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
 			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
 			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
 			"engines": {
 				"node": ">=10"
 			},
@@ -10614,9 +10145,8 @@
 		},
 		"node_modules/type-is": {
 			"version": "1.6.18",
-			"resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
 			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-			"license": "MIT",
 			"dependencies": {
 				"media-typer": "0.3.0",
 				"mime-types": "~2.1.24"
@@ -10627,15 +10157,13 @@
 		},
 		"node_modules/typedarray": {
 			"version": "0.0.6",
-			"resolved": "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
 		},
 		"node_modules/typedarray-pool": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmmirror.com/typedarray-pool/-/typedarray-pool-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/typedarray-pool/-/typedarray-pool-1.2.0.tgz",
 			"integrity": "sha512-YTSQbzX43yvtpfRtIDAYygoYtgT+Rpjuxy9iOpczrjpXLgGoyG7aS5USJXV2d3nn8uHTeb9rXDvzS27zUg5KYQ==",
-			"license": "MIT",
 			"dependencies": {
 				"bit-twiddle": "^1.0.0",
 				"dup": "^1.0.0"
@@ -10643,10 +10171,9 @@
 		},
 		"node_modules/typescript": {
 			"version": "5.4.5",
-			"resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.4.5.tgz",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
 			"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
 			"devOptional": true,
-			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -10657,37 +10184,33 @@
 		},
 		"node_modules/undefsafe": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmmirror.com/undefsafe/-/undefsafe-2.0.5.tgz",
+			"resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
 			"integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/undici-types": {
 			"version": "5.26.5",
-			"resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
 			"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/unpipe": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
 			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/unquote": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/unquote/-/unquote-1.1.1.tgz",
-			"integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+			"integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
-			"integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
 			"dev": true,
 			"funding": [
 				{
@@ -10703,10 +10226,9 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
-			"license": "MIT",
 			"dependencies": {
-				"escalade": "^3.2.0",
-				"picocolors": "^1.1.0"
+				"escalade": "^3.1.1",
+				"picocolors": "^1.0.0"
 			},
 			"bin": {
 				"update-browserslist-db": "cli.js"
@@ -10717,55 +10239,61 @@
 		},
 		"node_modules/update-diff": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmmirror.com/update-diff/-/update-diff-1.1.0.tgz",
-			"integrity": "sha512-rCiBPiHxZwT4+sBhEbChzpO5hYHjm91kScWgdHf4Qeafs6Ba7MBl+d9GlGv72bcTZQO0sLmtQS1pHSWoCLtN/A==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/update-diff/-/update-diff-1.1.0.tgz",
+			"integrity": "sha512-rCiBPiHxZwT4+sBhEbChzpO5hYHjm91kScWgdHf4Qeafs6Ba7MBl+d9GlGv72bcTZQO0sLmtQS1pHSWoCLtN/A=="
 		},
 		"node_modules/update-input-width": {
 			"version": "1.4.2",
-			"resolved": "https://registry.npmmirror.com/update-input-width/-/update-input-width-1.4.2.tgz",
+			"resolved": "https://registry.npmjs.org/update-input-width/-/update-input-width-1.4.2.tgz",
 			"integrity": "sha512-/p0XLhrQQQ4bMWD7bL9duYObwYCO1qGr8R19xcMmoMSmXuQ7/1//veUnCObQ7/iW6E2pGS6rFkS4TfH4ur7e/g==",
-			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/wojtekmaj/update-input-width?sponsor=1"
 			}
 		},
 		"node_modules/uri-js": {
 			"version": "4.4.1",
-			"resolved": "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
 			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"punycode": "^2.1.0"
 			}
 		},
 		"node_modules/url": {
-			"version": "0.11.4",
-			"resolved": "https://registry.npmmirror.com/url/-/url-0.11.4.tgz",
-			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
+			"version": "0.11.3",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+			"integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"punycode": "^1.4.1",
-				"qs": "^6.12.3"
-			},
-			"engines": {
-				"node": ">= 0.4"
+				"qs": "^6.11.2"
 			}
 		},
 		"node_modules/url/node_modules/punycode": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
 			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+			"dev": true
+		},
+		"node_modules/url/node_modules/qs": {
+			"version": "6.11.2",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+			"integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
 			"dev": true,
-			"license": "MIT"
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/use-isomorphic-layout-effect": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
 			"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
-			"license": "MIT",
 			"peerDependencies": {
 				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			},
@@ -10776,19 +10304,17 @@
 			}
 		},
 		"node_modules/use-sync-external-store": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmmirror.com/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz",
-			"integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==",
-			"license": "MIT",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+			"integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
 			"peerDependencies": {
-				"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
 		"node_modules/usehooks-ts": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmmirror.com/usehooks-ts/-/usehooks-ts-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/usehooks-ts/-/usehooks-ts-3.1.0.tgz",
 			"integrity": "sha512-bBIa7yUyPhE1BCc0GmR96VU/15l/9gP1Ch5mYdLcFBaFGQsdmXkvjV0TtOqW1yUd6VjIwDunm+flSciCQXujiw==",
-			"license": "MIT",
 			"dependencies": {
 				"lodash.debounce": "^4.0.8"
 			},
@@ -10801,10 +10327,9 @@
 		},
 		"node_modules/util": {
 			"version": "0.12.5",
-			"resolved": "https://registry.npmmirror.com/util/-/util-0.12.5.tgz",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
 			"integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"is-arguments": "^1.0.4",
@@ -10815,70 +10340,54 @@
 		},
 		"node_modules/util-deprecate": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
 		},
 		"node_modules/utils-merge": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
 			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.4.0"
 			}
 		},
 		"node_modules/uuid": {
 			"version": "7.0.3",
-			"resolved": "https://registry.npmmirror.com/uuid/-/uuid-7.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
 			"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-			"license": "MIT",
 			"bin": {
 				"uuid": "dist/bin/uuid"
 			}
 		},
 		"node_modules/vary": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
 			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/vm-browserify": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
 			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/vt-pbf": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmmirror.com/vt-pbf/-/vt-pbf-3.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz",
 			"integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==",
-			"license": "MIT",
 			"dependencies": {
 				"@mapbox/point-geometry": "0.1.0",
 				"@mapbox/vector-tile": "^1.3.1",
 				"pbf": "^3.2.1"
 			}
 		},
-		"node_modules/warning": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmmirror.com/warning/-/warning-4.0.3.tgz",
-			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-			"license": "MIT",
-			"dependencies": {
-				"loose-envify": "^1.0.0"
-			}
-		},
 		"node_modules/watchpack": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.2.tgz",
-			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
@@ -10889,48 +10398,46 @@
 		},
 		"node_modules/weak-map": {
 			"version": "1.0.8",
-			"resolved": "https://registry.npmmirror.com/weak-map/-/weak-map-1.0.8.tgz",
-			"integrity": "sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw==",
-			"license": "Apache-2.0"
+			"resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.8.tgz",
+			"integrity": "sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw=="
 		},
 		"node_modules/webgl-context": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmmirror.com/webgl-context/-/webgl-context-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/webgl-context/-/webgl-context-2.2.0.tgz",
 			"integrity": "sha512-q/fGIivtqTT7PEoF07axFIlHNk/XCPaYpq64btnepopSWvKNFkoORlQYgqDigBIuGA1ExnFd/GnSUnBNEPQY7Q==",
-			"license": "MIT",
 			"dependencies": {
 				"get-canvas-context": "^1.0.1"
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.96.1",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
-			"integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/eslint-scope": "^3.7.7",
-				"@types/estree": "^1.0.6",
-				"@webassemblyjs/ast": "^1.12.1",
-				"@webassemblyjs/wasm-edit": "^1.12.1",
-				"@webassemblyjs/wasm-parser": "^1.12.1",
-				"acorn": "^8.14.0",
-				"browserslist": "^4.24.0",
+			"version": "5.76.3",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.3.tgz",
+			"integrity": "sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==",
+			"dev": true,
+			"dependencies": {
+				"@types/eslint-scope": "^3.7.3",
+				"@types/estree": "^0.0.51",
+				"@webassemblyjs/ast": "1.11.1",
+				"@webassemblyjs/wasm-edit": "1.11.1",
+				"@webassemblyjs/wasm-parser": "1.11.1",
+				"acorn": "^8.7.1",
+				"acorn-import-assertions": "^1.7.6",
+				"browserslist": "^4.14.5",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.17.1",
-				"es-module-lexer": "^1.2.1",
+				"enhanced-resolve": "^5.10.0",
+				"es-module-lexer": "^0.9.0",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.11",
+				"graceful-fs": "^4.2.9",
 				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
-				"schema-utils": "^3.2.0",
+				"schema-utils": "^3.1.0",
 				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.10",
-				"watchpack": "^2.4.1",
+				"terser-webpack-plugin": "^5.1.3",
+				"watchpack": "^2.4.0",
 				"webpack-sources": "^3.2.3"
 			},
 			"bin": {
@@ -10951,10 +10458,9 @@
 		},
 		"node_modules/webpack-cli": {
 			"version": "5.1.4",
-			"resolved": "https://registry.npmmirror.com/webpack-cli/-/webpack-cli-5.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
 			"integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@discoveryjs/json-ext": "^0.5.0",
 				"@webpack-cli/configtest": "^2.1.1",
@@ -10997,20 +10503,18 @@
 		},
 		"node_modules/webpack-cli/node_modules/commander": {
 			"version": "10.0.1",
-			"resolved": "https://registry.npmmirror.com/commander/-/commander-10.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
 			"integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=14"
 			}
 		},
 		"node_modules/webpack-merge": {
 			"version": "5.10.0",
-			"resolved": "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-5.10.0.tgz",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
 			"integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"clone-deep": "^4.0.1",
 				"flat": "^5.0.2",
@@ -11022,20 +10526,18 @@
 		},
 		"node_modules/webpack-sources": {
 			"version": "3.2.3",
-			"resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
+			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
 			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=10.13.0"
 			}
 		},
 		"node_modules/webpack/node_modules/eslint-scope": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
 			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"dependencies": {
 				"esrecurse": "^4.3.0",
 				"estraverse": "^4.1.1"
@@ -11046,20 +10548,36 @@
 		},
 		"node_modules/webpack/node_modules/estraverse": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
 			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
 			"dev": true,
-			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
+		"node_modules/webpack/node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
 		"node_modules/which": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dev": true,
-			"license": "ISC",
 			"dependencies": {
 				"isexe": "^2.0.0"
 			},
@@ -11071,17 +10589,16 @@
 			}
 		},
 		"node_modules/which-typed-array": {
-			"version": "1.1.16",
-			"resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.16.tgz",
-			"integrity": "sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+			"integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
-				"available-typed-arrays": "^1.0.7",
-				"call-bind": "^1.0.7",
+				"available-typed-arrays": "^1.0.5",
+				"call-bind": "^1.0.4",
 				"for-each": "^0.3.3",
 				"gopd": "^1.0.1",
-				"has-tostringtag": "^1.0.2"
+				"has-tostringtag": "^1.0.0"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -11092,43 +10609,37 @@
 		},
 		"node_modules/wildcard": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-2.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
 			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-			"dev": true,
-			"license": "MIT"
+			"dev": true
 		},
 		"node_modules/word-wrap": {
 			"version": "1.2.5",
-			"resolved": "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
 			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/workerpool": {
 			"version": "6.2.1",
-			"resolved": "https://registry.npmmirror.com/workerpool/-/workerpool-6.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
 			"integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
-			"dev": true,
-			"license": "Apache-2.0"
+			"dev": true
 		},
 		"node_modules/world-calendars": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmmirror.com/world-calendars/-/world-calendars-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/world-calendars/-/world-calendars-1.0.3.tgz",
 			"integrity": "sha512-sAjLZkBnsbHkHWVhrsCU5Sa/EVuf9QqgvrN8zyJ2L/F9FR9Oc6CvVK0674+PGAtmmmYQMH98tCUSO4QLQv3/TQ==",
-			"license": "MIT",
 			"dependencies": {
 				"object-assign": "^4.1.0"
 			}
 		},
 		"node_modules/wrap-ansi": {
 			"version": "7.0.0",
-			"resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
 			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"string-width": "^4.1.0",
@@ -11141,17 +10652,48 @@
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
+		"node_modules/wrap-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/wrap-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
 		"node_modules/wrappy": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-			"license": "ISC"
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
 		},
 		"node_modules/xml2js": {
 			"version": "0.5.0",
-			"resolved": "https://registry.npmmirror.com/xml2js/-/xml2js-0.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
 			"integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
-			"license": "MIT",
 			"dependencies": {
 				"sax": ">=0.6.0",
 				"xmlbuilder": "~11.0.0"
@@ -11162,47 +10704,42 @@
 		},
 		"node_modules/xmlbuilder": {
 			"version": "11.0.1",
-			"resolved": "https://registry.npmmirror.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
 			"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=4.0"
 			}
 		},
 		"node_modules/xtend": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
 			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-			"license": "MIT",
 			"engines": {
 				"node": ">=0.4"
 			}
 		},
 		"node_modules/y18n": {
 			"version": "5.0.8",
-			"resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
 			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true,
-			"license": "ISC",
 			"engines": {
 				"node": ">=10"
 			}
 		},
 		"node_modules/yaml": {
 			"version": "1.10.2",
-			"resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
 			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-			"license": "ISC",
 			"engines": {
 				"node": ">= 6"
 			}
 		},
 		"node_modules/yargs": {
 			"version": "16.2.0",
-			"resolved": "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
 			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"cliui": "^7.0.2",
 				"escalade": "^3.1.1",
@@ -11218,20 +10755,18 @@
 		},
 		"node_modules/yargs-parser": {
 			"version": "20.2.4",
-			"resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.4.tgz",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
 			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
 			"dev": true,
-			"license": "ISC",
 			"engines": {
 				"node": ">=10"
 			}
 		},
 		"node_modules/yargs-unparser": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmmirror.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
 			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"camelcase": "^6.0.0",
 				"decamelize": "^4.0.0",
@@ -11244,20 +10779,18 @@
 		},
 		"node_modules/yargs-unparser/node_modules/is-plain-obj": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
 			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
 		"node_modules/yocto-queue": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
 			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -11266,4 +10799,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index b6d46e713..d8563288f 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 	"scripts": {
 		"start": "node ./src/bin/www",
 		"start:dev": "nodemon --legacy-watch --inspect=0.0.0.0 ./src/bin/www",
+		"checkWebsiteStatus": "node src/server/services/checkWebsiteStatus.js",
 		"webpack:dev": "webpack watch --color --progress --mode development",
 		"webpack:build": "webpack build --node-env production",
 		"webpack": "webpack build --color --progress --mode development",
@@ -43,7 +44,8 @@
 		"generateCosineSquaredTestingData": "node -e 'require(\"./src/server/data/automatedTestingData\").generateCosineSquaredTestingData(2.5)'",
 		"generateTestingData": "node -e 'require(\"./src/server/data/automatedTestingData\").generateTestingData()'",
 		"testData": "node -e 'require(\"./src/server/data/automatedTestingData.js\").insertSpecialUnitsConversionsMetersGroups()'",
-		"webData": "node -e 'require(\"./src/server/data/websiteData.js\").insertWebsiteData()'"
+		"webData": "node -e 'require(\"./src/server/data/websiteData.js\").insertWebsiteData()'",
+		"addLogMsg": "node -e 'require(\"./src/server/services/addLogMsg.js\").addLogMsgToDB()'"
 	},
 	"nodemonConfig": {
 		"watch": [
@@ -56,10 +58,9 @@
 		]
 	},
 	"dependencies": {
-		"@plotly/mapbox-gl": "~1.13.4",
 		"@reduxjs/toolkit": "~2.2.5",
 		"@wojtekmaj/react-daterange-picker": "~6.0.0",
-		"axios": "~1.7.7",
+		"axios": "~1.6.2",
 		"bcryptjs": "~2.4.3",
 		"body-parser": "~1.20.2",
 		"bootstrap": "~5.3.3",
@@ -68,7 +69,7 @@
 		"d3": "~7.8.5",
 		"dotenv": "~16.4.5",
 		"escape-html": "~1.0.3",
-		"express": "~4.21.1",
+		"express": "~4.19.2",
 		"express-rate-limit": "~7.2.0",
 		"history": "~5.3.0",
 		"ini": "~4.1.3",
@@ -133,7 +134,7 @@
 		"terser-webpack-plugin": "~5.3.10",
 		"ts-loader": "~9.5.1",
 		"typescript": "~5.4.5",
-		"webpack": "~5.96.1",
+		"webpack": "~5.76.0",
 		"webpack-cli": "~5.1.4"
 	}
-}
+}
\ No newline at end of file
diff --git a/src/server/test/web/readingsCompareGroupQuantity.js b/src/server/test/web/readingsCompareGroupQuantity.js
index 3d4762b63..7cf4dcb36 100644
--- a/src/server/test/web/readingsCompareGroupQuantity.js
+++ b/src/server/test/web/readingsCompareGroupQuantity.js
@@ -58,8 +58,7 @@ mocha.describe('readings API', () => {
 
 				// Add CG5 here
 
-				// Add CG6 here
-				mocha.it('CG6: 28-day shift end 2022-10-31 17:12:34 for 15-minute reading intervals and quantity units & kWh as kWh', async () => { //test description
+				mocha.it('CG6: 28 day shift end 2022-10-31 17:12:34 (partial hour) for 15 minute reading intervals and quantity units & kWh as kWh', async () => { //test description
 					await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWhGroups, groupDatakWh); // prepare test environment
 					// Get the unit ID since the DB could use any value.
 					const unitId = await getUnitId('kWh');

From 1dd6bcd5d6c7c431815d3bcba85c8a9ab2d93e48 Mon Sep 17 00:00:00 2001
From: nmqng <ngmqng@gmail.com>
Date: Fri, 20 Dec 2024 17:46:14 -0500
Subject: [PATCH 128/128] remove lighting sign for text for en language

---
 src/client/app/translations/data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index fe64e0f3c..b757f61e8 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -397,7 +397,7 @@ const LocaleTranslationData = {
 		"page.choice.login": "Page choices & login",
 		"page.choice.logout": "Page choices & logout",
 		"page.restart.button": "Restart OED session",
-		"page.user.refresh.directions": "If clicking the \"Return to Dashboard\" button does not work then please click the button below to restart your OED session\u{26A1}",
+		"page.user.refresh.directions": "If clicking the \"Return to Dashboard\" button does not work then please click the button below to restart your OED session",
 		"password": "Password: ",
 		"password.confirm": "Confirm password: ",
 		"per.day": "Per Day",