From 50f5a6855f15531af11b993f442bd5a495918e66 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Tue, 18 Jun 2024 11:16:06 +0200 Subject: [PATCH] onepage layout frame --- src/Components/Profile/OverlayItemProfile.tsx | 23 ++++ .../Profile/OverlayItemProfileSettings.tsx | 104 ++++++++++-------- 2 files changed, 84 insertions(+), 43 deletions(-) diff --git a/src/Components/Profile/OverlayItemProfile.tsx b/src/Components/Profile/OverlayItemProfile.tsx index b4fea418..3be57efe 100644 --- a/src/Components/Profile/OverlayItemProfile.tsx +++ b/src/Components/Profile/OverlayItemProfile.tsx @@ -279,6 +279,28 @@ export function OverlayItemProfile() { navigate("/edit-item/" + item.id)} setPositionCallback={() => { map.closePopup(); setSelectPosition(item); navigate("/") }} big truncateSubname={false} />
+ + {item.layer?.itemType.onepager && + <> + +
+ {relations && relations.map(i => + + +
navigate('/item/' + i.id)}> + +
+ +
+
+ )} + {updatePermission && } + +
+ + } + + {!item.layer?.itemType.onepager &&
updateActiveTab(1)} />
@@ -353,6 +375,7 @@ export function OverlayItemProfile() { }
+ }
diff --git a/src/Components/Profile/OverlayItemProfileSettings.tsx b/src/Components/Profile/OverlayItemProfileSettings.tsx index 05f1545e..3dbb3197 100644 --- a/src/Components/Profile/OverlayItemProfileSettings.tsx +++ b/src/Components/Profile/OverlayItemProfileSettings.tsx @@ -65,8 +65,8 @@ export function OverlayItemProfileSettings() { useEffect(() => { const itemId = location.pathname.split("/")[2]; - const item = items.find(i => i.id === itemId); - item && setItem(item); + const item = items.find(i => i.id === itemId); + item && setItem(item); const layer = layers.find(l => l.itemType.name == "user") @@ -93,7 +93,7 @@ export function OverlayItemProfileSettings() { useEffect(() => { - setColor(item.layer?.itemColorField && getValue(item,item.layer?.itemColorField)? getValue(item,item.layer?.itemColorField) : (getItemTags(item) && getItemTags(item)[0] && getItemTags(item)[0].color ? getItemTags(item)[0].color : item?.layer?.markerDefaultColor)) + setColor(item.layer?.itemColorField && getValue(item, item.layer?.itemColorField) ? getValue(item, item.layer?.itemColorField) : (getItemTags(item) && getItemTags(item)[0] && getItemTags(item)[0].color ? getItemTags(item)[0].color : item?.layer?.markerDefaultColor)) setId(item?.id ? item.id : ""); setName(item?.name ? item.name : ""); @@ -253,6 +253,12 @@ export function OverlayItemProfileSettings() { } + useEffect(() => { + console.log(item); + + }, [item]) + + return ( @@ -268,55 +274,67 @@ export function OverlayItemProfileSettings() {
+ {item.layer?.itemType.onepager && -
- updateActiveTab(1)} /> -
- { console.log(v); setText(v) }} containerStyle='tw-h-full' inputStyle='tw-h-full tw-border-t-0 tw-rounded-tl-none' /> -
- {item.layer?.itemType.offers_and_needs && - <> - updateActiveTab(3)} /> -
-
-
- setOffers(v)} placeholder="enter your offers" containerStyle='tw-bg-transparent tw-w-full tw-h-full tw-mt-3 tw-text-xs tw-h-[calc(100%-1rem)] tw-min-h-[5em] tw-pb-2 tw-overflow-auto' /> -
-
- setNeeds(v)} placeholder="enter your needs" containerStyle='tw-bg-transparent tw-w-full tw-h-full tw-mt-3 tw-text-xs tw-h-[calc(100%-1rem)] tw-min-h-[5em] tw-pb-2 tw-overflow-auto' /> -
-
-
- - } - {item.layer?.itemType.relations && - <> - updateActiveTab(7)} /> -
-
-
- {relations && relations.map(i => + { console.log(v); setText(v) }} containerStyle='tw-h-full' inputStyle='tw-h-full tw-border-t-0 tw-rounded-tl-none' /> -
navigate('/item/' + i.id)}> - -
- -
-
- )} - {updatePermission && } + } -
+ {!item.layer?.itemType.onepager && + + +
+ updateActiveTab(1)} /> +
+ { console.log(v); setText(v) }} containerStyle='tw-h-full' inputStyle='tw-h-full tw-border-t-0 tw-rounded-tl-none' /> +
+ {item.layer?.itemType.offers_and_needs && + <> + updateActiveTab(3)} /> +
+
+
+ setOffers(v)} placeholder="enter your offers" containerStyle='tw-bg-transparent tw-w-full tw-h-full tw-mt-3 tw-text-xs tw-h-[calc(100%-1rem)] tw-min-h-[5em] tw-pb-2 tw-overflow-auto' /> +
+
+ setNeeds(v)} placeholder="enter your needs" containerStyle='tw-bg-transparent tw-w-full tw-h-full tw-mt-3 tw-text-xs tw-h-[calc(100%-1rem)] tw-min-h-[5em] tw-pb-2 tw-overflow-auto' />
- - } +
+ + } + {item.layer?.itemType.relations && + <> + updateActiveTab(7)} /> +
+
+
+ {relations && relations.map(i => -
+
navigate('/item/' + i.id)}> + +
+ +
+
+ )} + {updatePermission && } -
+
+
+
+ + } + + +
+ } + + + +