Merge branch 'feature/alert-verify-pages' into develop

Plant-for-the-Planet-org · Jul 2, 2023 · 38090a2 · 38090a2 · vercel · Jul 2, 2023
2 parents e3fef23 + 24fea7e
commit 38090a2
Show file tree

Hide file tree

Showing 28 changed files with 11,043 additions and 3,455 deletions.
diff --git a/apps/server/package.json b/apps/server/package.json
@@ -36,13 +36,16 @@
     "csv-parse": "^5.3.9",
     "geo-tz": "^7.0.7",
     "hash-wasm": "^4.9.0",
-    "md5": "^2.3.0",
+    "mapbox-gl": "1.13",
+    "maplibre-gl": "^3.1.0",
     "next": "^13.2.1",
     "nodemailer": "^6.9.1",
     "pg-promise": "^11.4.3",
     "phone": "^3.1.37",
     "prisma": "^4.15.0",
     "react-cookie": "^4.1.1",
+    "react-map-gl": "7.1.0-beta.3",
+    "styled-components": "^6.0.1",
     "superjson": "1.9.1",
     "twilio": "^4.11.0",
     "zod": "^3.20.6"

diff --git a/apps/server/public/alertPage/alertIcon.svg b/apps/server/public/alertPage/alertIcon.svg
diff --git a/apps/server/public/alertPage/copy.svg b/apps/server/public/alertPage/copy.svg
diff --git a/apps/server/public/alertPage/locationPin.svg b/apps/server/public/alertPage/locationPin.svg
diff --git a/apps/server/public/alertPage/mapFocus/Ellipse1.svg b/apps/server/public/alertPage/mapFocus/Ellipse1.svg
diff --git a/apps/server/public/alertPage/mapFocus/Ellipse2.svg b/apps/server/public/alertPage/mapFocus/Ellipse2.svg
diff --git a/apps/server/public/alertPage/mapFocus/Vector.svg b/apps/server/public/alertPage/mapFocus/Vector.svg
diff --git a/apps/server/public/alertPage/radarIcon.svg b/apps/server/public/alertPage/radarIcon.svg
diff --git a/apps/server/public/verify/letterImage.png b/apps/server/public/verify/letterImage.png