From 24f4a80eba9437fe97e31920cc4d450c2502ff86 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:38:03 -0400 Subject: [PATCH] Repo moved --- .gitmodules | 6 +++--- frontend/package.json | 6 +++--- frontend/src/components/pdEditor.js | 4 ++-- frontend/yarn.lock | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index a858caea..41b9e21b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "frontend/pdm-editor"] - path = frontend/pdm-editor - url = https://github.com/osm-sandbox/public-domain-iD.git +[submodule "frontend/pd-editor"] + path = frontend/pd-editor + url = https://github.com/osm-sandbox/public-domain-iD.git diff --git a/frontend/package.json b/frontend/package.json index f21797f3..6b5180e7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,7 +10,7 @@ "@mapbox/mapbox-gl-draw": "^1.4.3", "@mapbox/mapbox-gl-geocoder": "^5.0.2", "@mapbox/mapbox-gl-language": "^0.10.1", - "@publicdomainmap/editor": "file:pdm-editor", + "@osm-sandbox/public-domain-id": "file:pd-editor", "@placemarkio/geo-viewport": "^1.0.2", "@rapideditor/rapid": "^2.3.1", "@sentry/react": "^7.102.0", @@ -81,8 +81,8 @@ }, "scripts": { "build-locales": "combine-messages -i './src/**/messages.js' -o './src/locales/en.json'", - "copy-static": "bash -c \"mkdir -p public/static/id; mkdir -p public/static/rapid; mkdir -p public/static/pdeditor; if ! (test -a public/static/id/index.js); then cp -R node_modules/@hotosm/id/dist/* public/static/id; fi; if ! (test -a public/static/rapid/rapid.js); then cp -R node_modules/@rapideditor/rapid/dist/* public/static/rapid; fi; if ! (test -a public/static/pdeditor/index.js); then cp -R node_modules/@publicdomainmap/editor/dist/* public/static/pdeditor; fi\"", - "update-static": "bash -c \"mkdir -p public/static/id; mkdir -p public/static/rapid; mkdir -p public/static/pdeditor; cp -R node_modules/@hotosm/id/dist/* public/static/id; cp -R node_modules/@rapideditor/rapid/dist/* public/static/rapid; cp -R node_modules/@publicdomainmap/editor/dist/* public/static/pdeditor;\"", + "copy-static": "bash -c \"mkdir -p public/static/id; mkdir -p public/static/rapid; mkdir -p public/static/pdeditor; if ! (test -a public/static/id/index.js); then cp -R node_modules/@hotosm/id/dist/* public/static/id; fi; if ! (test -a public/static/rapid/rapid.js); then cp -R node_modules/@rapideditor/rapid/dist/* public/static/rapid; fi; if ! (test -a public/static/pdeditor/index.js); then cp -R node_modules/@osm-sandbox/public-domain-id/dist/* public/static/pdeditor; fi\"", + "update-static": "bash -c \"mkdir -p public/static/id; mkdir -p public/static/rapid; mkdir -p public/static/pdeditor; cp -R node_modules/@hotosm/id/dist/* public/static/id; cp -R node_modules/@rapideditor/rapid/dist/* public/static/rapid; cp -R node_modules/@osm-sandbox/public-domain-id/dist/* public/static/pdeditor;\"", "patch-id": "bash -c \"cp patch/imagery.min.json public/static/id/data\"", "patch-rapid": "bash -c \"cp patch/rapid-imagery.min.json public/static/rapid/data/imagery.min.json\"", "preparation": "bash -c \"if (test -a ../tasking-manager.env); then grep -hs ^ ../tasking-manager.env .env.expand > .env; else cp .env.expand .env; fi\"", diff --git a/frontend/src/components/pdEditor.js b/frontend/src/components/pdEditor.js index 213f8180..cfc9e529 100644 --- a/frontend/src/components/pdEditor.js +++ b/frontend/src/components/pdEditor.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { useSelector, useDispatch } from 'react-redux'; -import * as iD from '@publicdomainmap/editor'; -import '@publicdomainmap/editor/dist/iD.css'; +import * as iD from '@osm-sandbox/public-domain-id'; +import '@osm-sandbox/public-domain-id/dist/iD.css'; import { PD_CLIENT_ID, PD_CLIENT_SECRET, PD_SERVER_URL, BASE_URL } from '../config'; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index f29f6f49..d8efe4ee 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2613,7 +2613,7 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@publicdomainmap/editor@file:pdm-editor": +"@osm-sandbox/public-domain-id@file:pd-editor": version "1.0.1" dependencies: "@ideditor/country-coder" "~5.1.0"