diff --git a/frontend/src/components/Icons/MapPin.tsx b/frontend/src/components/Icons/MapPin.tsx new file mode 100644 index 00000000..5ac62538 --- /dev/null +++ b/frontend/src/components/Icons/MapPin.tsx @@ -0,0 +1,7 @@ +import React from 'react'; + +export default function MapPin(color: 'Blue' | 'Lilac') { + const lightHex = color === 'Blue' ? '#bde4f8;' : '#c55fcc'; + + return ``; +} diff --git a/frontend/src/components/Icons/index.ts b/frontend/src/components/Icons/index.ts index f7a40069..27f81438 100644 --- a/frontend/src/components/Icons/index.ts +++ b/frontend/src/components/Icons/index.ts @@ -17,6 +17,7 @@ export { default as UserNinjaIcon } from './UserNinja'; export { default as TorIcon } from './Tor'; export { default as SimplexIcon } from './Simplex'; export { default as NostrIcon } from './Nostr'; +export { default as MapPin } from './MapPin'; // Flags with props export { default as FlagWithProps } from './WorldFlags'; diff --git a/frontend/src/components/Map/index.tsx b/frontend/src/components/Map/index.tsx index 339dd644..ab592056 100644 --- a/frontend/src/components/Map/index.tsx +++ b/frontend/src/components/Map/index.tsx @@ -4,11 +4,12 @@ import { MapContainer, GeoJSON, useMapEvents, TileLayer, Tooltip, Marker } from import { useTheme, LinearProgress } from '@mui/material'; import { UseAppStoreType, AppContext } from '../../contexts/AppContext'; import { GeoJsonObject } from 'geojson'; -import { Icon, LeafletMouseEvent } from 'leaflet'; +import { DivIcon, LeafletMouseEvent } from 'leaflet'; import { PublicOrder } from '../../models'; import OrderTooltip from '../Charts/helpers/OrderTooltip'; import getWorldmapGeojson from '../../geo/Web'; import MarkerClusterGroup from '@christopherpickering/react-leaflet-markercluster'; +import { MapPin } from '../Icons'; interface Props { orderType?: number; @@ -50,20 +51,17 @@ const Map = ({ order?: PublicOrder, ) => { const color = orderType == 1 ? 'Blue' : 'Lilac'; - const path = - window.NativeRobosats === undefined - ? '/static/assets' - : 'file:///android_asset/Web.bundle/assets'; return ( \ No newline at end of file diff --git a/frontend/static/assets/vector/Location_Lilac.svg b/frontend/static/assets/vector/Location_Lilac.svg deleted file mode 100644 index f13cbba9..00000000 --- a/frontend/static/assets/vector/Location_Lilac.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/static/assets/vector/Location_robot_Blue.svg b/frontend/static/assets/vector/Location_robot_Blue.svg deleted file mode 100644 index 52334bda..00000000 --- a/frontend/static/assets/vector/Location_robot_Blue.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/static/assets/vector/Location_robot_Lilac.svg b/frontend/static/assets/vector/Location_robot_Lilac.svg deleted file mode 100644 index ff56559f..00000000 --- a/frontend/static/assets/vector/Location_robot_Lilac.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/webpack.config.ts b/frontend/webpack.config.ts index e343ae34..76950736 100644 --- a/frontend/webpack.config.ts +++ b/frontend/webpack.config.ts @@ -167,10 +167,6 @@ const configMobile: Configuration = { from: path.resolve(__dirname, 'static/assets/sounds'), to: path.resolve(__dirname, '../mobile/html/Web.bundle/assets/sounds'), }, - { - from: path.resolve(__dirname, 'static/assets/vector'), - to: path.resolve(__dirname, '../mobile/html/Web.bundle/assets/vector'), - }, ], }), ],