From 7f3ad069ec127a14f6f96c45a78a58c3076340e1 Mon Sep 17 00:00:00 2001 From: "@mmogesdesigns" Date: Wed, 25 Sep 2024 17:33:58 -0700 Subject: [PATCH 1/4] Updated guide infobox background to #EEF1F4 and added bottom padding for consistency --- client/package-lock.json | 337 +++++++----------- .../WizardPages/DiscoverTooltips.js | 4 +- package-lock.json | 25 +- 3 files changed, 151 insertions(+), 215 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index ce6494b9..16ff851c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -82,6 +82,7 @@ }, "node_modules/@ampproject/remapping": { "version": "2.2.1", + "dev": true, "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", @@ -177,6 +178,7 @@ }, "node_modules/@babel/compat-data": { "version": "7.23.2", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -184,6 +186,7 @@ }, "node_modules/@babel/core": { "version": "7.23.2", + "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -212,6 +215,7 @@ }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -252,6 +256,7 @@ }, "node_modules/@babel/generator": { "version": "7.23.0", + "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.23.0", @@ -286,6 +291,7 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.22.15", + "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.9", @@ -300,6 +306,7 @@ }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -408,6 +415,7 @@ }, "node_modules/@babel/helper-hoist-variables": { "version": "7.22.5", + "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" @@ -438,6 +446,7 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.23.0", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", @@ -503,6 +512,7 @@ }, "node_modules/@babel/helper-simple-access": { "version": "7.22.5", + "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" @@ -547,6 +557,7 @@ }, "node_modules/@babel/helper-validator-option": { "version": "7.22.15", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -567,6 +578,7 @@ }, "node_modules/@babel/helpers": { "version": "7.23.2", + "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.22.15", @@ -2131,6 +2143,7 @@ }, "node_modules/@babel/traverse": { "version": "7.23.2", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.22.13", @@ -2912,6 +2925,7 @@ }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.0.1", @@ -2924,6 +2938,7 @@ }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.1", + "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -2931,6 +2946,7 @@ }, "node_modules/@jridgewell/set-array": { "version": "1.1.2", + "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -2947,10 +2963,12 @@ }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", + "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.20", + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -5108,53 +5126,6 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "node_modules/babel-plugin-macros": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", - "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", - "dev": true, - "peer": true, - "dependencies": { - "@babel/runtime": "^7.7.2", - "cosmiconfig": "^6.0.0", - "resolve": "^1.12.0" - } - }, - "node_modules/babel-plugin-macros/node_modules/cosmiconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.1.0", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.7.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-plugin-macros/node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, - "peer": true, - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/babel-plugin-named-asset-import": { "version": "0.3.8", "dev": true, @@ -5506,6 +5477,7 @@ }, "node_modules/browserslist": { "version": "4.22.1", + "dev": true, "funding": [ { "type": "opencollective", @@ -5641,6 +5613,7 @@ }, "node_modules/caniuse-lite": { "version": "1.0.30001561", + "dev": true, "funding": [ { "type": "opencollective", @@ -6060,6 +6033,7 @@ }, "node_modules/convert-source-map": { "version": "2.0.0", + "dev": true, "license": "MIT" }, "node_modules/cookie": { @@ -7146,6 +7120,7 @@ }, "node_modules/electron-to-chromium": { "version": "1.4.578", + "dev": true, "license": "ISC" }, "node_modules/emoji-regex": { @@ -7346,6 +7321,7 @@ }, "node_modules/escalade": { "version": "3.1.1", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -8739,6 +8715,7 @@ }, "node_modules/gensync": { "version": "1.0.0-beta.2", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -8877,6 +8854,7 @@ }, "node_modules/globals": { "version": "11.12.0", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -11045,6 +11023,7 @@ }, "node_modules/jsesc": { "version": "2.5.2", + "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -11083,6 +11062,7 @@ }, "node_modules/json5": { "version": "2.2.3", + "dev": true, "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -11820,6 +11800,7 @@ }, "node_modules/lru-cache": { "version": "5.1.1", + "dev": true, "license": "ISC", "dependencies": { "yallist": "^3.0.2" @@ -12200,6 +12181,7 @@ }, "node_modules/node-releases": { "version": "2.0.13", + "dev": true, "license": "MIT" }, "node_modules/normalize-path": { @@ -12647,6 +12629,7 @@ }, "node_modules/picocolors": { "version": "1.0.0", + "dev": true, "license": "ISC" }, "node_modules/picomatch": { @@ -18279,20 +18262,6 @@ "is-typedarray": "^1.0.0" } }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "node_modules/unbox-primitive": { "version": "1.0.2", "dev": true, @@ -18425,6 +18394,7 @@ }, "node_modules/update-browserslist-db": { "version": "1.0.13", + "dev": true, "funding": [ { "type": "opencollective", @@ -19375,6 +19345,7 @@ }, "node_modules/yallist": { "version": "3.1.1", + "dev": true, "license": "ISC" }, "node_modules/yaml": { @@ -19433,6 +19404,7 @@ }, "@ampproject/remapping": { "version": "2.2.1", + "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -19492,10 +19464,12 @@ } }, "@babel/compat-data": { - "version": "7.23.2" + "version": "7.23.2", + "dev": true }, "@babel/core": { "version": "7.23.2", + "dev": true, "requires": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", @@ -19515,7 +19489,8 @@ }, "dependencies": { "semver": { - "version": "6.3.1" + "version": "6.3.1", + "dev": true } } }, @@ -19540,6 +19515,7 @@ }, "@babel/generator": { "version": "7.23.0", + "dev": true, "requires": { "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", @@ -19562,6 +19538,7 @@ }, "@babel/helper-compilation-targets": { "version": "7.22.15", + "dev": true, "requires": { "@babel/compat-data": "^7.22.9", "@babel/helper-validator-option": "^7.22.15", @@ -19571,7 +19548,8 @@ }, "dependencies": { "semver": { - "version": "6.3.1" + "version": "6.3.1", + "dev": true } } }, @@ -19643,6 +19621,7 @@ }, "@babel/helper-hoist-variables": { "version": "7.22.5", + "dev": true, "requires": { "@babel/types": "^7.22.5" } @@ -19661,6 +19640,7 @@ }, "@babel/helper-module-transforms": { "version": "7.23.0", + "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -19697,6 +19677,7 @@ }, "@babel/helper-simple-access": { "version": "7.22.5", + "dev": true, "requires": { "@babel/types": "^7.22.5" } @@ -19720,7 +19701,8 @@ "version": "7.22.20" }, "@babel/helper-validator-option": { - "version": "7.22.15" + "version": "7.22.15", + "dev": true }, "@babel/helper-wrap-function": { "version": "7.22.20", @@ -19733,6 +19715,7 @@ }, "@babel/helpers": { "version": "7.23.2", + "dev": true, "requires": { "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.2", @@ -20581,8 +20564,7 @@ "version": "7.21.0-placeholder-for-preset-env.2", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", - "dev": true, - "requires": {} + "dev": true }, "semver": { "version": "6.3.1", @@ -20642,6 +20624,7 @@ }, "@babel/traverse": { "version": "7.23.2", + "dev": true, "requires": { "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.23.0", @@ -20771,13 +20754,11 @@ }, "@csstools/postcss-unset-value": { "version": "1.0.2", - "dev": true, - "requires": {} + "dev": true }, "@csstools/selector-specificity": { "version": "2.2.0", - "dev": true, - "requires": {} + "dev": true }, "@emotion/babel-plugin": { "version": "11.11.0", @@ -20888,8 +20869,7 @@ "version": "0.8.1" }, "@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.0.1", - "requires": {} + "version": "1.0.1" }, "@emotion/utils": { "version": "1.2.1" @@ -21110,6 +21090,7 @@ }, "@jridgewell/gen-mapping": { "version": "0.3.3", + "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -21117,10 +21098,12 @@ } }, "@jridgewell/resolve-uri": { - "version": "3.1.1" + "version": "3.1.1", + "dev": true }, "@jridgewell/set-array": { - "version": "1.1.2" + "version": "1.1.2", + "dev": true }, "@jridgewell/source-map": { "version": "0.3.5", @@ -21131,10 +21114,12 @@ } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.15" + "version": "1.4.15", + "dev": true }, "@jridgewell/trace-mapping": { "version": "0.3.20", + "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -21628,8 +21613,7 @@ }, "@testing-library/user-event": { "version": "14.5.1", - "dev": true, - "requires": {} + "dev": true }, "@tootallnate/once": { "version": "1.1.2", @@ -22238,12 +22222,10 @@ "version": "1.9.5", "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", - "dev": true, - "requires": {} + "dev": true }, "acorn-jsx": { - "version": "5.3.2", - "requires": {} + "version": "5.3.2" }, "acorn-walk": { "version": "7.2.0", @@ -22565,8 +22547,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -22606,50 +22587,9 @@ "@types/babel__traverse": "^7.0.6" } }, - "babel-plugin-macros": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", - "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", - "dev": true, - "peer": true, - "requires": { - "@babel/runtime": "^7.7.2", - "cosmiconfig": "^6.0.0", - "resolve": "^1.12.0" - }, - "dependencies": { - "cosmiconfig": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", - "dev": true, - "peer": true, - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.1.0", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.7.2" - } - }, - "resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, - "peer": true, - "requires": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - } - } - }, "babel-plugin-named-asset-import": { "version": "0.3.8", - "dev": true, - "requires": {} + "dev": true }, "babel-plugin-polyfill-corejs2": { "version": "0.4.6", @@ -22907,6 +22847,7 @@ }, "browserslist": { "version": "4.22.1", + "dev": true, "requires": { "caniuse-lite": "^1.0.30001541", "electron-to-chromium": "^1.4.535", @@ -22980,7 +22921,8 @@ } }, "caniuse-lite": { - "version": "1.0.30001561" + "version": "1.0.30001561", + "dev": true }, "case-sensitive-paths-webpack-plugin": { "version": "2.4.0", @@ -23248,7 +23190,8 @@ "dev": true }, "convert-source-map": { - "version": "2.0.0" + "version": "2.0.0", + "dev": true }, "cookie": { "version": "0.6.0", @@ -23332,8 +23275,7 @@ }, "css-declaration-sorter": { "version": "6.4.1", - "dev": true, - "requires": {} + "dev": true }, "css-has-pseudo": { "version": "3.0.4", @@ -23401,8 +23343,7 @@ }, "css-prefers-color-scheme": { "version": "6.0.3", - "dev": true, - "requires": {} + "dev": true }, "css-select": { "version": "4.3.0", @@ -23502,8 +23443,7 @@ }, "cssnano-utils": { "version": "3.1.0", - "dev": true, - "requires": {} + "dev": true }, "csso": { "version": "4.2.0", @@ -23938,7 +23878,8 @@ } }, "electron-to-chromium": { - "version": "1.4.578" + "version": "1.4.578", + "dev": true }, "emoji-regex": { "version": "10.3.0" @@ -24094,7 +24035,8 @@ } }, "escalade": { - "version": "3.1.1" + "version": "3.1.1", + "dev": true }, "escape-html": { "version": "1.0.3" @@ -24232,8 +24174,7 @@ "version": "9.0.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", - "dev": true, - "requires": {} + "dev": true }, "eslint-config-react-app": { "version": "7.0.1", @@ -24428,8 +24369,7 @@ }, "eslint-plugin-react-hooks": { "version": "4.6.0", - "dev": true, - "requires": {} + "dev": true }, "eslint-plugin-testing-library": { "version": "5.11.1", @@ -24859,8 +24799,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "chalk": { "version": "4.1.2", @@ -24987,7 +24926,8 @@ "version": "1.2.3" }, "gensync": { - "version": "1.0.0-beta.2" + "version": "1.0.0-beta.2", + "dev": true }, "get-caller-file": { "version": "2.0.5", @@ -25074,7 +25014,8 @@ } }, "globals": { - "version": "11.12.0" + "version": "11.12.0", + "dev": true }, "globalthis": { "version": "1.0.3", @@ -25361,8 +25302,7 @@ }, "icss-utils": { "version": "5.1.0", - "dev": true, - "requires": {} + "dev": true }, "idb": { "version": "7.1.1", @@ -26327,8 +26267,7 @@ }, "jest-pnp-resolver": { "version": "1.2.3", - "dev": true, - "requires": {} + "dev": true }, "jest-regex-util": { "version": "27.5.1", @@ -26553,7 +26492,8 @@ } }, "jsesc": { - "version": "2.5.2" + "version": "2.5.2", + "dev": true }, "json-buffer": { "version": "3.0.1" @@ -26579,7 +26519,8 @@ "dev": true }, "json5": { - "version": "2.2.3" + "version": "2.2.3", + "dev": true }, "jsonfile": { "version": "6.1.0", @@ -27079,6 +27020,7 @@ }, "lru-cache": { "version": "5.1.1", + "dev": true, "requires": { "yallist": "^3.0.2" } @@ -27310,7 +27252,8 @@ "dev": true }, "node-releases": { - "version": "2.0.13" + "version": "2.0.13", + "dev": true }, "normalize-path": { "version": "3.0.0", @@ -27583,7 +27526,8 @@ "dev": true }, "picocolors": { - "version": "1.0.0" + "version": "1.0.0", + "dev": true }, "picomatch": { "version": "2.3.1", @@ -27701,8 +27645,7 @@ }, "postcss-browser-comments": { "version": "4.0.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-calc": { "version": "8.2.4", @@ -27788,23 +27731,19 @@ }, "postcss-discard-comments": { "version": "5.1.2", - "dev": true, - "requires": {} + "dev": true }, "postcss-discard-duplicates": { "version": "5.1.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-discard-empty": { "version": "5.1.1", - "dev": true, - "requires": {} + "dev": true }, "postcss-discard-overridden": { "version": "5.1.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-double-position-gradients": { "version": "3.1.2", @@ -27823,8 +27762,7 @@ }, "postcss-flexbugs-fixes": { "version": "5.0.2", - "dev": true, - "requires": {} + "dev": true }, "postcss-focus-visible": { "version": "6.0.4", @@ -27842,13 +27780,11 @@ }, "postcss-font-variant": { "version": "5.0.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-gap-properties": { "version": "3.0.5", - "dev": true, - "requires": {} + "dev": true }, "postcss-image-set-function": { "version": "4.0.7", @@ -27879,8 +27815,7 @@ }, "postcss-initial": { "version": "4.0.1", - "dev": true, - "requires": {} + "dev": true }, "postcss-js": { "version": "4.0.1", @@ -27922,13 +27857,11 @@ }, "postcss-logical": { "version": "5.0.4", - "dev": true, - "requires": {} + "dev": true }, "postcss-media-minmax": { "version": "5.0.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-merge-longhand": { "version": "5.1.7", @@ -27982,8 +27915,7 @@ }, "postcss-modules-extract-imports": { "version": "3.0.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-modules-local-by-default": { "version": "4.0.3", @@ -28034,8 +27966,7 @@ }, "postcss-normalize-charset": { "version": "5.1.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -28097,8 +28028,7 @@ }, "postcss-opacity-percentage": { "version": "1.1.3", - "dev": true, - "requires": {} + "dev": true }, "postcss-ordered-values": { "version": "5.1.3", @@ -28117,8 +28047,7 @@ }, "postcss-page-break": { "version": "3.0.4", - "dev": true, - "requires": {} + "dev": true }, "postcss-place": { "version": "7.0.5", @@ -28206,8 +28135,7 @@ }, "postcss-replace-overflow-wrap": { "version": "4.0.0", - "dev": true, - "requires": {} + "dev": true }, "postcss-selector-not": { "version": "6.0.1", @@ -28630,8 +28558,7 @@ "react-icons": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.2.1.tgz", - "integrity": "sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==", - "requires": {} + "integrity": "sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==" }, "react-input-mask": { "version": "2.0.4", @@ -28686,8 +28613,7 @@ "react-onclickoutside": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", - "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", - "requires": {} + "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==" }, "react-popper": { "version": "2.3.0", @@ -29760,8 +29686,7 @@ } }, "react-to-print": { - "version": "2.14.15", - "requires": {} + "version": "2.14.15" }, "react-tooltip": { "version": "5.22.0", @@ -29782,8 +29707,7 @@ } }, "reactjs-popup": { - "version": "2.0.6", - "requires": {} + "version": "2.0.6" }, "read-cache": { "version": "1.0.0", @@ -30168,8 +30092,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "json-schema-traverse": { "version": "0.4.1", @@ -30724,8 +30647,7 @@ }, "style-loader": { "version": "3.3.3", - "dev": true, - "requires": {} + "dev": true }, "stylehacks": { "version": "5.1.1", @@ -31264,13 +31186,6 @@ "is-typedarray": "^1.0.0" } }, - "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, - "peer": true - }, "unbox-primitive": { "version": "1.0.2", "dev": true, @@ -31359,6 +31274,7 @@ }, "update-browserslist-db": { "version": "1.0.13", + "dev": true, "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -31381,12 +31297,10 @@ } }, "use-isomorphic-layout-effect": { - "version": "1.1.2", - "requires": {} + "version": "1.1.2" }, "use-memo-one": { - "version": "1.1.3", - "requires": {} + "version": "1.1.3" }, "util-deprecate": { "version": "1.0.2" @@ -31595,8 +31509,7 @@ "version": "8.18.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -32014,8 +31927,7 @@ "version": "7.5.10", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", - "dev": true, - "requires": {} + "dev": true }, "xml-name-validator": { "version": "3.0.0", @@ -32036,7 +31948,8 @@ "dev": true }, "yallist": { - "version": "3.1.1" + "version": "3.1.1", + "dev": true }, "yaml": { "version": "1.10.2" diff --git a/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js b/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js index 28acadb4..caf7ddd1 100644 --- a/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js +++ b/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js @@ -4,9 +4,9 @@ import { createUseStyles } from "react-jss"; const useStyles = createUseStyles({ container: { width: "calc((100% / 14.5) * 3);", - background: "#e9e9f1", + background: "#EEF1F4", padding: "1em", - paddingBottom: "0", + paddingBottom: "1em", position: "absolute", left: "23.5px", textAlign: "initial" diff --git a/package-lock.json b/package-lock.json index aada0e32..d623e78e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4255,7 +4255,6 @@ }, "node_modules/js-tokens": { "version": "4.0.0", - "dev": true, "license": "MIT" }, "node_modules/js-yaml": { @@ -4802,6 +4801,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "peer": true, + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -6736,6 +6747,18 @@ "node": ">=8" } }, + "node_modules/react": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", + "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/react-csv": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/react-csv/-/react-csv-2.2.2.tgz", From b5b8ce575ee941dcf7ac1d88a995ee1227338470 Mon Sep 17 00:00:00 2001 From: "@mmogesdesigns" Date: Wed, 2 Oct 2024 17:16:31 -0700 Subject: [PATCH 2/4] Updated container background to use theme lightGray --- .../components/ProjectWizard/WizardPages/DiscoverTooltips.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js b/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js index caf7ddd1..348977c8 100644 --- a/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js +++ b/client/src/components/ProjectWizard/WizardPages/DiscoverTooltips.js @@ -1,10 +1,11 @@ import React from "react"; import { createUseStyles } from "react-jss"; +import { jssTheme } from "../../../styles/theme"; const useStyles = createUseStyles({ container: { width: "calc((100% / 14.5) * 3);", - background: "#EEF1F4", + background: jssTheme.colors.secondary.lightGray, padding: "1em", paddingBottom: "1em", position: "absolute", From 353fe7a06c4e3ba838130ab8f0e8fb954c8fb5eb Mon Sep 17 00:00:00 2001 From: "@mmogesdesigns" Date: Wed, 8 Jan 2025 17:54:50 -0800 Subject: [PATCH 3/4] Changes to tooltip --- .../WizardSidebar/EarnedPointsProgress.js | 79 ++++++++++++++++--- .../WizardSidebar/SidebarProjectLevel.js | 78 ++++++++++-------- client/src/components/ToolTip/ToolTip.js | 6 +- client/src/components/ToolTip/ToolTipLabel.js | 31 +++----- 4 files changed, 122 insertions(+), 72 deletions(-) diff --git a/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js b/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js index acab8827..3b71bfb2 100644 --- a/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js +++ b/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js @@ -3,6 +3,7 @@ import PropTypes from "prop-types"; import { createUseStyles, useTheme } from "react-jss"; import ToolTipIcon from "../../ToolTip/ToolTipIcon"; import clsx from "clsx"; +import { Tooltip } from "react-tooltip"; /* See https://css-tricks.com/building-progress-ring-quickly/ @@ -107,11 +108,27 @@ const useStyles = createUseStyles({ } }); -const EarnedPointsProgress = props => { +// const EarnedPointsProgress = props => { +// const theme = useTheme(); +// const classes = useStyles({ theme }); + +// const { rulesConfig } = props; +// const radius = DIAL_RADIUS; +// const stroke = STROKE_WIDTH; + +// const target = rulesConfig.targetPointsRule.value || 0; +// const earned = rulesConfig.earnedPointsRule.value || 0; + +// const normalizedRadius = radius - stroke * 2; +// const circumference = normalizedRadius * 2 * Math.PI; +// const strokeDashoffset = Math.max( +// 0, +// target ? circumference - (earned / target) * 0.875 * circumference : 0 +// ); +const EarnedPointsProgress = ({ rulesConfig }) => { const theme = useTheme(); const classes = useStyles({ theme }); - const { rulesConfig } = props; const radius = DIAL_RADIUS; const stroke = STROKE_WIDTH; @@ -142,23 +159,45 @@ const EarnedPointsProgress = props => {
TARGET
Earned Points: " + rulesConfig.earnedPointsRule.description + "

Target Points: " + rulesConfig.targetPointsRule.description + "

" } - data-iscapture="true" - data-html="true" - data-class={ - target > 0 - ? classes.tooltip - : clsx(classes.tooltip, classes.noDisplay) - } - className={classes.tooltipIcon} + className={clsx( + classes.tooltipIcon, + target > 0 ? "" : classes.noDisplay + )} > - + + + + + {`

Earned Points: ${rulesConfig.earnedPointsRule.description}

+

Target Points: ${rulesConfig.targetPointsRule.description}

`} +
{ ); }; +// EarnedPointsProgress.propTypes = { +// rulesConfig: PropTypes.object +// }; EarnedPointsProgress.propTypes = { - rulesConfig: PropTypes.object + rulesConfig: PropTypes.shape({ + targetPointsRule: PropTypes.shape({ + value: PropTypes.number, + code: PropTypes.string, + description: PropTypes.string + }).isRequired, + earnedPointsRule: PropTypes.shape({ + value: PropTypes.number, + code: PropTypes.string, + description: PropTypes.string + }).isRequired + }).isRequired }; export default EarnedPointsProgress; diff --git a/client/src/components/ProjectWizard/WizardSidebar/SidebarProjectLevel.js b/client/src/components/ProjectWizard/WizardSidebar/SidebarProjectLevel.js index 5cde8570..a379fd18 100644 --- a/client/src/components/ProjectWizard/WizardSidebar/SidebarProjectLevel.js +++ b/client/src/components/ProjectWizard/WizardSidebar/SidebarProjectLevel.js @@ -3,6 +3,7 @@ import PropTypes from "prop-types"; import { createUseStyles } from "react-jss"; import ToolTipIcon from "../../ToolTip/ToolTipIcon"; import clsx from "clsx"; +import { Tooltip } from "react-tooltip"; const useStyles = createUseStyles({ projectLevelHeader: { @@ -27,58 +28,67 @@ const useStyles = createUseStyles({ }, lowOpacity: { opacity: 0.4 - }, - noDisplay: { - display: "none !important" - }, - tooltip: { - color: "rgb(30, 36, 63) !important", - padding: "15px", - minWidth: "200px", - maxWidth: "400px", - fontFamily: "Arial", - fontSize: 12, - lineHeight: "16px", - fontWeight: "bold", - boxShadow: "0px 0px 8px rgba(0, 46, 109, 0.2)", - borderRadius: 2, - "&.show": { - visibility: "visible !important", - opacity: "1 !important" - } } }); const SidebarProjectLevel = ({ level, rules }) => { const classes = useStyles(); - const tipText = rules[0].description; - const opacityTest = level === 0 ? classes.lowOpacity : ""; - const noToolTip = level === 0 ? classes.noDisplay : ""; + const tipText = rules[0]?.description || ""; return ( -
+

{level}

PROJECT LEVEL - - - + {level > 0 && ( + + + + )}

+ + {/* Tooltip Component */} + + {tipText} +
); }; SidebarProjectLevel.propTypes = { - level: PropTypes.number, - rules: PropTypes.array + level: PropTypes.number.isRequired, + rules: PropTypes.arrayOf( + PropTypes.shape({ + description: PropTypes.string.isRequired + }) + ).isRequired }; export default SidebarProjectLevel; diff --git a/client/src/components/ToolTip/ToolTip.js b/client/src/components/ToolTip/ToolTip.js index 587bb5e8..d54ddb1a 100644 --- a/client/src/components/ToolTip/ToolTip.js +++ b/client/src/components/ToolTip/ToolTip.js @@ -8,9 +8,9 @@ const ToolTip = ({ id }) => { ({ labelWrapper: { @@ -55,11 +56,7 @@ const useStyles = createUseStyles(theme => ({ lineHeight: "16px", fontWeight: "bold", boxShadow: "0px 0px 8px rgba(0, 46, 109, 0.2)", - borderRadius: 2, - "&.show": { - visibility: "visible !important", - opacity: "1 !important" - } + borderRadius: 2 }, requiredInputLabel: { "&:after": { @@ -121,20 +118,17 @@ const ToolTipLabel = ({ ? clsx(classes.accordionLabel, requiredStyle, disabledStyle) : clsx(classes.tooltipLabel, requiredStyle, disabledStyle) } - data-class={classes.tooltip} - data-for={id} - data-tip={tooltipContent} - data-iscapture="true" - data-html="true" + data-tooltip-id={id} // Correctly associate tooltip with ID + data-tooltip-content={tooltipContent} // Tooltip content > {children} + {description ? ( - {/* */} ) : null} @@ -152,7 +146,7 @@ const ToolTipLabel = ({ onClick={descriptionHandler} > + {description ? ( Date: Sun, 2 Feb 2025 14:01:30 -0800 Subject: [PATCH 4/4] Modifications to PR #2023 per new Issue #1997 --- client/package-lock.json | 466 ++++++++++++------ client/src/components/Layout/NavBarLogin.js | 91 +++- .../RuleCalculation/RuleCalculation.js | 46 +- .../WizardSidebar/EarnedPointsProgress.js | 85 ++-- .../WizardSidebar/SidebarProjectLevel.js | 66 +-- client/src/styles/theme.js | 2 + package-lock.json | 9 +- ...0250202.1351__edit_park_ratio_tooltip_.sql | 20 + 8 files changed, 536 insertions(+), 249 deletions(-) create mode 100644 server/db/migration/V20250202.1351__edit_park_ratio_tooltip_.sql diff --git a/client/package-lock.json b/client/package-lock.json index 16ff851c..34577383 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "tdm-calculator-client", - "version": "0.2.51", + "version": "0.2.53", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tdm-calculator-client", - "version": "0.2.51", + "version": "0.2.53", "dependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@react-pdf/renderer": "^3.1.9", @@ -33,6 +33,7 @@ "react-router-dom": "^6.18.0", "react-select": "^5.2.2", "react-string-replace": "^1.1.0", + "react-tiny-popover": "^8.1.2", "react-to-print": "^2.14.12", "react-tooltip": "^5.22.0", "reactjs-popup": "^2.0.6", @@ -5348,9 +5349,9 @@ "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.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, "dependencies": { "bytes": "3.1.2", @@ -5361,7 +5362,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" @@ -5554,12 +5555,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "license": "MIT", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6037,9 +6044,9 @@ "license": "MIT" }, "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==", "dev": true, "engines": { "node": ">= 0.6" @@ -6117,8 +6124,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "license": "MIT", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6810,15 +6818,19 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", - "license": "MIT", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-lazy-prop": { @@ -6853,8 +6865,9 @@ }, "node_modules/depd": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6869,8 +6882,9 @@ }, "node_modules/destroy": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -7100,8 +7114,9 @@ }, "node_modules/ee-first": { "version": "1.1.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true }, "node_modules/ejs": { "version": "3.1.10", @@ -7136,9 +7151,10 @@ } }, "node_modules/encodeurl": { - "version": "1.0.2", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -7236,6 +7252,25 @@ "dev": true, "license": "MIT" }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", @@ -8041,8 +8076,9 @@ }, "node_modules/etag": { "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -8095,37 +8131,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==", "dev": true, "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", @@ -8298,12 +8334,13 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, - "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", @@ -8316,16 +8353,18 @@ }, "node_modules/finalhandler/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/find-cache-dir": { "version": "3.3.2", @@ -8642,8 +8681,9 @@ }, "node_modules/fresh": { "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -8731,14 +8771,19 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "license": "MIT", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8952,10 +8997,11 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "license": "MIT", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9189,8 +9235,9 @@ }, "node_modules/http-errors": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, - "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -11895,9 +11942,13 @@ "license": "MIT" }, "node_modules/merge-descriptors": { - "version": "1.0.1", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "dev": true, - "license": "MIT" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -11934,8 +11985,9 @@ }, "node_modules/mime": { "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, - "license": "MIT", "bin": { "mime": "cli.js" }, @@ -12400,8 +12452,9 @@ }, "node_modules/on-finished": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, - "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -12611,9 +12664,10 @@ "license": "MIT" }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "dev": true, - "license": "MIT" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "dev": true }, "node_modules/path-type": { "version": "4.0.0", @@ -14167,12 +14221,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==", "dev": true, "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -15979,6 +16033,15 @@ "loose-envify": "^1.1.0" } }, + "node_modules/react-tiny-popover": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/react-tiny-popover/-/react-tiny-popover-8.1.2.tgz", + "integrity": "sha512-zzG9hGBCNeSesZLLItNOiQvIU+/tLdLQ9y8cfSAtLQnOH7eoKVJflQzEng8w7rTblE+cV0/R6dFjjiZS1A4qTA==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-to-print": { "version": "2.14.15", "license": "MIT", @@ -16402,9 +16465,10 @@ } }, "node_modules/rollup": { - "version": "2.79.1", + "version": "2.79.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz", + "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==", "dev": true, - "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -16718,9 +16782,10 @@ "license": "ISC" }, "node_modules/send": { - "version": "0.18.0", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, - "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -16742,21 +16807,33 @@ }, "node_modules/send/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "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==", + "dev": true + }, + "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==", "dev": true, - "license": "MIT" + "engines": { + "node": ">= 0.8" + } }, "node_modules/send/node_modules/ms": { "version": "2.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true }, "node_modules/serialize-javascript": { "version": "6.0.1", @@ -16837,27 +16914,31 @@ } }, "node_modules/serve-static": { - "version": "1.15.0", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, - "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" } }, "node_modules/set-function-length": { - "version": "1.1.1", - "license": "MIT", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -16877,8 +16958,9 @@ }, "node_modules/setprototypeof": { "version": "1.2.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true }, "node_modules/shallow-equal": { "version": "1.2.1", @@ -16910,13 +16992,18 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -17220,8 +17307,9 @@ }, "node_modules/statuses": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -18049,8 +18137,9 @@ }, "node_modules/toidentifier": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.6" } @@ -18363,8 +18452,9 @@ }, "node_modules/unpipe": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -22737,9 +22827,9 @@ "dev": true }, "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==", "dev": true, "requires": { "bytes": "3.1.2", @@ -22750,7 +22840,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" @@ -22884,11 +22974,15 @@ "dev": true }, "call-bind": { - "version": "1.0.5", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" } }, "callsites": { @@ -23194,9 +23288,9 @@ "dev": true }, "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==", "dev": true }, "cookie-signature": { @@ -23246,7 +23340,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -23673,11 +23769,13 @@ } }, "define-data-property": { - "version": "1.1.1", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "requires": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" } }, "define-lazy-prop": { @@ -23697,6 +23795,8 @@ }, "depd": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true }, "dequal": { @@ -23705,6 +23805,8 @@ }, "destroy": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true }, "detect-newline": { @@ -23866,6 +23968,8 @@ }, "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==", "dev": true }, "ejs": { @@ -23889,7 +23993,9 @@ "dev": true }, "encodeurl": { - "version": "1.0.2", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true }, "enhanced-resolve": { @@ -23968,6 +24074,19 @@ "version": "1.0.0", "dev": true }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", @@ -24477,6 +24596,8 @@ }, "etag": { "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true }, "eventemitter3": { @@ -24512,37 +24633,37 @@ "dev": true }, "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==", "dev": true, "requires": { "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", @@ -24670,11 +24791,13 @@ } }, "finalhandler": { - "version": "1.2.0", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, "requires": { "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", @@ -24684,6 +24807,8 @@ "dependencies": { "debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { "ms": "2.0.0" @@ -24691,6 +24816,8 @@ }, "ms": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true } } @@ -24886,6 +25013,8 @@ }, "fresh": { "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true }, "fs-extra": { @@ -24936,8 +25065,11 @@ "dev": true }, "get-intrinsic": { - "version": "1.2.2", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "requires": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", @@ -25072,9 +25204,11 @@ "version": "4.0.0" }, "has-property-descriptors": { - "version": "1.0.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "requires": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" } }, "has-proto": { @@ -25223,6 +25357,8 @@ }, "http-errors": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, "requires": { "depd": "2.0.0", @@ -27087,7 +27223,9 @@ "version": "5.2.1" }, "merge-descriptors": { - "version": "1.0.1", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "dev": true }, "merge-stream": { @@ -27112,6 +27250,8 @@ }, "mime": { "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true }, "mime-db": { @@ -27386,6 +27526,8 @@ }, "on-finished": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, "requires": { "ee-first": "1.1.1" @@ -27515,7 +27657,9 @@ "version": "1.0.7" }, "path-to-regexp": { - "version": "0.1.7", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", "dev": true }, "path-type": { @@ -28319,12 +28463,12 @@ "dev": true }, "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==", "dev": true, "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "querystringify": { @@ -29685,6 +29829,11 @@ } } }, + "react-tiny-popover": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/react-tiny-popover/-/react-tiny-popover-8.1.2.tgz", + "integrity": "sha512-zzG9hGBCNeSesZLLItNOiQvIU+/tLdLQ9y8cfSAtLQnOH7eoKVJflQzEng8w7rTblE+cV0/R6dFjjiZS1A4qTA==" + }, "react-to-print": { "version": "2.14.15" }, @@ -29951,7 +30100,9 @@ } }, "rollup": { - "version": "2.79.1", + "version": "2.79.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz", + "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -30135,7 +30286,9 @@ } }, "send": { - "version": "0.18.0", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, "requires": { "debug": "2.6.9", @@ -30155,6 +30308,8 @@ "dependencies": { "debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { "ms": "2.0.0" @@ -30162,12 +30317,22 @@ "dependencies": { "ms": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true } } }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true + }, "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 } } @@ -30232,22 +30397,28 @@ } }, "serve-static": { - "version": "1.15.0", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, "requires": { - "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" } }, "set-function-length": { - "version": "1.1.1", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "requires": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" } }, "set-function-name": { @@ -30260,6 +30431,8 @@ }, "setprototypeof": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "dev": true }, "shallow-equal": { @@ -30279,12 +30452,15 @@ "dev": true }, "side-channel": { - "version": "1.0.4", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" } }, "signal-exit": { @@ -30495,6 +30671,8 @@ }, "statuses": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true }, "stop-iteration-iterator": { @@ -31039,6 +31217,8 @@ }, "toidentifier": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, "toposort": { @@ -31256,6 +31436,8 @@ }, "unpipe": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true }, "unquote": { diff --git a/client/src/components/Layout/NavBarLogin.js b/client/src/components/Layout/NavBarLogin.js index 099d796c..ca69432a 100644 --- a/client/src/components/Layout/NavBarLogin.js +++ b/client/src/components/Layout/NavBarLogin.js @@ -4,12 +4,18 @@ import { Link } from "react-router-dom"; import { useLocation } from "react-router"; import PropTypes from "prop-types"; import clsx from "clsx"; -import NavBarToolTip from "./NavBarToolTip"; +// import NavBarToolTip from "./NavBarToolTip"; +import { useTheme } from "react-jss"; +import Popup from "reactjs-popup"; +import { MdClose, MdWarning } from "react-icons/md"; const NavBarLogin = ({ classes, handleHamburgerMenuClick }) => { + const theme = useTheme(); const userContext = useContext(UserContext); const account = userContext.account; const [isCalculation, setIsCalculation] = useState(false); + const [tooltipOpen, setTooltipOpen] = useState(true); + const closeModal = () => setTooltipOpen(false); const location = useLocation(); const pathname = location.pathname; @@ -23,16 +29,14 @@ const NavBarLogin = ({ classes, handleHamburgerMenuClick }) => { }, [pathname]); const loginLink = ( -
  • - - Login - -
    • + + Login + ); const getUserGreeting = account => ( @@ -69,12 +73,67 @@ const NavBarLogin = ({ classes, handleHamburgerMenuClick }) => { return !account || !account.email ? ( !isCalculation ? ( - <>{loginLink} - ) : ( - <> - +
  • {loginLink} - +
    • + ) : ( +
  • setTooltipOpen(true)} + > + {loginLink}} + position="bottom right" + arrow={true} + contentStyle={{ + borderRadius: "5px", + border: "1px solid " + theme.colorCritical, + width: "50%", + backgroundColor: theme.colorTooltipBackground, + boxShadow: + "0px 4px 8px 3px rgba(0,0,0,0.15), 0px 1px 3px 0px rgba(0,0,0,0.3)" + }} + > + {close => { + return ( +
    + +
    + +
    + Only projects created after logging in can be saved +
    +
    +
    + ); + }} +     + {/* */} +
    • ) ) : ( <> diff --git a/client/src/components/ProjectWizard/RuleCalculation/RuleCalculation.js b/client/src/components/ProjectWizard/RuleCalculation/RuleCalculation.js index 35ec2fdb..22daee8b 100644 --- a/client/src/components/ProjectWizard/RuleCalculation/RuleCalculation.js +++ b/client/src/components/ProjectWizard/RuleCalculation/RuleCalculation.js @@ -1,9 +1,11 @@ import React, { useState } from "react"; import PropTypes from "prop-types"; -import { createUseStyles } from "react-jss"; +import { createUseStyles, useTheme } from "react-jss"; import ToolTipIcon from "../../ToolTip/ToolTipIcon"; -import ToolTip from "../../ToolTip/ToolTip"; +// import ToolTip from "../../ToolTip/ToolTip"; import clsx from "clsx"; +import Popup from "reactjs-popup"; +import { MdClose } from "react-icons/md"; const useStyles = createUseStyles(theme => ({ field: { @@ -187,6 +189,7 @@ const RuleCalculation = ({ }, onPropInputChange }) => { + const theme = useTheme(); const classes = useStyles(); // The validationErrors property of the rule indicates whether the @@ -342,16 +345,45 @@ const RuleCalculation = ({ {name}
    {description ? ( - + + + + } + position="left center" + arrow={true} + contentStyle={{ width: "30%" }} + > + {close => { + return ( +
    + +
    +
    + ); + }} + ) : ( )}
    -
    {units}
    diff --git a/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js b/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js index 3b71bfb2..ec911b39 100644 --- a/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js +++ b/client/src/components/ProjectWizard/WizardSidebar/EarnedPointsProgress.js @@ -3,7 +3,8 @@ import PropTypes from "prop-types"; import { createUseStyles, useTheme } from "react-jss"; import ToolTipIcon from "../../ToolTip/ToolTipIcon"; import clsx from "clsx"; -import { Tooltip } from "react-tooltip"; +import Popup from "reactjs-popup"; +import { MdClose } from "react-icons/md"; /* See https://css-tricks.com/building-progress-ring-quickly/ @@ -108,23 +109,6 @@ const useStyles = createUseStyles({ } }); -// const EarnedPointsProgress = props => { -// const theme = useTheme(); -// const classes = useStyles({ theme }); - -// const { rulesConfig } = props; -// const radius = DIAL_RADIUS; -// const stroke = STROKE_WIDTH; - -// const target = rulesConfig.targetPointsRule.value || 0; -// const earned = rulesConfig.earnedPointsRule.value || 0; - -// const normalizedRadius = radius - stroke * 2; -// const circumference = normalizedRadius * 2 * Math.PI; -// const strokeDashoffset = Math.max( -// 0, -// target ? circumference - (earned / target) * 0.875 * circumference : 0 -// ); const EarnedPointsProgress = ({ rulesConfig }) => { const theme = useTheme(); const classes = useStyles({ theme }); @@ -141,6 +125,8 @@ const EarnedPointsProgress = ({ rulesConfig }) => { 0, target ? circumference - (earned / target) * 0.875 * circumference : 0 ); + const tipText = `

    Earned Points: ${rulesConfig.earnedPointsRule.description}

    +

    Target Points: ${rulesConfig.targetPointsRule.description}

    `; return (
    {
    TARGET
    Earned Points: " + - rulesConfig.earnedPointsRule.description + - "

    Target Points: " + - rulesConfig.targetPointsRule.description + - "

    " - } className={clsx( classes.tooltipIcon, target > 0 ? "" : classes.noDisplay )} > - + + + } + position="right center" + arrow={true} + contentStyle={{ width: "30%" }} > - - - { + return ( +
    + +
    +
    + ); }} - > - {`

    Earned Points: ${rulesConfig.earnedPointsRule.description}

    -

    Target Points: ${rulesConfig.targetPointsRule.description}

    `} - +
    { + const theme = useTheme(); const classes = useStyles(); - const tipText = rules[0]?.description || ""; + const tipText = `

    ${rules[0]?.description}

    `; return (
    {

    PROJECT LEVEL {level > 0 && ( - + + + } + position="right center" + arrow={true} + contentStyle={{ width: "30%" }} > - - + {close => { + return ( +
    + +
    +
    + ); + }} + )}

    - - {/* Tooltip Component */} - - {tipText} -
    ); }; diff --git a/client/src/styles/theme.js b/client/src/styles/theme.js index 0b0cb130..81c4b984 100644 --- a/client/src/styles/theme.js +++ b/client/src/styles/theme.js @@ -12,6 +12,8 @@ module.exports = { colorError: "#E46247", //e.g. red colorDeselect: "#EEF1F4", //e.g. red colorHighlight: "#F0E300", //yellow + colorTooltipBackground: "#FFEDEA", + colorCritical: "#C3391D", colors: { primary: { navy: "#002E6D", diff --git a/package-lock.json b/package-lock.json index d623e78e..17927a90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "root", - "version": "0.2.51", + "version": "0.2.53", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "root", - "version": "0.2.51", + "version": "0.2.53", "dependencies": { "eslint": "^8.53.0", "i": "^0.3.7", @@ -2444,8 +2444,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "license": "MIT", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", diff --git a/server/db/migration/V20250202.1351__edit_park_ratio_tooltip_.sql b/server/db/migration/V20250202.1351__edit_park_ratio_tooltip_.sql new file mode 100644 index 00000000..6350e3ef --- /dev/null +++ b/server/db/migration/V20250202.1351__edit_park_ratio_tooltip_.sql @@ -0,0 +1,20 @@ +UPDATE CalculationRule SET description = +' +
    +

    "Parking Provided / Baseline" displays a percentage derived + by dividing your project's parking supply by the number of spaces indicated in + the "Citywide Parking Baseline" row. + A reduction of at least 10% (when "Parking Provided / Baseline" is 90% or less) results + in points earned through the "Reduced Parking Supply" strategy. Providing 110% + or more of the Baseline results in increased Target Points for the project. + +

    +
      +
    • 2 pts - spaces reduced by 10%-24%
      • +
    • 4 pts - spaces reduced by 25%-49%
      • +
    • 8 pts - spaces reduced by 50%-89%
      • +
    • 12 pts - spaces reduced by 90%-100%
      • +
    +
    +
    ' +WHERE calculationId = 1 and code = 'PARK_RATIO' \ No newline at end of file