From eed958f8bc5ab20a95be424e64963b76b0c7dfe7 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sat, 20 Jul 2024 12:29:30 +0200 Subject: [PATCH 01/40] added url params to links --- .../Map/Subcomponents/ItemPopupComponents/HeaderView.tsx | 3 ++- src/Components/Profile/OverlayItemProfileSettings.tsx | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx index 13a2016b..d8e90ba0 100644 --- a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx +++ b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx @@ -41,6 +41,7 @@ export function HeaderView({ item, api, editCallback, deleteCallback, setPositio const [address, setAdress] = React.useState(""); + let params = new URLSearchParams(window.location.search); const openDeleteModal = async (event: React.MouseEvent) => { @@ -91,7 +92,7 @@ export function HeaderView({ item, api, editCallback, deleteCallback, setPositio : -
{ - setOpen(true) - }}> - - - +
+ {visibleGroupTypes.length < groupTypes.length && } +
{ + setOpen(true) + }}> + + + +
} -
+ ) } From 424a0f6b17225ec1524f11e7ee7305559524b4e7 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 13:52:28 +0200 Subject: [PATCH 12/40] change color of filter indicator --- src/Components/Map/Subcomponents/Controls/FilterControl.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Map/Subcomponents/Controls/FilterControl.tsx b/src/Components/Map/Subcomponents/Controls/FilterControl.tsx index 4d1c1a56..ba964a1a 100644 --- a/src/Components/Map/Subcomponents/Controls/FilterControl.tsx +++ b/src/Components/Map/Subcomponents/Controls/FilterControl.tsx @@ -41,7 +41,7 @@ export function FilterControl() { :
- {visibleGroupTypes.length < groupTypes.length && } + {visibleGroupTypes.length < groupTypes.length && }
{ setOpen(true) }}> From 25f3ece3c546174ca75eabf54fabd433ac52369c Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 13:52:42 +0200 Subject: [PATCH 13/40] optimized wc profiles --- src/Components/Profile/ContactInfo.tsx | 2 +- src/Components/Profile/OverlayItemProfile.tsx | 29 +++++++++---------- src/Components/Profile/ProfileSubHeader.tsx | 11 +++---- src/Components/Profile/SocialShareBar.tsx | 2 +- src/Components/Profile/SocialShareButton.tsx | 2 +- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/Components/Profile/ContactInfo.tsx b/src/Components/Profile/ContactInfo.tsx index 9b397f28..39e9ad2a 100644 --- a/src/Components/Profile/ContactInfo.tsx +++ b/src/Components/Profile/ContactInfo.tsx @@ -5,7 +5,7 @@ const ContactInfo = ({ email, telephone, name, avatar, link }: { email: string, const assetsApi = useAssetApi(); return ( -
+

Du hast Fragen?

{avatar && ( diff --git a/src/Components/Profile/OverlayItemProfile.tsx b/src/Components/Profile/OverlayItemProfile.tsx index ee7ebe92..33b50ffc 100644 --- a/src/Components/Profile/OverlayItemProfile.tsx +++ b/src/Components/Profile/OverlayItemProfile.tsx @@ -275,7 +275,7 @@ export function OverlayItemProfile({ userType }: { userType: string }) { } const typeMapping = { - 'default': 'Würdekompass', + 'wuerdekompass': 'Regional-Gruppe', 'themenkompass': 'Themenkompass-Gruppe', 'liebevoll.jetzt': 'liebevoll.jetzt', }; @@ -294,24 +294,23 @@ export function OverlayItemProfile({ userType }: { userType: string }) { return ( <> {item && - - + <> -
+
navigate("/edit-item/" + item.id)} setPositionCallback={() => { map.closePopup(); setSelectPosition(item); navigate("/") }} big truncateSubname={false} /> - {template == "onepager" && }
{template == "onepager" &&
- +
+ +
{item.user_created.first_name && ( )} @@ -349,15 +348,13 @@ export function OverlayItemProfile({ userType }: { userType: string }) { } {template == "simple" && -
- - +
} {template == "tabs" && -
+
(
-
- {type &&
- {type} +
+ + {status && status != "active" &&
+ {statusMapping[status]}
} - {status && status!="active" &&
- {statusMapping[status]} + {type && type != "Regional-Gruppe" &&
+ {type}
}
diff --git a/src/Components/Profile/SocialShareBar.tsx b/src/Components/Profile/SocialShareBar.tsx index c3bd8cae..b7c8f692 100644 --- a/src/Components/Profile/SocialShareBar.tsx +++ b/src/Components/Profile/SocialShareBar.tsx @@ -2,7 +2,7 @@ import SocialShareButton from './SocialShareButton'; const SocialShareBar = ({url, title, platforms = ['facebook', 'twitter', 'linkedin', 'xing', 'email']}) => { return ( -
+
{platforms.map((platform) => ( { href={finalShareUrl} target='_blank' rel='noopener noreferrer' - className='tw-w-8 tw-h-8 tw-mt-4 tw-rounded-full tw-flex tw-items-center tw-justify-center tw-text-white' + className='tw-w-8 tw-h-8 tw-mt-2 tw-rounded-full tw-flex tw-items-center tw-justify-center tw-text-white' style={{ color: 'white', backgroundColor: bgColor From 13a2d3c681964faa3c8087b8efd5737d2df1216e Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 13:52:46 +0200 Subject: [PATCH 14/40] 3.0.0-alpha.208 --- 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 44b04260..63f521d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.207", + "version": "3.0.0-alpha.208", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.207", + "version": "3.0.0-alpha.208", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 1c7c317d..6c61f6d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.207", + "version": "3.0.0-alpha.208", "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 7dcab614f2bab08f672a6a2cd63a24dc4f2a1d08 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 17:51:43 +0200 Subject: [PATCH 15/40] wc profile fix --- src/Components/Profile/ProfileSubHeader.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/Profile/ProfileSubHeader.tsx b/src/Components/Profile/ProfileSubHeader.tsx index 315781fc..f98900c4 100644 --- a/src/Components/Profile/ProfileSubHeader.tsx +++ b/src/Components/Profile/ProfileSubHeader.tsx @@ -28,11 +28,11 @@ const SubHeader = ({ type, status, url, title }) => (
- {status && status != "active" &&
- {statusMapping[status]} + {status &&
+ {statusMapping[status]}
} - {type && type != "Regional-Gruppe" &&
- {type} + {type &&
+ {type}
}
From 08003a3ee6d2e3b2ad83abfbf666b4aa6ef18727 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 17:51:53 +0200 Subject: [PATCH 16/40] 3.0.0-alpha.209 --- 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 63f521d5..fde19047 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.208", + "version": "3.0.0-alpha.209", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.208", + "version": "3.0.0-alpha.209", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 6c61f6d6..f3769bd3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.208", + "version": "3.0.0-alpha.209", "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 1f5cd0254a1b1d283ca24cdc9c3132853e9db0ca Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 22:51:53 +0200 Subject: [PATCH 17/40] rounded images --- .../Map/Subcomponents/ItemPopupComponents/TextView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Map/Subcomponents/ItemPopupComponents/TextView.tsx b/src/Components/Map/Subcomponents/ItemPopupComponents/TextView.tsx index 5c915f1c..80b41755 100644 --- a/src/Components/Map/Subcomponents/ItemPopupComponents/TextView.tsx +++ b/src/Components/Map/Subcomponents/ItemPopupComponents/TextView.tsx @@ -79,7 +79,7 @@ export const TextView = ({ item, truncate = false, itemTextField, rawText }: { i ); const CustomImage = ({ alt, src, title }) => ( {alt} Date: Sun, 21 Jul 2024 22:52:36 +0200 Subject: [PATCH 18/40] optimized wc profiles for darkmode --- src/Components/Profile/ContactInfo.tsx | 2 +- src/Components/Profile/OverlayItemProfile.tsx | 4 ++-- src/Components/Profile/ProfileSubHeader.tsx | 4 ++-- src/index.css | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Components/Profile/ContactInfo.tsx b/src/Components/Profile/ContactInfo.tsx index 39e9ad2a..15149079 100644 --- a/src/Components/Profile/ContactInfo.tsx +++ b/src/Components/Profile/ContactInfo.tsx @@ -5,7 +5,7 @@ const ContactInfo = ({ email, telephone, name, avatar, link }: { email: string, const assetsApi = useAssetApi(); return ( -
+

Du hast Fragen?

{avatar && ( diff --git a/src/Components/Profile/OverlayItemProfile.tsx b/src/Components/Profile/OverlayItemProfile.tsx index 33b50ffc..05d1fe6b 100644 --- a/src/Components/Profile/OverlayItemProfile.tsx +++ b/src/Components/Profile/OverlayItemProfile.tsx @@ -316,7 +316,7 @@ export function OverlayItemProfile({ userType }: { userType: string }) { )} {/* Description Section */} -
+
@@ -324,7 +324,7 @@ export function OverlayItemProfile({ userType }: { userType: string }) { {item.next_appointment && (

Nächste Termine

-
+
diff --git a/src/Components/Profile/ProfileSubHeader.tsx b/src/Components/Profile/ProfileSubHeader.tsx index f98900c4..4e2adc27 100644 --- a/src/Components/Profile/ProfileSubHeader.tsx +++ b/src/Components/Profile/ProfileSubHeader.tsx @@ -29,10 +29,10 @@ const SubHeader = ({ type, status, url, title }) => (
{status &&
- {statusMapping[status]} + {statusMapping[status]}
} {type &&
- {type} + {type}
}
diff --git a/src/index.css b/src/index.css index c46cd342..9fae544a 100644 --- a/src/index.css +++ b/src/index.css @@ -3,7 +3,7 @@ @tailwind utilities; .fade { - mask-image: linear-gradient(180deg, transparent, #000 2%, #000 98%, transparent); + mask-image: linear-gradient(180deg, transparent, #000 1%, #000 99%, transparent); } .tw-modal { From bcff84a203df88ece76c315058f317928a75deca Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 22:52:58 +0200 Subject: [PATCH 19/40] 3.0.0-alpha.210 --- 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 fde19047..ccec0ec0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.209", + "version": "3.0.0-alpha.210", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.209", + "version": "3.0.0-alpha.210", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index f3769bd3..240379f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.209", + "version": "3.0.0-alpha.210", "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 49d4012e69349c95fce3779b9aa972a775d75a27 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 23:03:00 +0200 Subject: [PATCH 20/40] fixed wc image --- src/Components/Profile/OverlayItemProfileSettings.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Profile/OverlayItemProfileSettings.tsx b/src/Components/Profile/OverlayItemProfileSettings.tsx index c73c0a26..e0350ee4 100644 --- a/src/Components/Profile/OverlayItemProfileSettings.tsx +++ b/src/Components/Profile/OverlayItemProfileSettings.tsx @@ -76,13 +76,13 @@ export function OverlayItemProfileSettings({ userType }: { userType: string }) { case "wuerdekompass": setColor(item?.layer?.menuColor || "#1A5FB4"); setMarkerIcon("group"); - setImage("88930921-6076-4bdf-a5b2-241d6e7bc875") + setImage("59e6a346-d1ee-4767-9e42-fc720fb535c9") break; case "themenkompass": setColor("#26A269"); setMarkerIcon("group"); - setImage("88930921-6076-4bdf-a5b2-241d6e7bc875") + setImage("59e6a346-d1ee-4767-9e42-fc720fb535c9") break; case "liebevoll.jetzt": From c9d56532168923ad12af1af4fd9d0b7323af1122 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Sun, 21 Jul 2024 23:03:08 +0200 Subject: [PATCH 21/40] 3.0.0-alpha.211 --- 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 ccec0ec0..8e2d5b77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.210", + "version": "3.0.0-alpha.211", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.0-alpha.210", + "version": "3.0.0-alpha.211", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 240379f5..5d272fec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.0-alpha.210", + "version": "3.0.0-alpha.211", "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 9f3e8758ade2407ac21f7ee9705302570c577ce8 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Tue, 23 Jul 2024 09:39:34 +0200 Subject: [PATCH 22/40] contribution guide --- CONTRIBUTING.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..b6680505 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,15 @@ +# Contribution Guide + +## Open ToDos + +[Kanban Board](https://github.com/orgs/utopia-os/projects/2/) + +## Code + +* use named exports + +## Layout + +* use [heroicons](https://heroicons.com/) or alternatively [React Icons](https://react-icons.github.io/react-icons/) +* use [Daisy UI](https://daisyui.com/) with [tailwindcss](https://tailwindcss.com/) +* make use of the Daisy UI [theme colors](https://daisyui.com/docs/colors/) \ No newline at end of file From d93ea6e5c158f6906a4a6d70239cda3172d3c5bd Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Tue, 23 Jul 2024 10:35:16 +0200 Subject: [PATCH 23/40] renamend profile to profile_owner --- src/Components/Profile/OverlayItemProfile.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Profile/OverlayItemProfile.tsx b/src/Components/Profile/OverlayItemProfile.tsx index 05d1fe6b..20181ba4 100644 --- a/src/Components/Profile/OverlayItemProfile.tsx +++ b/src/Components/Profile/OverlayItemProfile.tsx @@ -68,11 +68,11 @@ export function OverlayItemProfile({ userType }: { userType: string }) { scroll(); }, [addItemPopupType]) - const [profile, setProfile] = useState(); + const [profile_owner, setProfileOwner] = useState(); useEffect(() => { - setProfile(items.find(i => (i.user_created?.id === item.user_created?.id) && i.layer?.itemType.name === userType)); + setProfileOwner(items.find(i => (i.user_created?.id === item.user_created?.id) && i.layer?.itemType.name === userType)); }, [item, items]) @@ -312,7 +312,7 @@ export function OverlayItemProfile({ userType }: { userType: string }) { />
{item.user_created.first_name && ( - + )} {/* Description Section */} From 57b69b36eea363787387d5313c075207c1fc531e Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Tue, 23 Jul 2024 10:35:46 +0200 Subject: [PATCH 24/40] fixed color for dark theme --- .../Profile/OverlayItemProfileSettings.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Components/Profile/OverlayItemProfileSettings.tsx b/src/Components/Profile/OverlayItemProfileSettings.tsx index e0350ee4..f1157c26 100644 --- a/src/Components/Profile/OverlayItemProfileSettings.tsx +++ b/src/Components/Profile/OverlayItemProfileSettings.tsx @@ -326,7 +326,7 @@ export function OverlayItemProfileSettings({ userType }: { userType: string }) { return ( <> - +
@@ -341,7 +341,7 @@ export function OverlayItemProfileSettings({ userType }: { userType: string }) {
-
-