From cc9fb9376d26363dedbabda23d97e0249d6030da Mon Sep 17 00:00:00 2001 From: Anton Tranelis <31516529+antontranelis@users.noreply.github.com> Date: Tue, 6 May 2025 11:26:17 +0200 Subject: [PATCH 1/4] fix(source): fix popup tip (#215) * 3.0.82 * version number * fix popup tip radius --- package-lock.json | 4 ++-- package.json | 2 +- src/assets/css/leaflet.css | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 201f414d..babc8306 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.81", + "version": "3.0.82", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.81", + "version": "3.0.82", "license": "GPL-3.0-only", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 6b8101f3..5c277b88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.81", + "version": "3.0.83", "description": "Reuseable React Components to build mapping apps for real life communities and networks", "repository": "https://github.com/utopia-os/utopia-ui", "homepage": "https://utopia-os.org/", diff --git a/src/assets/css/leaflet.css b/src/assets/css/leaflet.css index 1092c697..5451da91 100644 --- a/src/assets/css/leaflet.css +++ b/src/assets/css/leaflet.css @@ -25,6 +25,10 @@ border-radius: var(--radius-box); } +.leaflet-popup-tip-container, .leaflet-popup-tip{ + border-radius: 0; +} + .leaflet-tooltip { background-color: var(--color-base-100); color: var(--color-base-content); From 4d0ffdffc64b01b3fb1a59f05434c7be993ff702 Mon Sep 17 00:00:00 2001 From: Anton Tranelis <31516529+antontranelis@users.noreply.github.com> Date: Tue, 6 May 2025 11:28:28 +0200 Subject: [PATCH 2/4] fix(source): new marker icons (#214) * 3.0.82 * version number * steps-icon --- src/Utils/MarkerIconFactory.ts | 2 ++ src/assets/css/marker-icons.css | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/src/Utils/MarkerIconFactory.ts b/src/Utils/MarkerIconFactory.ts index e6229fcd..8dfb3cc8 100644 --- a/src/Utils/MarkerIconFactory.ts +++ b/src/Utils/MarkerIconFactory.ts @@ -71,6 +71,8 @@ const addIcon = (icon: string) => { return '' case 'cannabis': return '' + case 'steps': + return '' default: return '' } diff --git a/src/assets/css/marker-icons.css b/src/assets/css/marker-icons.css index c69102d3..4c7ce298 100644 --- a/src/assets/css/marker-icons.css +++ b/src/assets/css/marker-icons.css @@ -115,4 +115,11 @@ top: -36px; left: 4px; width: 24px; +} + +.steps-icon { + position: relative; + top: -34px; + left: 4px; + width: 24px; } \ No newline at end of file From 924195ce9fccc5eaeaf3c8d7ccefdf6d281f1b15 Mon Sep 17 00:00:00 2001 From: Anton Tranelis <31516529+antontranelis@users.noreply.github.com> Date: Tue, 6 May 2025 11:31:36 +0200 Subject: [PATCH 3/4] fix(source): fix gallery (#213) * 3.0.82 * version number * fix gallery bug --- .../Profile/Subcomponents/GalleryView.tsx | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/Components/Profile/Subcomponents/GalleryView.tsx b/src/Components/Profile/Subcomponents/GalleryView.tsx index be2e7830..d167aec0 100644 --- a/src/Components/Profile/Subcomponents/GalleryView.tsx +++ b/src/Components/Profile/Subcomponents/GalleryView.tsx @@ -9,26 +9,25 @@ import type { Item } from '#types/Item' export const GalleryView = ({ item }: { item: Item }) => { const [index, setIndex] = useState(-1) const appState = useAppState() - const images = item.gallery?.map((i, j) => { - return { + const images = + item.gallery?.map((i, j) => ({ src: appState.assetsApi.url + `${i.directus_files_id.id}.jpg`, width: i.directus_files_id.width, height: i.directus_files_id.height, index: j, - } - }) + })) ?? [] - if (!images) throw new Error('GalleryView: images is undefined') + if (images.length > 0) + return ( +
+ setIndex(current)} + /> - return ( -
- setIndex(current)} - /> - - = 0} close={() => setIndex(-1)} /> -
- ) + = 0} close={() => setIndex(-1)} /> +
+ ) + else return <> } From 5f5fbe6a13cb249105d78d134a17eec83ac778dd Mon Sep 17 00:00:00 2001 From: Anton Tranelis <31516529+antontranelis@users.noreply.github.com> Date: Fri, 9 May 2025 11:57:04 +0200 Subject: [PATCH 4/4] fix(source): icons (#216) * 3.0.82 * version number * 3.0.84 * 3.0.85 * suitcase & offer icon --- package-lock.json | 4 ++-- package.json | 2 +- src/Utils/MarkerIconFactory.ts | 4 ++++ src/assets/css/marker-icons.css | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index babc8306..a83dd2c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.82", + "version": "3.0.85", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.82", + "version": "3.0.85", "license": "GPL-3.0-only", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 5c277b88..076bc3bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.83", + "version": "3.0.85", "description": "Reuseable React Components to build mapping apps for real life communities and networks", "repository": "https://github.com/utopia-os/utopia-ui", "homepage": "https://utopia-os.org/", diff --git a/src/Utils/MarkerIconFactory.ts b/src/Utils/MarkerIconFactory.ts index 8dfb3cc8..1b1bcf35 100644 --- a/src/Utils/MarkerIconFactory.ts +++ b/src/Utils/MarkerIconFactory.ts @@ -73,6 +73,10 @@ const addIcon = (icon: string) => { return '' case 'steps': return '' + case 'suitcase': + return '' + case 'offer': + return '' default: return '' } diff --git a/src/assets/css/marker-icons.css b/src/assets/css/marker-icons.css index 4c7ce298..836c1ef0 100644 --- a/src/assets/css/marker-icons.css +++ b/src/assets/css/marker-icons.css @@ -122,4 +122,18 @@ top: -34px; left: 4px; width: 24px; +} + +.suitcase-icon { + position: relative; + top: -34px; + left: 4px; + width: 24px; +} + +.offer-icon { + position: relative; + top: -34.5px; + left: 4px; + width: 24px; } \ No newline at end of file