From 1bac2fda68dcd44f239a0f8be7a0b45881e02193 Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Tue, 26 Mar 2024 11:56:08 -0400 Subject: [PATCH 1/6] Revert "Update Underpass UI package, now published to the NPM registry" This reverts commit 4c88f320cdbab0ec739f9db1784fcfbe2dcafd4e. --- frontend/package.json | 2 +- frontend/yarn.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 400ff0d483..7b21da3c81 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,7 +9,7 @@ "@formatjs/intl-relativetimeformat": "^11.2.4", "@formatjs/macro": "^0.2.8", "@hotosm/id": "^2.21.1", - "@hotosm/underpass-ui": "^0.0.4", + "@hotosm/underpass-ui": "https://github.com/hotosm/underpass-ui.git#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce", "@hotosm/iso-countries-languages": "^1.1.2", "@mapbox/mapbox-gl-draw": "^1.4.1", "@mapbox/mapbox-gl-geocoder": "^5.0.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 6a16342c83..4031cab8ad 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1808,10 +1808,9 @@ dependencies: prettier "^2.0.5" -"@hotosm/underpass-ui@^0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@hotosm/underpass-ui/-/underpass-ui-0.0.4.tgz#3b44f83e7737d550074e9842e8c8873a7e9af01c" - integrity sha512-X8sZgfpWKiuGTq3gNeBgLRAH3z33T906Cvgd2fOSfc/MACdXX6Qd8tJ1byX3qkgmd6J0EJsmbZ/KIC/X7oIwCQ== +"@hotosm/underpass-ui@https://github.com/hotosm/underpass-ui.git#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce": + version "0.0.3" + resolved "https://github.com/hotosm/underpass-ui.git#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce" dependencies: autoprefixer "^9" maplibre-gl "^3.3.1" From d17d6ae778fbc9cfb23bd3b5d2768832ace80e7c Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Tue, 26 Mar 2024 11:56:08 -0400 Subject: [PATCH 2/6] Revert "Update underpass-ui package" This reverts commit 2f80692e54822aaa60912a8a1301cbdd7d7aba7a. --- frontend/package.json | 2 +- frontend/yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 7b21da3c81..dca89e4c09 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,7 +9,7 @@ "@formatjs/intl-relativetimeformat": "^11.2.4", "@formatjs/macro": "^0.2.8", "@hotosm/id": "^2.21.1", - "@hotosm/underpass-ui": "https://github.com/hotosm/underpass-ui.git#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce", + "@hotosm/underpass-ui": "https://github.com/hotosm/underpass-ui", "@hotosm/iso-countries-languages": "^1.1.2", "@mapbox/mapbox-gl-draw": "^1.4.1", "@mapbox/mapbox-gl-geocoder": "^5.0.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 4031cab8ad..bf40e2be8f 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1808,9 +1808,9 @@ dependencies: prettier "^2.0.5" -"@hotosm/underpass-ui@https://github.com/hotosm/underpass-ui.git#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce": +"@hotosm/underpass-ui@https://github.com/hotosm/underpass-ui": version "0.0.3" - resolved "https://github.com/hotosm/underpass-ui.git#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce" + resolved "https://github.com/hotosm/underpass-ui#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce" dependencies: autoprefixer "^9" maplibre-gl "^3.3.1" From 5ba0eb10146bf2b4c89a7aed4599eb5fc04dede5 Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Tue, 26 Mar 2024 11:56:08 -0400 Subject: [PATCH 3/6] Revert "Change Underpass UI package URL" This reverts commit dea12f47ec0328b00021ed79e2c093bfdc2d5812. --- frontend/package.json | 2 +- frontend/yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index dca89e4c09..1bd78dea9e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,7 +9,7 @@ "@formatjs/intl-relativetimeformat": "^11.2.4", "@formatjs/macro": "^0.2.8", "@hotosm/id": "^2.21.1", - "@hotosm/underpass-ui": "https://github.com/hotosm/underpass-ui", + "@hotosm/underpass-ui": "hotosm/underpass-ui", "@hotosm/iso-countries-languages": "^1.1.2", "@mapbox/mapbox-gl-draw": "^1.4.1", "@mapbox/mapbox-gl-geocoder": "^5.0.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index bf40e2be8f..0b2b256f8e 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1808,9 +1808,9 @@ dependencies: prettier "^2.0.5" -"@hotosm/underpass-ui@https://github.com/hotosm/underpass-ui": +"@hotosm/underpass-ui@hotosm/underpass-ui": version "0.0.3" - resolved "https://github.com/hotosm/underpass-ui#61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce" + resolved "https://codeload.github.com/hotosm/underpass-ui/tar.gz/61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce" dependencies: autoprefixer "^9" maplibre-gl "^3.3.1" From c5c61d8953c031a71643808842354dbf72a5fba1 Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Tue, 26 Mar 2024 11:56:08 -0400 Subject: [PATCH 4/6] Revert "+ Live Monitoring view" This reverts commit bc1edb3e7735fe012a4519e45da96dc716a85188. --- frontend/src/api/projects.js | 14 - .../src/components/projectDetail/index.js | 25 +- .../projectDetail/liveViewButton.js | 20 -- .../src/components/projectDetail/messages.js | 8 - frontend/src/routes.js | 10 - frontend/yarn.lock | 333 +----------------- 6 files changed, 15 insertions(+), 395 deletions(-) delete mode 100644 frontend/src/components/projectDetail/liveViewButton.js diff --git a/frontend/src/api/projects.js b/frontend/src/api/projects.js index 663ca61fda..f9d46564d3 100644 --- a/frontend/src/api/projects.js +++ b/frontend/src/api/projects.js @@ -1,11 +1,9 @@ -import axios from 'axios'; import { subMonths, format } from 'date-fns'; import { useQuery } from '@tanstack/react-query'; import { useSelector } from 'react-redux'; import { remapParamsToAPI } from '../utils/remapParamsToAPI'; import api from './apiClient'; -import { UNDERPASS_URL } from '../config'; export const useProjectsQuery = (fullProjectsQuery, action) => { const token = useSelector((state) => state.auth.token); @@ -189,18 +187,6 @@ export const submitValidationTask = (projectId, payload, token, locale) => { ); }; -export const useAvailableCountriesQuery = () => { - const fetchGeojsonData = () => { - return axios.get(`${UNDERPASS_URL}/availability`); - }; - - return useQuery({ - queryKey: ['priority-geojson'], - queryFn: fetchGeojsonData, - select: (res) => res.data, - }); -}; - const backendToQueryConversion = { difficulty: 'difficulty', campaign: 'campaign', diff --git a/frontend/src/components/projectDetail/index.js b/frontend/src/components/projectDetail/index.js index 47068b8c3f..183e7f0ad5 100644 --- a/frontend/src/components/projectDetail/index.js +++ b/frontend/src/components/projectDetail/index.js @@ -21,9 +21,8 @@ import { PermissionBox } from './permissionBox'; import { CustomButton } from '../button'; import { ProjectInfoPanel } from './infoPanel'; import { OSMChaButton } from './osmchaButton'; -import { LiveViewButton } from './liveViewButton'; import { useSetProjectPageTitleTag } from '../../hooks/UseMetaTags'; -import { useProjectContributionsQuery, useProjectTimelineQuery, useAvailableCountriesQuery } from '../../api/projects'; +import { useProjectContributionsQuery, useProjectTimelineQuery } from '../../api/projects'; import { Alert } from '../alert'; import './styles.scss'; @@ -154,16 +153,6 @@ export const ProjectDetail = (props) => { ); - const { data } = useAvailableCountriesQuery(); - - // check if the project has live monitoring feature enabled - // based on the country list provided by available.json - const hasLiveMonitoringFeature = !data - ? false - : props.project.countryTag.some((country) => - data.countries.some((item) => country.toLowerCase() === item.toLowerCase()), - ); - return (
@@ -357,18 +346,6 @@ export const ProjectDetail = (props) => { project={props.project} className="bg-white blue-dark ba b--grey-light pa3" /> - - {/* - show live view button only for published projects & - when the project has live monitoring feature - */} - {props.project.status === 'PUBLISHED' && hasLiveMonitoringFeature && ( - - )} - ( - - { - - {compact ? ( - - ) : ( - - )} - - } - -); \ No newline at end of file diff --git a/frontend/src/components/projectDetail/messages.js b/frontend/src/components/projectDetail/messages.js index cd457852c4..76e452b827 100644 --- a/frontend/src/components/projectDetail/messages.js +++ b/frontend/src/components/projectDetail/messages.js @@ -240,14 +240,6 @@ export default defineMessages({ id: 'project.detail.sections.contributions.osmcha', defaultMessage: 'Changesets in OSMCha', }, - live: { - id: 'project.detail.sections.contributions.live', - defaultMessage: 'Live', - }, - liveMonitoring: { - id: 'project.detail.sections.contributions.liveMonitoring', - defaultMessage: 'Live monitoring', - }, changesets: { id: 'project.detail.sections.contributions.changesets', defaultMessage: 'Changesets', diff --git a/frontend/src/routes.js b/frontend/src/routes.js index dcdb6c0f0a..4a5574ed0e 100644 --- a/frontend/src/routes.js +++ b/frontend/src/routes.js @@ -80,16 +80,6 @@ export const router = createBrowserRouter( }} ErrorBoundary={FallbackComponent} /> - { - const { ProjectLiveMonitoring } = await import( - './views/projectLiveMonitoring' /* webpackChunkName: "projectLiveMonitoring" */ - ); - return { Component: ProjectLiveMonitoring }; - }} - ErrorBoundary={FallbackComponent} - /> { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 0b2b256f8e..ac2b642606 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1810,13 +1810,10 @@ "@hotosm/underpass-ui@hotosm/underpass-ui": version "0.0.3" - resolved "https://codeload.github.com/hotosm/underpass-ui/tar.gz/61a2d9f9e8d3ed60b6f32121b61e8c8e243750ce" + resolved "https://codeload.github.com/hotosm/underpass-ui/tar.gz/cb6ce9d784c36f8669b8d417be1e7424edb56ee1" dependencies: - autoprefixer "^9" maplibre-gl "^3.3.1" - postcss "^7" react-timeago "^7.1.0" - tailwindcss "npm:@tailwindcss/postcss7-compat" "@humanwhocodes/config-array@^0.5.0": version "0.5.0" @@ -4182,16 +4179,7 @@ acorn-jsx@^5.3.1: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-node@^1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" - integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== - dependencies: - acorn "^7.0.0" - acorn-walk "^7.0.0" - xtend "^4.0.2" - -acorn-walk@^7.0.0, acorn-walk@^7.1.1: +acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== @@ -4201,7 +4189,7 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^7.0.0, acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: +acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== @@ -4366,11 +4354,6 @@ aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -arg@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" - integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -4601,7 +4584,7 @@ attr-accept@^2.2.2: resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== -autoprefixer@^9, autoprefixer@^9.6.1: +autoprefixer@^9.6.1: version "9.8.8" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a" integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA== @@ -5150,7 +5133,7 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== -bytes@3.1.2, bytes@^3.0.0: +bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== @@ -5288,11 +5271,6 @@ camel-case@^4.1.1: pascal-case "^3.1.2" tslib "^2.0.3" -camelcase-css@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" - integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== - camelcase-keys@^6.2.2: version "6.2.2" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" @@ -5369,7 +5347,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -5456,21 +5434,6 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^3.5.2: - version "3.6.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" - integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -5652,7 +5615,7 @@ color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.6.0, color-string@^1.9.0: +color-string@^1.6.0: version "1.9.1" resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== @@ -5668,14 +5631,6 @@ color@^3.0.0: color-convert "^1.9.3" color-string "^1.6.0" -color@^4.0.1: - version "4.2.3" - resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a" - integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A== - dependencies: - color-convert "^2.0.1" - color-string "^1.9.0" - colord@^2.9.3: version "2.9.3" resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" @@ -5724,11 +5679,6 @@ commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^8.0.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== - common-tags@^1.8.0: version "1.8.2" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" @@ -5931,7 +5881,7 @@ cosmiconfig@^5.0.0: js-yaml "^3.13.1" parse-json "^4.0.0" -cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: +cosmiconfig@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== @@ -6115,11 +6065,6 @@ css-tree@^1.1.2: mdn-data "2.0.14" source-map "^0.6.1" -css-unit-converter@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" - integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA== - css-what@^3.2.1: version "3.4.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" @@ -6680,11 +6625,6 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -defined@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf" - integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q== - del@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" @@ -6756,25 +6696,11 @@ detect-port-alt@1.1.6: address "^1.0.1" debug "^2.6.0" -detective@^5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" - integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== - dependencies: - acorn-node "^1.8.2" - defined "^1.0.0" - minimist "^1.2.6" - diacritics@1.3.0, diacritics@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz" integrity sha1-PvqHMj67hj5mls67AILUj/PW96E= -didyoumean@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" - integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== - diff-sequences@^25.2.6: version "25.2.6" resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz" @@ -6811,11 +6737,6 @@ direction@^2.0.0: resolved "https://registry.yarnpkg.com/direction/-/direction-2.0.1.tgz#71800dd3c4fa102406502905d3866e65bdebb985" integrity sha512-9S6m9Sukh1cZNknO1CWAr2QAWsbKLafQiyM5gZ7VgXHeuaoUwffKN4q6NC4A/Mf9iiPlOXQEKW/Mv/mh9/3YFA== -dlv@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" - integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== - dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -7726,17 +7647,6 @@ fast-glob@^3.1.1, fast-glob@^3.2.9: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.2.7: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -8008,15 +7918,6 @@ fromentries@^1.3.2: resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a" integrity sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg== -fs-extra@^10.0.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -8085,11 +7986,6 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== - function.prototype.name@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" @@ -8227,14 +8123,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -8489,13 +8378,6 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -hasown@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" - integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== - dependencies: - function-bind "^1.1.2" - hast-util-from-parse5@^7.0.0: version "7.1.2" resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-7.1.2.tgz#aecfef73e3ceafdfa4550716443e4eb7b02e22b0" @@ -8722,11 +8604,6 @@ html-minifier-terser@^5.0.1: relateurl "^0.2.7" terser "^4.6.3" -html-tags@^3.1.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce" - integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ== - html-void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-2.0.1.tgz#29459b8b05c200b6c5ee98743c41b979d577549f" @@ -9219,7 +9096,7 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-color-stop@^1.0.0, is-color-stop@^1.1.0: +is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" integrity sha512-H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA== @@ -9238,13 +9115,6 @@ is-core-module@^2.0.0, is-core-module@^2.11.0, is-core-module@^2.9.0: dependencies: has "^1.0.3" -is-core-module@^2.13.0: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== - dependencies: - hasown "^2.0.0" - is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -10378,11 +10248,6 @@ lie@^3.0.1, lie@~3.3.0: dependencies: immediate "~3.0.5" -lilconfig@^2.0.5: - version "2.1.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - lineclip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/lineclip/-/lineclip-1.1.5.tgz#2bf26067d94354feabf91e42768236db5616fd13" @@ -10485,11 +10350,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash.topath@^4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009" - integrity sha512-1/W4dM+35DwvE/iEd1M9ekewOSTlpFekhw9mhAtrwjVqUr83/ilQiyAvmg4tVX7Unkcfl1KC+i9WdaT4B6aQcg== - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" @@ -11411,11 +11271,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -modern-normalize@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7" - integrity sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA== - moo-color@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.3.tgz#d56435f8359c8284d83ac58016df7427febece74" @@ -11513,11 +11368,6 @@ nanoid@^3.1.31, nanoid@^3.3.6: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== -nanoid@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" - integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -11580,13 +11430,6 @@ node-diff3@~3.1.0, node-diff3@~3.1.2: resolved "https://registry.yarnpkg.com/node-diff3/-/node-diff3-3.1.2.tgz#49df8d821dc9cbab87bfd6182171d90169613a97" integrity sha512-wUd9TWy059I8mZdH6G3LPNlAEfxDvXtn/RcyFrbqL3v34WlDxn+Mh4HDhOwWuaMk/ROVepe5tTpnGHbve6Db2g== -node-emoji@^1.11.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" - integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== - dependencies: - lodash "^4.17.21" - node-fetch@^2.6.7: version "2.6.11" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" @@ -11759,11 +11602,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-hash@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" - integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== - object-inspect@^1.12.3, object-inspect@^1.9.0: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" @@ -12630,16 +12468,6 @@ postcss-font-variant@^4.0.0: dependencies: postcss "^7.0.2" -postcss-functions@^3: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e" - integrity sha512-N5yWXWKA+uhpLQ9ZhBRl2bIAdM6oVJYpDojuI1nF2SzXBimJcdjFwiAouBVbO5VuOF3qA6BSFWFc3wXbbj72XQ== - dependencies: - glob "^7.1.2" - object-assign "^4.1.1" - postcss "^6.0.9" - postcss-value-parser "^3.3.0" - postcss-gap-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715" @@ -12662,14 +12490,6 @@ postcss-initial@^3.0.0: dependencies: postcss "^7.0.2" -postcss-js@^2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9" - integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w== - dependencies: - camelcase-css "^2.0.1" - postcss "^7.0.18" - postcss-lab-function@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e" @@ -12687,14 +12507,6 @@ postcss-load-config@^2.0.0: cosmiconfig "^5.0.0" import-cwd "^2.0.0" -postcss-load-config@^3.1.0: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== - dependencies: - lilconfig "^2.0.5" - yaml "^1.10.2" - postcss-loader@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" @@ -12814,14 +12626,6 @@ postcss-modules-values@^3.0.0: icss-utils "^4.0.0" postcss "^7.0.6" -postcss-nested@^4: - version "4.2.3" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6" - integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw== - dependencies: - postcss "^7.0.32" - postcss-selector-parser "^6.0.2" - postcss-nesting@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052" @@ -13079,14 +12883,6 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-selector-parser@^6.0.6: - version "6.0.16" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04" - integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - postcss-svgo@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" @@ -13105,7 +12901,7 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0: +postcss-value-parser@^3.0.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== @@ -13133,16 +12929,7 @@ postcss@7.0.36: source-map "^0.6.1" supports-color "^6.1.0" -postcss@^6.0.9: - version "6.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" - integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== - dependencies: - chalk "^2.4.1" - source-map "^0.6.1" - supports-color "^5.4.0" - -postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: +postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: version "7.0.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== @@ -13159,15 +12946,6 @@ postcss@^8.1.0: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.3.5: - version "8.4.38" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" - integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== - dependencies: - nanoid "^3.3.7" - picocolors "^1.0.0" - source-map-js "^1.2.0" - potpack@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14" @@ -13241,11 +13019,6 @@ pretty-format@^27.0.2: ansi-styles "^5.0.0" react-is "^17.0.1" -pretty-hrtime@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A== - process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -13386,16 +13159,6 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -purgecss@^4.0.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz#683f6a133c8c4de7aa82fe2746d1393b214918f7" - integrity sha512-99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw== - dependencies: - commander "^8.0.0" - glob "^7.1.7" - postcss "^8.3.5" - postcss-selector-parser "^6.0.6" - q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -14011,14 +13774,6 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -reduce-css-calc@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03" - integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg== - dependencies: - css-unit-converter "^1.1.1" - postcss-value-parser "^3.3.0" - redux-persist@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8" @@ -14387,15 +14142,6 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.1 path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^1.20.0: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== - dependencies: - is-core-module "^2.13.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - resolve@^2.0.0-next.4: version "2.0.0-next.4" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" @@ -15066,11 +14812,6 @@ source-map-explorer@^2.5.3: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-js@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" - integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== - source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -15533,7 +15274,7 @@ superjson@^1.10.0: dependencies: copy-anything "^3.0.2" -supports-color@^5.3.0, supports-color@^5.4.0: +supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -15619,47 +15360,6 @@ tachyons@^4.12.0: resolved "https://registry.npmjs.org/tachyons/-/tachyons-4.12.0.tgz" integrity sha512-2nA2IrYFy3raCM9fxJ2KODRGHVSZNTW3BR0YnlGsLUf1DA3pk3YfWZ/DdfbnZK6zLZS+jUenlUGJsKcA5fUiZg== -"tailwindcss@npm:@tailwindcss/postcss7-compat": - version "2.2.17" - resolved "https://registry.yarnpkg.com/@tailwindcss/postcss7-compat/-/postcss7-compat-2.2.17.tgz#dc78f3880a2af84163150ff426a39e42b9ae8922" - integrity sha512-3h2svqQAqYHxRZ1KjsJjZOVTQ04m29LjfrLjXyZZEJuvUuJN+BCIF9GI8vhE1s0plS0mogd6E6YLg6mu4Wv/Vw== - dependencies: - arg "^5.0.1" - autoprefixer "^9" - bytes "^3.0.0" - chalk "^4.1.2" - chokidar "^3.5.2" - color "^4.0.1" - cosmiconfig "^7.0.1" - detective "^5.2.0" - didyoumean "^1.2.2" - dlv "^1.1.3" - fast-glob "^3.2.7" - fs-extra "^10.0.0" - glob-parent "^6.0.1" - html-tags "^3.1.0" - is-color-stop "^1.1.0" - is-glob "^4.0.1" - lodash "^4.17.21" - lodash.topath "^4.5.2" - modern-normalize "^1.1.0" - node-emoji "^1.11.0" - normalize-path "^3.0.0" - object-hash "^2.2.0" - postcss "^7" - postcss-functions "^3" - postcss-js "^2" - postcss-load-config "^3.1.0" - postcss-nested "^4" - postcss-selector-parser "^6.0.6" - postcss-value-parser "^4.1.0" - pretty-hrtime "^1.0.3" - purgecss "^4.0.3" - quick-lru "^5.1.1" - reduce-css-calc "^2.1.8" - resolve "^1.20.0" - tmp "^0.2.1" - tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" @@ -15845,11 +15545,6 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@^0.2.1: - version "0.2.3" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae" - integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w== - tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -17141,7 +16836,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^1.10.0, yaml@^1.10.2: +yaml@^1.10.0: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== From 8c2e92a4b9297bbc6b671e9a0bc3c691a5af1df4 Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Tue, 26 Mar 2024 11:56:08 -0400 Subject: [PATCH 5/6] Revert "Add underpass-ui package" This reverts commit 2111ce9294a583d9061c6bfdd612b9f051f08d9a. --- frontend/yarn.lock | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index ac2b642606..20938c2fb3 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1808,13 +1808,6 @@ dependencies: prettier "^2.0.5" -"@hotosm/underpass-ui@hotosm/underpass-ui": - version "0.0.3" - resolved "https://codeload.github.com/hotosm/underpass-ui/tar.gz/cb6ce9d784c36f8669b8d417be1e7424edb56ee1" - dependencies: - maplibre-gl "^3.3.1" - react-timeago "^7.1.0" - "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" @@ -13638,11 +13631,6 @@ react-test-renderer@^17.0.2: react-shallow-renderer "^16.13.1" scheduler "^0.20.2" -react-timeago@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/react-timeago/-/react-timeago-7.2.0.tgz#ae929d7423a63cbc3dc228e49d22fbf586d459ca" - integrity sha512-2KsBEEs+qRhKx/kekUVNSTIpop3Jwd7SRBm0R4Eiq3mPeswRGSsftY9FpKsE/lXLdURyQFiHeHFrIUxLYskG5g== - react-tooltip@^4.2.21: version "4.5.1" resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-4.5.1.tgz#77eccccdf16adec804132e558ec20ca5783b866a" From ffab13345ddf9d0fd2d87e141b78057517b5128d Mon Sep 17 00:00:00 2001 From: DK Benjamin Date: Tue, 26 Mar 2024 11:56:08 -0400 Subject: [PATCH 6/6] Revert "+ Live monitoring with Underpass" This reverts commit 27661ddeeef4bc992dec2b65ed8babce3a84996e. --- example.env | 2 - frontend/package.json | 1 - frontend/src/config/index.js | 2 - frontend/src/views/projectLiveMonitoring.css | 37 -- frontend/src/views/projectLiveMonitoring.js | 401 ------------------- 5 files changed, 443 deletions(-) delete mode 100644 frontend/src/views/projectLiveMonitoring.css delete mode 100644 frontend/src/views/projectLiveMonitoring.js diff --git a/example.env b/example.env index 91b4325e35..37f9e59302 100644 --- a/example.env +++ b/example.env @@ -206,8 +206,6 @@ TM_DEFAULT_LOCALE=en # TM_SENTRY_BACKEND_DSN=https://foo.ingest.sentry.io/1234567 # TM_SENTRY_FRONTEND_DSN=https://bar.ingest.sentry.io/8901234 -# Underpass API URL (for project live monitoring feature) -UNDERPASS_URL=https://underpass.hotosm.org #EXPORT TOOL Integration with 0(Disable) and 1(Enable) and S3 URL for Export Tool #EXPORT_TOOL_S3_URL=https://foorawdataapi.s3.amazonaws.com diff --git a/frontend/package.json b/frontend/package.json index 1bd78dea9e..6aff4dab72 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,7 +9,6 @@ "@formatjs/intl-relativetimeformat": "^11.2.4", "@formatjs/macro": "^0.2.8", "@hotosm/id": "^2.21.1", - "@hotosm/underpass-ui": "hotosm/underpass-ui", "@hotosm/iso-countries-languages": "^1.1.2", "@mapbox/mapbox-gl-draw": "^1.4.1", "@mapbox/mapbox-gl-geocoder": "^5.0.1", diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js index 32efdeddc9..343f7c3171 100644 --- a/frontend/src/config/index.js +++ b/frontend/src/config/index.js @@ -173,8 +173,6 @@ export const MAP_STYLE = MAPBOX_TOKEN export const MAPBOX_RTL_PLUGIN_URL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js'; -export const UNDERPASS_URL = process.env.REACT_APP_UNDERPASS_URL || 'https://underpass.hotosm.org'; - export const DROPZONE_SETTINGS = { accept: { 'image/*': ['.jpeg', '.jpg', '.png', '.webp', '.gif'], diff --git a/frontend/src/views/projectLiveMonitoring.css b/frontend/src/views/projectLiveMonitoring.css deleted file mode 100644 index d5d8915313..0000000000 --- a/frontend/src/views/projectLiveMonitoring.css +++ /dev/null @@ -1,37 +0,0 @@ -@import '@hotosm/underpass-ui/dist/index.css'; - -.maplibregl-map { - height: calc(100vh - 6.05rem); -} - -.top { - position: absolute; - top: 0.625rem; - left: 0.625rem; - z-index: 999; -} - -svg.pl2 { - display: inherit; - height: 22px !important; - width: 19px !important; - margin-left: 0px; -} - -.react-select__control { - border-radius: 0.25rem !important; - min-height: 36px !important; - width: 15.8rem; -} - -.react-select__menu { - width: 15.8rem !important; -} - -.title-text { - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; -} diff --git a/frontend/src/views/projectLiveMonitoring.js b/frontend/src/views/projectLiveMonitoring.js deleted file mode 100644 index 188ef00a4e..0000000000 --- a/frontend/src/views/projectLiveMonitoring.js +++ /dev/null @@ -1,401 +0,0 @@ -import React, { useState, useRef, useEffect } from 'react'; -import ReactPlaceholder from 'react-placeholder'; -import Select from 'react-select'; -import centroid from '@turf/centroid'; -import { - UnderpassFeatureList, - UnderpassMap, - HOTTheme, - UnderpassFeatureStats, - UnderpassValidationStats, -} from '@hotosm/underpass-ui'; -import { Link } from 'react-router-dom'; -import { useDispatch } from 'react-redux'; - -import { ProjectVisibilityBox } from '../components/projectDetail/visibilityBox'; -import { ProjectStatusBox } from '../components/projectDetail/statusBox'; -import { useSetTitleTag } from '../hooks/UseMetaTags'; -import { useParams } from 'react-router-dom'; -import { useFetch } from '../hooks/UseFetch'; -import './projectLiveMonitoring.css'; -import { MAPBOX_TOKEN, UNDERPASS_URL } from '../config'; - -const availableImageryOptions = [ - { label: 'OSM', value: 'osm' }, - { label: 'Bing', value: 'Bing' }, - { label: 'Mapbox Satellite', value: 'Mapbox' }, - { label: 'ESRI World Imagery', value: 'EsriWorldImagery' }, -]; - -const availableImageryValues = availableImageryOptions.map((item) => item.value); - -const config = { - API_URL: UNDERPASS_URL, - MAPBOX_TOKEN: MAPBOX_TOKEN, - // set default sources of Tasking Manager - sources: { - osm: { - type: 'raster', - tiles: ['https://a.tile.openstreetmap.org/{z}/{x}/{y}.png'], - tileSize: 256, - attribution: '© OpenStreetMap Contributors', - maxzoom: 19, - }, - Bing: { - type: 'raster', - tiles: ['https://ecn.t3.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=1'], - tileSize: 256, - attribution: '© OpenStreetMap Contributors', - maxzoom: 18, - }, - Mapbox: { - type: 'raster', - tiles: [ - `https://api.mapbox.com/styles/v1/mapbox/satellite-v9/tiles/{z}/{x}/{y}?access_token=${MAPBOX_TOKEN}`, - ], - tileSize: 512, - attribution: '© OpenStreetMap Contributors © Mapbox', - maxzoom: 19, - }, - EsriWorldImagery: { - type: 'raster', - tiles: [ - 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', - ], - tileSize: 256, - attribution: '© OpenStreetMap Contributors © ESRI', - maxzoom: 18, - }, - }, -}; - -const statusList = { - ALL: '', - UNSQUARED: 'badgeom', - OVERLAPPING: 'overlapping', - BADVALUE: 'badvalue', -}; - -const mappingTypesTags = { - ROADS: 'highway', - BUILDINGS: 'building', - WATERWAYS: 'waterway', -}; - -const mappingTypesFeatureTypes = { - ROADS: 'line', - BUILDINGS: 'polygon', - WATERWAYS: 'line', -}; - -export function ProjectLiveMonitoring() { - const { id } = useParams(); - const dispatch = useDispatch(); - const [coords, setCoords] = useState([0, 0]); - const [activeFeature, setActiveFeature] = useState(null); - const [tags, setTags] = useState('building'); - const [featureType, setFeatureType] = useState('polygon'); - const [mapSource, setMapSource] = useState('osm'); - const [imageryOptions, setImageryOptions] = useState(availableImageryOptions); - const [mapConfig, setMapConfig] = useState(config); - const [realtimeList, setRealtimeList] = useState(false); - const [realtimeMap, setRealtimeMap] = useState(false); - const [listAll, setListAll] = useState(false); - // eslint-disable-next-line - const [status, setStatus] = useState(statusList.UNSQUARED); - // eslint-disable-next-line - const [area, setArea] = useState(null); - const tagsInputRef = useRef(''); - - useSetTitleTag(`Project #${id} Live Monitoring`); - const [error, loading, data] = useFetch(`projects/${id}/`, id); - - const [areaOfInterest, setAreaOfInterest] = useState(null); - const [project, setProject] = useState(null); - - useEffect(() => { - if (!Object.keys(data).length) return; - setProject(data); - // add custom to config sources if the project has custom imagery - const hasCustomImagery = data.imagery?.includes('http'); - if (hasCustomImagery) { - setMapConfig((prev) => ({ - ...prev, - sources: { - ...prev.sources, - custom: { - type: 'raster', - tiles: [data.imagery], - tileSize: 256, - attribution: 'custom', - maxzoom: 19, - }, - }, - })); - setImageryOptions((prev) => [...prev, { label: 'Custom', value: 'custom' }]); - } - // set mapSource after data fetch - const mapSourceValue = hasCustomImagery - ? 'custom' - : availableImageryValues.includes(data.imagery) - ? data.imagery - : 'osm'; - setMapSource(mapSourceValue); - }, [data]); - - useEffect(() => { - if (project && project.aoiBBOX && project.areaOfInterest) { - const bbox = [ - [project.aoiBBOX[0], project.aoiBBOX[1]], - [project.aoiBBOX[0], project.aoiBBOX[3]], - [project.aoiBBOX[2], project.aoiBBOX[3]], - [project.aoiBBOX[2], project.aoiBBOX[1]], - [project.aoiBBOX[0], project.aoiBBOX[1]], - ]; - setCoords( - centroid({ - type: 'MultiPolygon', - coordinates: [[bbox]], - }).geometry.coordinates, - ); - setAreaOfInterest( - [ - bbox[0].join(' '), - bbox[1].join(' '), - bbox[2].join(' '), - bbox[3].join(' '), - bbox[4].join(' '), - ].join(','), - ); - setTags(mappingTypesTags[project.mappingTypes] || 'building'); - setFeatureType(mappingTypesFeatureTypes[project.mappingTypes] || 'polygon'); - } - }, [project]); - - // set organization bar visibility to false - useEffect(() => { - dispatch({ type: 'SET_VISIBILITY', isVisible: false }); - return () => { - dispatch({ type: 'SET_VISIBILITY', isVisible: true }); - }; - }, [dispatch]); - - const hottheme = HOTTheme(); - - const defaultMapStyle = { - waysLine: { - ...hottheme.map.waysLine, - 'line-opacity': 0.8, - }, - waysFill: { - ...hottheme.map.waysFill, - 'fill-opacity': ['match', ['get', 'type'], 'LineString', 0, 0.3], - }, - nodesSymbol: { - ...hottheme.map.nodesSymbol, - 'icon-opacity': ['match', ['get', 'type'], 'Point', 0.8, 0], - }, - }; - - // eslint-disable-next-line - const [demoTheme, setDemoTheme] = useState({ - map: defaultMapStyle, - }); - - const handleFilterClick = (e) => { - e.preventDefault(); - setTags(tagsInputRef.current.value); - return false; - }; - - const handleMapSourceSelect = (selectedItem) => { - setMapSource(selectedItem.value); - }; - - const handleMapMove = ({ bbox }) => { - setArea(bbox); - }; - const handleMapLoad = ({ bbox }) => { - setArea(bbox); - }; - - return ( - -
-
-
-
-
- -   - -
- { - setRealtimeList(!realtimeList); - }} - name="liveListCheckbox" - type="checkbox" - /> - - { - setRealtimeMap(!realtimeMap); - }} - name="liveMapCheckbox" - type="checkbox" - /> - - { - setListAll(!listAll); - }} - name="listAllCheckbox" - type="checkbox" - /> - - -
- { - setCoords([feature.lat, feature.lon]); - const tags = JSON.stringify(feature.tags); - const status = feature.status; - setActiveFeature({ properties: { tags, status }, ...feature }); - }} - realtime={realtimeList} - config={config} - status={listAll ? '' : status} - orderBy="created_at" - onFetchFirstTime={(mostRecentFeature) => { - if (mostRecentFeature) { - setCoords([mostRecentFeature.lat, mostRecentFeature.lon]); - } - }} - /> -
-
-
-
- ); -} - -export default ProjectLiveMonitoring;