mirror of
https://github.com/utopia-os/utopia-ui.git
synced 2025-12-13 07:46:10 +00:00
Merge pull request #30 from utopia-os/flex-profile
fix(other): advanced Social Share Buttons
This commit is contained in:
antontranelis
GitHub
commit
e8a44b8ee1
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "utopia-ui",
|
||||
"version": "3.0.10",
|
||||
"version": "3.0.19",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "utopia-ui",
|
||||
"version": "3.0.10",
|
||||
"version": "3.0.19",
|
||||
"license": "GPL-3.0-only",
|
||||
"dependencies": {
|
||||
"@heroicons/react": "^2.0.17",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "utopia-ui",
|
||||
"version": "3.0.10",
|
||||
"version": "3.0.19",
|
||||
"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/",
|
||||
|
||||
@ -105,8 +105,8 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
|
||||
toast.error(error.toString())
|
||||
}
|
||||
if (success) {
|
||||
props.layer.onlyOnePerOwner && item && updateItem({ ...item, ...formItem })
|
||||
;(!props.layer.onlyOnePerOwner || !item) &&
|
||||
if (props.layer.onlyOnePerOwner && item) updateItem({ ...item, ...formItem })
|
||||
if (!props.layer.onlyOnePerOwner || !item) {
|
||||
addItem({
|
||||
...formItem,
|
||||
name: formItem.name ? formItem.name : user?.first_name,
|
||||
@ -116,6 +116,7 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
|
||||
layer: props.layer,
|
||||
public_edit: !user,
|
||||
})
|
||||
}
|
||||
toast.success('New item created')
|
||||
resetFilterTags()
|
||||
}
|
||||
|
||||
@ -20,6 +20,7 @@ export const ContactInfoForm = ({
|
||||
</label>
|
||||
<TextInput
|
||||
placeholder='Email'
|
||||
type='email'
|
||||
defaultValue={state.contact}
|
||||
updateFormValue={(v) =>
|
||||
setState((prevState) => ({
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
/* eslint-disable camelcase */
|
||||
import { Item } from '../../../types'
|
||||
import SocialShareBar from './SocialShareBar'
|
||||
|
||||
export const GroupSubHeaderView = ({
|
||||
item,
|
||||
share_base_url,
|
||||
shareBaseUrl,
|
||||
platforms,
|
||||
}: {
|
||||
item: Item
|
||||
share_base_url: string
|
||||
shareBaseUrl: string
|
||||
platforms?: string[]
|
||||
}) => (
|
||||
<div className='tw-px-6'>
|
||||
<div className='tw-float-left tw-mt-2 tw-mb-4 tw-flex tw-items-center'>
|
||||
@ -27,7 +28,15 @@ export const GroupSubHeaderView = ({
|
||||
)}
|
||||
</div>
|
||||
<div>
|
||||
<SocialShareBar url={share_base_url + item.slug} title={item.name} />
|
||||
<SocialShareBar
|
||||
url={
|
||||
shareBaseUrl && item.slug
|
||||
? shareBaseUrl + item.slug
|
||||
: window.location.protocol + '//' + window.location.host + '/item/' + item.id
|
||||
}
|
||||
title={item.name}
|
||||
platforms={platforms}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import { toast } from 'react-toastify'
|
||||
import SocialShareButton from './SocialShareButton'
|
||||
|
||||
const SocialShareBar = ({
|
||||
@ -8,11 +9,68 @@ const SocialShareBar = ({
|
||||
// eslint-disable-next-line react/prop-types
|
||||
platforms = ['facebook', 'twitter', 'linkedin', 'xing', 'email'],
|
||||
}) => {
|
||||
const copyLink = () => {
|
||||
navigator.clipboard
|
||||
.writeText(url)
|
||||
.then(() => {
|
||||
toast.success('link copied to clipboard')
|
||||
})
|
||||
.catch((error) => {
|
||||
toast.error('Fehler beim Kopieren des Links: ', error)
|
||||
})
|
||||
}
|
||||
return (
|
||||
<div className='tw-flex tw-place-content-end tw-justify-end tw-space-x-2 tw-grow tw-min-w-fit tw-pl-2'>
|
||||
{platforms.map((platform) => (
|
||||
<SocialShareButton key={platform} platform={platform} url={url} title={title} />
|
||||
))}
|
||||
{platforms.includes('email') && (
|
||||
<a
|
||||
href={`mailto:?subject=${title}&body=${url}`}
|
||||
target='_blank'
|
||||
rel='noopener noreferrer'
|
||||
className='tw-w-8 tw-h-8 tw-mt-2 tw-rounded-full tw-flex tw-items-center tw-justify-center tw-text-white hover:tw-cursor-pointer'
|
||||
style={{
|
||||
color: 'white',
|
||||
backgroundColor: '#444',
|
||||
}}
|
||||
onClick={() => copyLink()}
|
||||
title='share link via email'
|
||||
>
|
||||
<svg
|
||||
xmlns='http://www.w3.org/2000/svg'
|
||||
viewBox='0 0 24 24'
|
||||
fill='white'
|
||||
className='tw-h-4 tw-w-4'
|
||||
>
|
||||
<path d='M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z' />
|
||||
</svg>
|
||||
</a>
|
||||
)}
|
||||
{platforms.includes('clipboard') && (
|
||||
<div
|
||||
rel='noopener noreferrer'
|
||||
className='tw-w-8 tw-h-8 tw-mt-2 tw-rounded-full tw-flex tw-items-center tw-justify-center tw-text-white hover:tw-cursor-pointer'
|
||||
style={{
|
||||
color: 'white',
|
||||
backgroundColor: '#888',
|
||||
}}
|
||||
onClick={() => copyLink()}
|
||||
title='copy Link'
|
||||
>
|
||||
<svg
|
||||
stroke='currentColor'
|
||||
fill='currentColor'
|
||||
strokeWidth='0'
|
||||
viewBox='0 0 256 256'
|
||||
height='1.5em'
|
||||
width='1.5em'
|
||||
xmlns='http://www.w3.org/2000/svg'
|
||||
>
|
||||
<path d='M180,64H40A12,12,0,0,0,28,76V216a12,12,0,0,0,12,12H180a12,12,0,0,0,12-12V76A12,12,0,0,0,180,64ZM168,204H52V88H168ZM228,40V180a12,12,0,0,1-24,0V52H76a12,12,0,0,1,0-24H216A12,12,0,0,1,228,40Z'></path>
|
||||
</svg>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@ -38,14 +38,35 @@ const platformConfigs = {
|
||||
),
|
||||
bgColor: '#026466',
|
||||
},
|
||||
email: {
|
||||
shareUrl: 'mailto:?subject={title}&body={url}',
|
||||
whatsapp: {
|
||||
shareUrl: 'https://api.whatsapp.com/send?text={title}%20{url}',
|
||||
icon: (
|
||||
<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='white'>
|
||||
<path d='M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z' />
|
||||
<svg
|
||||
stroke='currentColor'
|
||||
fill='currentColor'
|
||||
strokeWidth='0'
|
||||
viewBox='0 0 512 512'
|
||||
xmlns='http://www.w3.org/2000/svg'
|
||||
>
|
||||
<path d='M497.39 361.8l-112-48a24 24 0 0 0-28 6.9l-49.6 60.6A370.66 370.66 0 0 1 130.6 204.11l60.6-49.6a23.94 23.94 0 0 0 6.9-28l-48-112A24.16 24.16 0 0 0 122.6.61l-104 24A24 24 0 0 0 0 48c0 256.5 207.9 464 464 464a24 24 0 0 0 23.4-18.6l24-104a24.29 24.29 0 0 0-14.01-27.6z'></path>
|
||||
</svg>
|
||||
),
|
||||
bgColor: '#444444',
|
||||
bgColor: '#25D366',
|
||||
},
|
||||
telegram: {
|
||||
shareUrl: 'https://t.me/share/url?url={url}&text={title}',
|
||||
icon: (
|
||||
<svg
|
||||
stroke='white'
|
||||
fill='white'
|
||||
strokeWidth='0'
|
||||
viewBox='0 0 448 512'
|
||||
xmlns='http://www.w3.org/2000/svg'
|
||||
>
|
||||
<path d='M446.7 98.6l-67.6 318.8c-5.1 22.5-18.4 28.1-37.3 17.5l-103-75.9-49.7 47.8c-5.5 5.5-10.1 10.1-20.7 10.1l7.4-104.9 190.9-172.5c8.3-7.4-1.8-11.5-12.9-4.1L117.8 284 16.2 252.2c-22.1-6.9-22.5-22.1 4.6-32.7L418.2 66.4c18.4-6.9 34.5 4.1 28.5 32.2z'></path>
|
||||
</svg>
|
||||
),
|
||||
bgColor: '#0088cc',
|
||||
},
|
||||
}
|
||||
|
||||
@ -72,6 +93,7 @@ const SocialShareButton = ({ platform, url, title }) => {
|
||||
color: 'white',
|
||||
backgroundColor: bgColor,
|
||||
}}
|
||||
title={`share link on ${platform}`}
|
||||
>
|
||||
{React.cloneElement(icon, { className: 'tw-w-4 tw-h-4 tw-fill-current' })}
|
||||
</a>
|
||||
|
||||
@ -8,7 +8,7 @@ export const OnepagerView = ({ item }: { item: Item }) => {
|
||||
<div className='tw-h-full tw-overflow-y-auto fade'>
|
||||
<GroupSubHeaderView
|
||||
item={item}
|
||||
share_base_url={`https://www.wuerdekompass.org/aktivitaeten/gruppensuche/#/gruppe/${item.slug}`}
|
||||
shareBaseUrl={`https://www.wuerdekompass.org/aktivitaeten/gruppensuche/#/gruppe/${item.slug}`}
|
||||
/>
|
||||
{item.user_created.first_name && <ContactInfoView heading='Du hast Fragen?' item={item} />}
|
||||
{/* Description Section */}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user