From 005adc42adefa40c6560d7d078a22a27612e71d5 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Wed, 24 Jul 2024 15:16:50 +0200 Subject: [PATCH 01/65] 3.0.0-alpha.216 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44d389cb..d38321f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.215", + "version": "3.0.0-alpha.216", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.215", + "version": "3.0.0-alpha.216", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index fd71a943..5180bca8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.215", + "version": "3.0.0-alpha.216", "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/", From 431f8df132942e5c21116b285a59bc49c525839f Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 08:57:26 +0200 Subject: [PATCH 02/65] added puzzle icon --- src/Utils/MarkerIconFactory.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Utils/MarkerIconFactory.ts b/src/Utils/MarkerIconFactory.ts index fe6237ea..341335f0 100644 --- a/src/Utils/MarkerIconFactory.ts +++ b/src/Utils/MarkerIconFactory.ts @@ -36,6 +36,8 @@ const addIcon = (icon: string) => { return ' ' case "group": return '' + case "puzzle": + return '' default: return ""; } From 2156a9811b6b135a4c32421b1344b12339e63205 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 08:58:14 +0200 Subject: [PATCH 03/65] advaneced permission logic --- src/Components/Map/hooks/usePermissions.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Components/Map/hooks/usePermissions.tsx b/src/Components/Map/hooks/usePermissions.tsx index d0dd9bbb..3b557c71 100644 --- a/src/Components/Map/hooks/usePermissions.tsx +++ b/src/Components/Map/hooks/usePermissions.tsx @@ -80,7 +80,11 @@ function usePermissionsManager(initialPermissions: Permission[]): { }; const evaluatePermissions = (permissionConditions: any) => { - return permissionConditions._and?.every((andCondition: any) => + if (!permissionConditions || !permissionConditions._and) { + return true; + } + + return permissionConditions._and.every((andCondition: any) => andCondition._or ? andCondition._or.some((orCondition: any) => evaluateCondition(orCondition)) : evaluateCondition(andCondition) @@ -96,12 +100,12 @@ function usePermissionsManager(initialPermissions: Permission[]): { ( (p.role === user?.role && ( - !item || !p.permissions || evaluatePermissions(p.permissions) + !item || evaluatePermissions(p.permissions) )) || (p.role == null && ( (layer?.public_edit_items || item?.layer?.public_edit_items) && - (!item || !p.permissions || evaluatePermissions(p.permissions)) + (!item || evaluatePermissions(p.permissions)) )) ) ); From d55864e0837c10b07f3de42d059066b20212a012 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 08:59:23 +0200 Subject: [PATCH 04/65] logging and awaits added --- src/Components/Profile/ProfileForm.tsx | 11 +++++++++++ src/Components/Profile/itemFunctions.ts | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Components/Profile/ProfileForm.tsx b/src/Components/Profile/ProfileForm.tsx index 74ce8ad0..232b9887 100644 --- a/src/Components/Profile/ProfileForm.tsx +++ b/src/Components/Profile/ProfileForm.tsx @@ -65,6 +65,17 @@ export function ProfileForm({ userType }: { userType: string }) { }, [items]) + useEffect(() => { + console.log(state.offers); + console.log(state.needs); + console.log(state.id); + console.log(item); + + + + }, [state]) + + useEffect(() => { const newColor = item.layer?.itemColorField && getValue(item, item.layer?.itemColorField) ? getValue(item, item.layer?.itemColorField) diff --git a/src/Components/Profile/itemFunctions.ts b/src/Components/Profile/itemFunctions.ts index 0fa840cb..e5387e20 100644 --- a/src/Components/Profile/itemFunctions.ts +++ b/src/Components/Profile/itemFunctions.ts @@ -103,7 +103,7 @@ export const onUpdateItem = async (state, item, tags, addTag, setLoading, naviga let offer_updates: Array = []; //check for new offers - state.offers?.map(o => { + await state.offers?.map(o => { const existingOffer = item?.offers?.find(t => t.tags_id === o.id) existingOffer && offer_updates.push(existingOffer.id) if (!existingOffer && !tags.some(t => t.id === o.id)) addTag({ ...o, offer_or_need: true }) @@ -112,7 +112,7 @@ export const onUpdateItem = async (state, item, tags, addTag, setLoading, naviga let needs_updates: Array = []; - state.needs?.map(n => { + await state.needs?.map(n => { const existingNeed = item?.needs?.find(t => t.tags_id === n.id) existingNeed && needs_updates.push(existingNeed.id) !existingNeed && needs_updates.push({ items_id: item?.id, tags_id: n.id }) From 362c7401d28e54b40279eed748a7135b3edae595 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 09:00:17 +0200 Subject: [PATCH 05/65] 3.0.0-alpha.217 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d38321f3..a301c58a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.216", + "version": "3.0.0-alpha.217", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.216", + "version": "3.0.0-alpha.217", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 5180bca8..712c4ae3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.216", + "version": "3.0.0-alpha.217", "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/", From 361e6831a0bcf53cd61be346a0cc0f01dd1cf231 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 10:26:16 +0200 Subject: [PATCH 06/65] set sidbar width to 168px --- src/Components/AppShell/SideBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/AppShell/SideBar.tsx b/src/Components/AppShell/SideBar.tsx index d0022aec..108775da 100644 --- a/src/Components/AppShell/SideBar.tsx +++ b/src/Components/AppShell/SideBar.tsx @@ -71,7 +71,7 @@ export function SideBar({ routes, bottomRoutes }: { routes: route[], bottomRoute data-te-sidenav-content="#app-content" data-te-sidenav-slim-collapsed="true" data-te-sidenav-slim-width="56" - data-te-sidenav-width="160"> + data-te-sidenav-width="168">
    { From dc3434e22c77ad8143799c97815bef723433c33d Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 10:27:29 +0200 Subject: [PATCH 07/65] set #tag filter to logic from AND to OR --- src/Components/Map/Layer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Map/Layer.tsx b/src/Components/Map/Layer.tsx index 777d391a..fed86283 100644 --- a/src/Components/Map/Layer.tsx +++ b/src/Components/Map/Layer.tsx @@ -149,7 +149,7 @@ export const Layer = ({ items. filter(item => item.layer?.name === name)?. filter(item => - filterTags.length == 0 ? item : filterTags.every(tag => getItemTags(item).some(filterTag => filterTag.name.toLocaleLowerCase() === tag.name.toLocaleLowerCase())))?. + filterTags.length == 0 ? item : filterTags.some(tag => getItemTags(item).some(filterTag => filterTag.name.toLocaleLowerCase() === tag.name.toLocaleLowerCase())))?. filter(item => item.layer && isLayerVisible(item.layer)). filter(item => item.group_type && isGroupTypeVisible(item.group_type)|| visibleGroupTypes.length == 0). map((item: Item) => { From 4afc19aa454dd7e4cb0f9ef3398b702fc7716d3a Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 10:27:35 +0200 Subject: [PATCH 08/65] 3.0.0-alpha.218 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a301c58a..0272b84c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.217", + "version": "3.0.0-alpha.218", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.217", + "version": "3.0.0-alpha.218", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 712c4ae3..7f782953 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.217", + "version": "3.0.0-alpha.218", "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/", From 5781c8c8d4f3281c275218561b4a8e6d2f6c11fd Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 12:42:37 +0200 Subject: [PATCH 09/65] remove logging --- src/Components/Profile/ProfileForm.tsx | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Components/Profile/ProfileForm.tsx b/src/Components/Profile/ProfileForm.tsx index 232b9887..c407c913 100644 --- a/src/Components/Profile/ProfileForm.tsx +++ b/src/Components/Profile/ProfileForm.tsx @@ -63,18 +63,7 @@ export function ProfileForm({ userType }: { userType: string }) { !item && setItem({ id: crypto.randomUUID(), name: user ? user.first_name : "", text: "", layer: layer, new: true }) - }, [items]) - - useEffect(() => { - console.log(state.offers); - console.log(state.needs); - console.log(state.id); - console.log(item); - - - - }, [state]) - + }, [items]) useEffect(() => { const newColor = item.layer?.itemColorField && getValue(item, item.layer?.itemColorField) From 7e426348df00b4cc0644f9436f86e46b1ae2d211 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 12:43:03 +0200 Subject: [PATCH 10/65] fixed request handling to fix add tag issue --- src/Components/Profile/itemFunctions.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Components/Profile/itemFunctions.ts b/src/Components/Profile/itemFunctions.ts index e5387e20..72a79d01 100644 --- a/src/Components/Profile/itemFunctions.ts +++ b/src/Components/Profile/itemFunctions.ts @@ -4,6 +4,8 @@ import { hashTagRegex } from '../../Utils/HashTagRegex'; import { randomColor } from '../../Utils/RandomColor'; import { toast } from 'react-toastify'; +const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); + export const submitNewItem = async (evt: any, type: string, item, user, setLoading, tags, addTag, addItem, linkItem, resetFilterTags, layers, addItemPopupType, setAddItemPopupType) => { evt.preventDefault(); const formItem: Item = {} as Item; @@ -142,24 +144,26 @@ export const onUpdateItem = async (state, item, tags, addTag, setLoading, naviga let offers_state: Array = []; let needs_state: Array = []; - await state.offers.map(o => { + state.offers.map(o => { offers_state.push({ items_id: item?.id, tags_id: o.id }) }); - await state.needs.map(n => { + state.needs.map(n => { needs_state.push({ items_id: item?.id, tags_id: n.id }) }); changedItem = { ...changedItem, offers: offers_state, needs: needs_state }; + setLoading(true); - state.text.toLocaleLowerCase().match(hashTagRegex)?.map(tag => { + await state.text.toLocaleLowerCase().match(hashTagRegex)?.map(tag => { if (!tags.find((t) => t.name.toLocaleLowerCase() === tag.slice(1).toLocaleLowerCase())) { addTag({ id: crypto.randomUUID(), name: encodeTag(tag.slice(1).toLocaleLowerCase()), color: randomColor() }) } }); - setLoading(true); + + await sleep(200); if (!item.new) { item?.layer?.api?.updateItem && toast.promise( @@ -181,6 +185,7 @@ export const onUpdateItem = async (state, item, tags, addTag, setLoading, naviga } else { + item.new = false; item.layer?.api?.createItem && toast.promise( item.layer?.api?.createItem(changedItem), { From 79f0e5fdd12f394f43dcc7e1d5c0b2bd235d00ef Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 12:45:43 +0200 Subject: [PATCH 11/65] 3.0.0-alpha.219 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0272b84c..559d2273 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.218", + "version": "3.0.0-alpha.219", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.218", + "version": "3.0.0-alpha.219", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 7f782953..3553ea3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.218", + "version": "3.0.0-alpha.219", "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/", From 0fdd39b39180ebc6184fc1ff40c9e8a1223ea29b Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 13:04:02 +0200 Subject: [PATCH 12/65] fixed tag keyboard select heighlighting --- src/Components/Templates/TagView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Templates/TagView.tsx b/src/Components/Templates/TagView.tsx index 832e8aa7..fe1f2a0f 100644 --- a/src/Components/Templates/TagView.tsx +++ b/src/Components/Templates/TagView.tsx @@ -6,7 +6,7 @@ export const TagView = ({tag, heighlight, onClick} : {tag: Tag, heighlight?: boo return ( // Use your imagination to render suggestions. -
    +
    {decodeTag(tag.name)}
    From 05ce1ec5ff31d6bc09ccfbce899d3dd3704484be Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 13:04:14 +0200 Subject: [PATCH 13/65] removed unused impoert --- src/Components/Input/Autocomplete.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Components/Input/Autocomplete.tsx b/src/Components/Input/Autocomplete.tsx index 044683c9..d6f17a43 100644 --- a/src/Components/Input/Autocomplete.tsx +++ b/src/Components/Input/Autocomplete.tsx @@ -1,6 +1,5 @@ import * as React from 'react' import { useEffect } from 'react'; -import { decodeTag } from '../../Utils/FormatTags'; import { TagView } from '../Templates/TagView'; export const Autocomplete = ({ inputProps, suggestions, onSelected, pushFilteredSuggestions, setFocus }: { inputProps: any, suggestions: Array, onSelected: (suggestion) => void, pushFilteredSuggestions?: Array, setFocus?: boolean }) => { From 75f923aee2cb5a039f44b11862c974c33a304246 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 13:04:23 +0200 Subject: [PATCH 14/65] 3.0.0-alpha.220 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 559d2273..ae1a0c4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.219", + "version": "3.0.0-alpha.220", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.219", + "version": "3.0.0-alpha.220", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 3553ea3c..f94d8731 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.219", + "version": "3.0.0-alpha.220", "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/", From 3514aea29f7cfcdc7c969139e3cea27c9a8942d5 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 18:51:07 +0200 Subject: [PATCH 15/65] sidebar to 180px --- src/Components/AppShell/SideBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/AppShell/SideBar.tsx b/src/Components/AppShell/SideBar.tsx index 108775da..de9f2c64 100644 --- a/src/Components/AppShell/SideBar.tsx +++ b/src/Components/AppShell/SideBar.tsx @@ -71,7 +71,7 @@ export function SideBar({ routes, bottomRoutes }: { routes: route[], bottomRoute data-te-sidenav-content="#app-content" data-te-sidenav-slim-collapsed="true" data-te-sidenav-slim-width="56" - data-te-sidenav-width="168"> + data-te-sidenav-width="180">
      { From 9e5d6653fb5c35ccded3a725d87c96bcf4dc4699 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 18:51:33 +0200 Subject: [PATCH 16/65] 3.0.0-alpha.221 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae1a0c4d..b4fbf78d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.220", + "version": "3.0.0-alpha.221", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.220", + "version": "3.0.0-alpha.221", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index f94d8731..dde4886f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.220", + "version": "3.0.0-alpha.221", "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/", From 0ebe5fb01bfc24e805dcd9e87d55ed94a8158db6 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 19:03:52 +0200 Subject: [PATCH 17/65] adjust small item heading --- src/Components/Map/Subcomponents/ItemFormPopup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Map/Subcomponents/ItemFormPopup.tsx b/src/Components/Map/Subcomponents/ItemFormPopup.tsx index 5d266ec9..99d9b90a 100644 --- a/src/Components/Map/Subcomponents/ItemFormPopup.tsx +++ b/src/Components/Map/Subcomponents/ItemFormPopup.tsx @@ -129,7 +129,7 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
      handleSubmit(e)}> {props.item ?
      : -
      { popupTitle? popupTitle : `New ${props.layer.name}`}
      +
      { props.layer.menuText}
      } {props.children ? From ca018fde46a0abef9f2403eda07b9c9206fed24f Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 19:04:03 +0200 Subject: [PATCH 18/65] 3.0.0-alpha.222 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b4fbf78d..9c7446aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.221", + "version": "3.0.0-alpha.222", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.221", + "version": "3.0.0-alpha.222", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index dde4886f..45db509e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.221", + "version": "3.0.0-alpha.222", "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/", From e9c0a6f1e752975598b4e8567b03b6b8e93c7927 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 19:06:13 +0200 Subject: [PATCH 19/65] center small item heading --- src/Components/Map/Subcomponents/ItemFormPopup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Map/Subcomponents/ItemFormPopup.tsx b/src/Components/Map/Subcomponents/ItemFormPopup.tsx index 99d9b90a..1e86440a 100644 --- a/src/Components/Map/Subcomponents/ItemFormPopup.tsx +++ b/src/Components/Map/Subcomponents/ItemFormPopup.tsx @@ -129,7 +129,7 @@ export function ItemFormPopup(props: ItemFormPopupProps) { handleSubmit(e)}> {props.item ?
      : -
      { props.layer.menuText}
      +
      { props.layer.menuText}
      } {props.children ? From b3d89827a264c2ae8d22a980a017a084b2ecb840 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 19:06:16 +0200 Subject: [PATCH 20/65] 3.0.0-alpha.223 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c7446aa..78380d88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.222", + "version": "3.0.0-alpha.223", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.222", + "version": "3.0.0-alpha.223", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 45db509e..1089e721 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.222", + "version": "3.0.0-alpha.223", "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/", From 7f907029617e657982bb3eae1f0b3a1b40d28fe2 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 19:06:30 +0200 Subject: [PATCH 21/65] 3.0.0-alpha.224 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78380d88..11c1c958 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.223", + "version": "3.0.0-alpha.224", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.223", + "version": "3.0.0-alpha.224", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 1089e721..b1cec9b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.223", + "version": "3.0.0-alpha.224", "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/", From 4c215ef803678d0fb9ece66416cd6f6eff4f8034 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 19:07:31 +0200 Subject: [PATCH 22/65] 3.0.0-alpha.225 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 11c1c958..e1b1185c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.224", + "version": "3.0.0-alpha.225", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.224", + "version": "3.0.0-alpha.225", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index b1cec9b7..ade0bbad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.224", + "version": "3.0.0-alpha.225", "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/", From 6e4b8837424fcce4da83a653faa8ef752c26eaaa Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 19:07:45 +0200 Subject: [PATCH 23/65] 3.0.0-alpha.226 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e1b1185c..0b3033aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.225", + "version": "3.0.0-alpha.226", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.225", + "version": "3.0.0-alpha.226", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index ade0bbad..30a0f3f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.225", + "version": "3.0.0-alpha.226", "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/", From 6ddda318bd26427d940123b09e9579116ef4ba33 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 20:38:35 +0200 Subject: [PATCH 24/65] fix simple form --- src/Components/Profile/ProfileForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Profile/ProfileForm.tsx b/src/Components/Profile/ProfileForm.tsx index c407c913..03258d64 100644 --- a/src/Components/Profile/ProfileForm.tsx +++ b/src/Components/Profile/ProfileForm.tsx @@ -130,7 +130,7 @@ export function ProfileForm({ userType }: { userType: string }) { )} {template == "simple" && - + } {template == "tabs" && From 53598fc066db4b029cddd2cdc3ceedf4fac0a47e Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 20:38:54 +0200 Subject: [PATCH 25/65] comment --- src/Components/Profile/itemFunctions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Profile/itemFunctions.ts b/src/Components/Profile/itemFunctions.ts index 72a79d01..45af4d53 100644 --- a/src/Components/Profile/itemFunctions.ts +++ b/src/Components/Profile/itemFunctions.ts @@ -162,7 +162,7 @@ export const onUpdateItem = async (state, item, tags, addTag, setLoading, naviga } }); - + //take care that addTag request comes before item request await sleep(200); if (!item.new) { From 1d53ba3f9ca9efc091337a8de85d08045110bc97 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 20:39:25 +0200 Subject: [PATCH 26/65] close new item form when switching layers --- .../Templates/OverlayItemsIndexPage.tsx | 75 ++++++++++--------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/src/Components/Templates/OverlayItemsIndexPage.tsx b/src/Components/Templates/OverlayItemsIndexPage.tsx index 12ae18b7..1bfaea67 100644 --- a/src/Components/Templates/OverlayItemsIndexPage.tsx +++ b/src/Components/Templates/OverlayItemsIndexPage.tsx @@ -22,12 +22,6 @@ import { TagsControl } from '../Map/Subcomponents/Controls/TagsControl'; import { useFilterTags } from '../Map/hooks/useFilter'; -type breadcrumb = { - name: string, - path: string -} - - export const OverlayItemsIndexPage = ({ url, layerName, parameterField, plusButton = true }: { layerName: string, url: string, parameterField: string, plusButton?: boolean }) => { @@ -45,6 +39,11 @@ export const OverlayItemsIndexPage = ({ url, layerName, parameterField, plusButt scroll(); }, [addItemPopupType]) + useEffect(() => { + setAddItemPopupType(""); + }, [layerName]) + + const tags = useTags(); const addTag = useAddTag(); const { user } = useAuth(); @@ -120,42 +119,44 @@ export const OverlayItemsIndexPage = ({ url, layerName, parameterField, plusButt
      { items?.filter(i => i.layer?.name === layerName). - filter(item => - filterTags.length == 0 ? item : filterTags.every(tag => getItemTags(item).some(filterTag => filterTag.name.toLocaleLowerCase() === tag.name.toLocaleLowerCase())))?. - sort((a, b) => { - // Convert date_created to milliseconds, handle undefined by converting to lowest possible date (0 milliseconds) - const dateA = a.date_updated ? new Date(a.date_updated).getTime() : a.date_created ? new Date(a.date_created).getTime() : 0; - const dateB = b.date_updated ? new Date(b.date_updated).getTime() : b.date_created ? new Date(b.date_created).getTime() : 0; - return dateB - dateA; // Subtracts milliseconds which are numbers - })?. - map((i, k) => ( -
      - deleteItem(i)} /> -
      - )) + filter(item => + filterTags.length == 0 ? item : filterTags.every(tag => getItemTags(item).some(filterTag => filterTag.name.toLocaleLowerCase() === tag.name.toLocaleLowerCase())))?. + sort((a, b) => { + // Convert date_created to milliseconds, handle undefined by converting to lowest possible date (0 milliseconds) + const dateA = a.date_updated ? new Date(a.date_updated).getTime() : a.date_created ? new Date(a.date_created).getTime() : 0; + const dateB = b.date_updated ? new Date(b.date_updated).getTime() : b.date_created ? new Date(b.date_created).getTime() : 0; + return dateB - dateA; // Subtracts milliseconds which are numbers + })?. + map((i, k) => ( +
      + deleteItem(i)} /> +
      + )) } -
      - {addItemPopupType == "place" && ( - submitNewItem(e)}> -
      - - - {layer?.itemType.show_start_end_input && } - -
      - + {addItemPopupType == "place" && ( + submitNewItem(e)}> +
      + + + {layer?.itemType.show_start_end_input && } + +
      + +
      -
      - - )} + + )} +
      +
    {plusButton && { setAddItemPopupType("place"); scroll(); }} color={'#777'} collection='items' />} - )} + ) +} From 627fab28acde8dc7d08d37b18e853b2d7938dc68 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 20:39:50 +0200 Subject: [PATCH 27/65] 3.0.0-alpha.227 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b3033aa..65ed1256 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.226", + "version": "3.0.0-alpha.227", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.226", + "version": "3.0.0-alpha.227", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 30a0f3f5..3297de7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.226", + "version": "3.0.0-alpha.227", "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/", From d7a757c75d3c71c0a0fcbd9c9f36e3d9f7c19c1b Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 20:58:57 +0200 Subject: [PATCH 28/65] fix simple form issze --- src/Components/Profile/ProfileForm.tsx | 2 +- .../Profile/Templates/SimpleForm.tsx | 22 ++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/Components/Profile/ProfileForm.tsx b/src/Components/Profile/ProfileForm.tsx index 03258d64..892f0b1e 100644 --- a/src/Components/Profile/ProfileForm.tsx +++ b/src/Components/Profile/ProfileForm.tsx @@ -130,7 +130,7 @@ export function ProfileForm({ userType }: { userType: string }) { )} {template == "simple" && - + } {template == "tabs" && diff --git a/src/Components/Profile/Templates/SimpleForm.tsx b/src/Components/Profile/Templates/SimpleForm.tsx index 4b060a96..6d630c41 100644 --- a/src/Components/Profile/Templates/SimpleForm.tsx +++ b/src/Components/Profile/Templates/SimpleForm.tsx @@ -1,10 +1,16 @@ -import { TextAreaInput } from "../../Input" +import { TextAreaInput } from "../../Input"; -export const SimpleForm = (item, setState) => { +export const SimpleForm = ({ state, setState }) => { return ( - setState(prevState => ({ - ...prevState, - text: v - }))} containerStyle='tw-mt-8 tw-h-full' inputStyle='tw-h-full' /> - ) -} + setState(prevState => ({ + ...prevState, + text: v + }))} + containerStyle='tw-mt-8 tw-h-full' + inputStyle='tw-h-full' + /> + ); +}; From bb28bd3cf87f175a097600909051da6578561c1f Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 20:59:06 +0200 Subject: [PATCH 29/65] 3.0.0-alpha.228 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 65ed1256..0e500aa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.227", + "version": "3.0.0-alpha.228", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.227", + "version": "3.0.0-alpha.228", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 3297de7a..9a2531e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.227", + "version": "3.0.0-alpha.228", "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/", From 6503ce7efcb5ec7c2ae58175de0de9d329c844d9 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 21:35:58 +0200 Subject: [PATCH 30/65] fix subname can be set to empty string --- src/Components/Input/TextInput.tsx | 43 ++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/src/Components/Input/TextInput.tsx b/src/Components/Input/TextInput.tsx index 8d669a19..85caa770 100644 --- a/src/Components/Input/TextInput.tsx +++ b/src/Components/Input/TextInput.tsx @@ -15,17 +15,38 @@ type InputTextProps = { } -export function TextInput({labelTitle, labelStyle, type, dataField, containerStyle, inputStyle, defaultValue, placeholder, autocomplete, updateFormValue} : InputTextProps){ +export function TextInput({ labelTitle, labelStyle, type, dataField, containerStyle, inputStyle, defaultValue, placeholder, autocomplete, updateFormValue }: InputTextProps) { + const [inputValue, setInputValue] = useState(defaultValue || ""); - return( + useEffect(() => { + setInputValue(defaultValue || ""); + }, [defaultValue]); + + const handleChange = (e: React.ChangeEvent) => { + const newValue = e.target.value; + setInputValue(newValue); + if (updateFormValue) { + updateFormValue(newValue); + } + }; + + return (
    - {labelTitle ? - : " "} - updateFormValue&& updateFormValue(e.target.value)}className={`tw-input tw-input-bordered tw-w-full ${inputStyle ? inputStyle : ""}`} /> + {labelTitle ? ( + + ) : null} +
    - ) -} - - + ); +} \ No newline at end of file From d216dac81016c2c75655e2ea4cc2fd374ab284f7 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 21:36:05 +0200 Subject: [PATCH 31/65] 3.0.0-alpha.229 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e500aa5..07d31dd7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.228", + "version": "3.0.0-alpha.229", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.228", + "version": "3.0.0-alpha.229", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 9a2531e0..fa2dc9d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.228", + "version": "3.0.0-alpha.229", "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/", From 7d2cc19eec65277f42a9b625fbcdb9c4f2a17932 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 21:46:36 +0200 Subject: [PATCH 32/65] give layer and filter control some more padding --- src/Components/Map/Subcomponents/Controls/FilterControl.tsx | 2 +- src/Components/Map/Subcomponents/Controls/LayerControl.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Map/Subcomponents/Controls/FilterControl.tsx b/src/Components/Map/Subcomponents/Controls/FilterControl.tsx index ba964a1a..7e5e6634 100644 --- a/src/Components/Map/Subcomponents/Controls/FilterControl.tsx +++ b/src/Components/Map/Subcomponents/Controls/FilterControl.tsx @@ -23,7 +23,7 @@ export function FilterControl() { const visibleGroupTypes = useVisibleGroupType(); return ( -
    +
    { open ?
    diff --git a/src/Components/Map/Subcomponents/Controls/LayerControl.tsx b/src/Components/Map/Subcomponents/Controls/LayerControl.tsx index 5bc72207..69adbb99 100644 --- a/src/Components/Map/Subcomponents/Controls/LayerControl.tsx +++ b/src/Components/Map/Subcomponents/Controls/LayerControl.tsx @@ -17,7 +17,7 @@ export function LayerControl() { const addVisibleLayer = useAddVisibleLayer(); return ( -
    +
    { open ?
    From d2befc1fe0dc9e65f458430e146e96637b947a46 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 21:47:21 +0200 Subject: [PATCH 33/65] 3.0.0-alpha.230 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 07d31dd7..df6d2dd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.229", + "version": "3.0.0-alpha.230", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.229", + "version": "3.0.0-alpha.230", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index fa2dc9d1..a043b316 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.229", + "version": "3.0.0-alpha.230", "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/", From 65de01caf94a20edad24772cbc9e2c88d5f57bb0 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Mon, 29 Jul 2024 21:48:56 +0200 Subject: [PATCH 34/65] give layer and filter control some more padding --- src/Components/Map/Subcomponents/Controls/FilterControl.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Map/Subcomponents/Controls/FilterControl.tsx b/src/Components/Map/Subcomponents/Controls/FilterControl.tsx index 7e5e6634..f58079e0 100644 --- a/src/Components/Map/Subcomponents/Controls/FilterControl.tsx +++ b/src/Components/Map/Subcomponents/Controls/FilterControl.tsx @@ -23,10 +23,10 @@ export function FilterControl() { const visibleGroupTypes = useVisibleGroupType(); return ( -
    +
    { open ? -
    +