antontranelis/utopia-ui
1
0
Fork 0
mirror of https://github.com/utopia-os/utopia-ui.git synced 2026-03-01 12:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-avatar-bug

Browse Source
This commit is contained in:
Anton Tranelis 2025-03-05 21:29:50 +00:00 committed by GitHub
commit cad8297689
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Components/Map/setItemLocation.tsx
View File

@ -1,10 +0,0 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { useMap } from 'react-leaflet'
export const setItemLocation = () => {
// eslint-disable-next-line react-hooks/rules-of-hooks
const map = useMap()
return <div></div>
}

50
src/Components/Profile/Templates/TabsView.tsx
View File

@ -150,29 +150,41 @@ export const TabsView = ({
</div>
</td>
<td>
<Link to={'/item/' + getUserProfile(a.user_created.id)?.id}>
<div className='flex items-center gap-3'>
<div className='tw-avatar'>
<div className='tw-mask tw-rounded-full h-8 w-8 tw-mr-2'>
<img
src={
appState.assetsApi.url +
getUserProfile(a.user_created.id)?.image
}
alt='Avatar'
/>
{getUserProfile(a.user_created.id) ? (
<Link to={'/item/' + getUserProfile(a.user_created.id)?.id}>
<div className='flex items-center gap-3'>
<div className='tw-avatar'>
<div className='tw-mask tw-rounded-full tw-h-8 tw-w-8 tw-mr-2'>
{getUserProfile(a.user_created.id)?.image && (
<img
src={
appState.assetsApi.url +
getUserProfile(a.user_created.id)?.image
}
alt='Avatar'
/>
)}
</div>
</div>
<div>
<div className='font-bold'>
{getUserProfile(a.user_created.id)?.name ??
a.user_created.first_name}{' '}
</div>
<div className='tw-text-xs opacity-50 tw-text-zinc-500'>
{timeAgo(a.date_created)}
</div>
</div>
</div>
<div>
<div className='font-bold'>
{getUserProfile(a.user_created.id)?.name}
</div>
<div className='tw-text-xs opacity-50 tw-text-zinc-500'>
{timeAgo(a.date_created)}
</div>
</Link>
) : (
<div>
<div className='font-bold'>{a.user_created.first_name} </div>
<div className='tw-text-xs opacity-50 tw-text-zinc-500'>
{timeAgo(a.date_created)}
</div>
</div>
</Link>
)}
</td>
</tr>
))}