diff --git a/.eslintrc b/.eslintrc index 66ef1e1869..e09d73222a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -15,6 +15,7 @@ "files": ["*.js"], "rules": { "n/no-unpublished-require": "off", // 96 failures across 79 files - many "@playwright/test" related + "n/no-unsupported-features/node-builtins": "off" } } ] diff --git a/package-lock.json b/package-lock.json index 1fb996ea7b..eea3dfb861 100644 --- a/package-lock.json +++ b/package-lock.json @@ -87,7 +87,7 @@ "@playwright/test": "^1.45.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15", "@webpack-cli/serve": "^2.0.5", - "ajv": "^8.16.0", + "ajv": "^8.17.1", "autoprefixer": "^10.4.19", "babel-loader": "^9.1.3", "cheerio": "^1.0.0-rc.12", @@ -104,14 +104,14 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-jsx-a11y": "^6.9.0", - "eslint-plugin-n": "^17.9.0", + "eslint-plugin-n": "^17.10.0", "eslint-plugin-no-storage": "^1.0.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^6.4.0", + "eslint-plugin-promise": "^6.6.0", "eslint-plugin-react": "^7.34.4", "express": "^4.19.2", "glob": "^11.0.0", - "husky": "^9.0.11", + "husky": "^9.1.2", "jest": "^29.7.0", "jest-canvas-mock": "^2.5.2", "jest-environment-jsdom": "^29.7.0", @@ -121,20 +121,20 @@ "node-ssh": "^13.2.0", "npm-run-all": "^4.1.5", "patch-package": "^8.0.0", - "postcss": "^8.4.39", + "postcss": "^8.4.40", "postcss-loader": "^8.1.1", "react-refresh": "^0.14.1", "react-test-renderer": "^18.3.0", "redux-mock-store": "^1.5.4", "run-script-os": "^1.1.6", - "sass": "^1.77.6", - "sass-loader": "^14.2.1", + "sass": "^1.77.8", + "sass-loader": "^15.0.0", "shelljs": "^0.8.5", "showdown": "^2.1.0", "stylelint": "^15.11.0", "stylelint-config-standard-scss": "^11.1.0", "stylelint-high-performance-animation": "^1.10.0", - "tar": "^7.4.0", + "tar": "^7.4.3", "terser-webpack-plugin": "^5.3.10", "uuid": "^10.0.0", "webpack": "^5.93.0", @@ -4254,14 +4254,16 @@ } }, "node_modules/ajv": { - "version": "8.16.0", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -7761,7 +7763,9 @@ } }, "node_modules/eslint-plugin-n": { - "version": "17.9.0", + "version": "17.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.10.0.tgz", + "integrity": "sha512-NmrSdEid+ch9SBVuqbsK5CUiEZGtMK32KSI+arWahZbFF0nvX1oEJrWiFOWmhkWFKW9Hqor0g3qPh4AvkvWwlA==", "dev": true, "license": "MIT", "dependencies": { @@ -7769,9 +7773,9 @@ "enhanced-resolve": "^5.17.0", "eslint-plugin-es-x": "^7.5.0", "get-tsconfig": "^4.7.0", - "globals": "^15.0.0", + "globals": "^15.8.0", "ignore": "^5.2.4", - "minimatch": "^9.0.0", + "minimatch": "^9.0.5", "semver": "^7.5.3" }, "engines": { @@ -7805,7 +7809,9 @@ } }, "node_modules/eslint-plugin-n/node_modules/globals": { - "version": "15.6.0", + "version": "15.8.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.8.0.tgz", + "integrity": "sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw==", "dev": true, "license": "MIT", "engines": { @@ -7865,9 +7871,9 @@ } }, "node_modules/eslint-plugin-promise": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.4.0.tgz", - "integrity": "sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", + "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", "dev": true, "license": "ISC", "engines": { @@ -8416,6 +8422,13 @@ "version": "2.0.6", "license": "MIT" }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "dev": true, + "license": "MIT" + }, "node_modules/fastest-levenshtein": { "version": "1.0.16", "dev": true, @@ -9432,11 +9445,13 @@ } }, "node_modules/husky": { - "version": "9.0.11", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.2.tgz", + "integrity": "sha512-1/aDMXZdhr1VdJJTLt6e7BipM0Jd9qkpubPiIplon1WmCeOy3nnzsCMeBqS9AsL5ioonl8F8y/F2CLOmk19/Pw==", "dev": true, "license": "MIT", "bin": { - "husky": "bin.mjs" + "husky": "bin.js" }, "engines": { "node": ">=18" @@ -13798,9 +13813,9 @@ } }, "node_modules/postcss": { - "version": "8.4.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", - "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", + "version": "8.4.40", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz", + "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==", "dev": true, "funding": [ { @@ -15736,10 +15751,11 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.77.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", - "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==", + "version": "1.77.8", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", + "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -15753,7 +15769,9 @@ } }, "node_modules/sass-loader": { - "version": "14.2.1", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-15.0.0.tgz", + "integrity": "sha512-mbXAL7sI/fgt3skXR6xHxtKkaGyxRrGf7zrU4hLLWxBDJEcAe0QsoNy92qKttCb3zfMniTkU2kD9yakUKtW7vQ==", "dev": true, "license": "MIT", "dependencies": { @@ -17082,7 +17100,9 @@ } }, "node_modules/tar": { - "version": "7.4.0", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", "dev": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 70b082485f..93d6f3cc83 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "lint:scss": "npx stylelint ./web/scss/**/*.scss", "lint:js": "npx eslint . --quiet", "preinstall": "node tasks/util/checkNodeVersion.js", - "postinstall": "patch-package && husky install", + "postinstall": "patch-package && husky", "start": "node ./tasks/util/start.js", "t-debug": "npx playwright test --debug", "test": "run-script-os", @@ -86,7 +86,7 @@ "@playwright/test": "^1.45.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15", "@webpack-cli/serve": "^2.0.5", - "ajv": "^8.16.0", + "ajv": "^8.17.1", "autoprefixer": "^10.4.19", "babel-loader": "^9.1.3", "cheerio": "^1.0.0-rc.12", @@ -103,14 +103,14 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-jsx-a11y": "^6.9.0", - "eslint-plugin-n": "^17.9.0", + "eslint-plugin-n": "^17.10.0", "eslint-plugin-no-storage": "^1.0.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^6.4.0", + "eslint-plugin-promise": "^6.6.0", "eslint-plugin-react": "^7.34.4", "express": "^4.19.2", "glob": "^11.0.0", - "husky": "^9.0.11", + "husky": "^9.1.2", "jest": "^29.7.0", "jest-canvas-mock": "^2.5.2", "jest-environment-jsdom": "^29.7.0", @@ -120,20 +120,20 @@ "node-ssh": "^13.2.0", "npm-run-all": "^4.1.5", "patch-package": "^8.0.0", - "postcss": "^8.4.39", + "postcss": "^8.4.40", "postcss-loader": "^8.1.1", "react-refresh": "^0.14.1", "react-test-renderer": "^18.3.0", "redux-mock-store": "^1.5.4", "run-script-os": "^1.1.6", - "sass": "^1.77.6", - "sass-loader": "^14.2.1", + "sass": "^1.77.8", + "sass-loader": "^15.0.0", "shelljs": "^0.8.5", "showdown": "^2.1.0", "stylelint": "^15.11.0", "stylelint-config-standard-scss": "^11.1.0", "stylelint-high-performance-animation": "^1.10.0", - "tar": "^7.4.0", + "tar": "^7.4.3", "terser-webpack-plugin": "^5.3.10", "uuid": "^10.0.0", "webpack": "^5.93.0", diff --git a/web/scss/components/facets.scss b/web/scss/components/facets.scss index 073a6eb2ba..3ec486ef4c 100644 --- a/web/scss/components/facets.scss +++ b/web/scss/components/facets.scss @@ -19,13 +19,12 @@ border-radius: 20px; position: relative; display: inline-block; + cursor: pointer; span { font-weight: 500; } - cursor: pointer; - &:hover { background: #eee; color: #111; diff --git a/web/scss/components/modal.scss b/web/scss/components/modal.scss index 11daa8a84c..854e1136d9 100644 --- a/web/scss/components/modal.scss +++ b/web/scss/components/modal.scss @@ -95,12 +95,12 @@ } .modal-content { + border: none; + border-radius: 6px; + .modal-header { justify-content: space-between; } - - border: none; - border-radius: 6px; } .modal-title { diff --git a/web/scss/features/events.scss b/web/scss/features/events.scss index e61e4438ac..82bd68d72b 100644 --- a/web/scss/features/events.scss +++ b/web/scss/features/events.scss @@ -9,6 +9,7 @@ .event-container { background: #333; + min-height: 166px; .no-events { text-align: center; @@ -18,8 +19,6 @@ margin: 15px auto; } - min-height: 166px; - @media (max-width: $mobile-max-width) { height: calc(var(--vh, 1vh) * 100 - 85px); } @@ -60,13 +59,13 @@ } .map-item-list li.item h4.title { - @media (max-width: $mobile-max-width) { - font-size: 1em; - } - color: #ccc; padding: 0 3px; margin-left: 40px; + + @media (max-width: $mobile-max-width) { + font-size: 1em; + } } .map-item-list li.item p,