From 13a640b86833b6481b6613ba76b4726ccbe197a1 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Tue, 23 Jul 2024 18:44:06 +0200 Subject: [PATCH] fix cicular import --- package-lock.json | 14 +- .../Profile/Subcomponents/FormHeader.tsx | 2 +- src/Components/Profile/Templates/TabsForm.tsx | 138 +++++++++--------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e2d5b77..3db48c48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -825,11 +825,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2078,9 +2078,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, diff --git a/src/Components/Profile/Subcomponents/FormHeader.tsx b/src/Components/Profile/Subcomponents/FormHeader.tsx index a33ac7af..5437bc8f 100644 --- a/src/Components/Profile/Subcomponents/FormHeader.tsx +++ b/src/Components/Profile/Subcomponents/FormHeader.tsx @@ -1,4 +1,4 @@ -import { TextInput } from "utopia-ui" +import { TextInput } from "../../Input" import { AvatarWidget } from "./AvatarWidget" import { ColorPicker } from "./ColorPicker" diff --git a/src/Components/Profile/Templates/TabsForm.tsx b/src/Components/Profile/Templates/TabsForm.tsx index 870883d8..87275446 100644 --- a/src/Components/Profile/Templates/TabsForm.tsx +++ b/src/Components/Profile/Templates/TabsForm.tsx @@ -7,83 +7,83 @@ import { TagsWidget } from "../Subcomponents/TagsWidget" import { useNavigate } from "react-router-dom" import { useUpdateItem } from "../../Map/hooks/useItems" -export const TabsForm = ({item, state, setState, updatePermission, linkItem, unlinkItem, loading}) => { +export const TabsForm = ({ item, state, setState, updatePermission, linkItem, unlinkItem, loading }) => { - const [activeTab, setActiveTab] = useState(1); - const navigate = useNavigate(); - const updateItem = useUpdateItem(); + const [activeTab, setActiveTab] = useState(1); + const navigate = useNavigate(); + const updateItem = useUpdateItem(); - const updateActiveTab = (id: number) => { - setActiveTab(id); + const updateActiveTab = (id: number) => { + setActiveTab(id); - let params = new URLSearchParams(window.location.search); - let urlTab = params.get("tab"); - if (!urlTab?.includes(id.toString())) - params.set("tab", `${id ? id : ""}`) - window.history.pushState('', '', "?" + params.toString()); - } + let params = new URLSearchParams(window.location.search); + let urlTab = params.get("tab"); + if (!urlTab?.includes(id.toString())) + params.set("tab", `${id ? id : ""}`) + window.history.pushState('', '', "?" + params.toString()); + } - useEffect(() => { - let params = new URLSearchParams(location.search); - let urlTab = params.get("tab"); - urlTab ? setActiveTab(Number(urlTab)) : setActiveTab(1); - }, [location]) - - return ( -
- updateActiveTab(1)} /> -
- setState(prevState => ({ - ...prevState, - text: 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)} /> + useEffect(() => { + let params = new URLSearchParams(location.search); + let urlTab = params.get("tab"); + urlTab ? setActiveTab(Number(urlTab)) : setActiveTab(1); + }, [location]) + + return ( +
+ updateActiveTab(1)} />
-
-
- setState(prevState => ({ - ...prevState, - offers: 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' /> -
-
- setState(prevState => ({ - ...prevState, - needs: 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' /> -
-
+ setState(prevState => ({ + ...prevState, + text: v + }))} containerStyle='tw-h-full' inputStyle='tw-h-full tw-border-t-0 tw-rounded-tl-none' />
- - } - {item.layer?.itemType.relations && - <> - updateActiveTab(7)} /> -
-
-
- {state.relations && state.relations.map(i => - - -
navigate('/item/' + i.id)}> - unlinkItem(id, item, updateItem)} loading={loading} /> -
- -
+ {item.layer?.itemType.offers_and_needs && + <> + updateActiveTab(3)} /> +
+
+
+ setState(prevState => ({ + ...prevState, + offers: 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' />
- )} - {updatePermission && linkItem(id, item, updateItem)} colorField={item.layer.itemColorField}>} - +
+ setState(prevState => ({ + ...prevState, + needs: 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)} /> +
+
+
+ {state.relations && state.relations.map(i => -
- ) +
navigate('/item/' + i.id)}> + unlinkItem(id, item, updateItem)} loading={loading} /> +
+ +
+
+ )} + {updatePermission && linkItem(id, item, updateItem)} colorField={item.layer.itemColorField}>} + +
+
+
+ + } + + +
+ ) }