mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-22 19:32:54 +03:00
Added icons to Activity items to make it easier to scan the page
ref https://linear.app/tryghost/issue/AP-283/handle-incoming-likes
This commit is contained in:
parent
c260ed5202
commit
a3e498106d
@ -1,4 +1,4 @@
|
||||
import APAvatar from './global/APAvatar';
|
||||
import APAvatar, {AvatarBadge} from './global/APAvatar';
|
||||
import ActivityItem from './activities/ActivityItem';
|
||||
import MainNavigation from './navigation/MainNavigation';
|
||||
import React from 'react';
|
||||
@ -60,6 +60,25 @@ const getActivityUrl = (activity: Activity): string | null => {
|
||||
return null;
|
||||
};
|
||||
|
||||
const getActorUrl = (activity: Activity): string | null => {
|
||||
if (activity.actor) {
|
||||
return activity.actor.url;
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
const getActivityBadge = (activity: Activity): AvatarBadge => {
|
||||
switch (activity.type) {
|
||||
case ACTVITY_TYPE.FOLLOW:
|
||||
return 'user-fill';
|
||||
case ACTVITY_TYPE.LIKE:
|
||||
if (activity.object) {
|
||||
return 'heart-fill';
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const isFollower = (id: string, followerIds: string[]): boolean => {
|
||||
return followerIds.includes(id);
|
||||
};
|
||||
@ -85,8 +104,8 @@ const Activities: React.FC<ActivitiesProps> = ({}) => {
|
||||
{activities.length > 0 && (
|
||||
<div className='mt-8 flex w-full max-w-[560px] flex-col'>
|
||||
{activities?.map(activity => (
|
||||
<ActivityItem key={activity.id} url={getActivityUrl(activity)}>
|
||||
<APAvatar author={activity.actor} />
|
||||
<ActivityItem key={activity.id} url={getActivityUrl(activity) || getActorUrl(activity)}>
|
||||
<APAvatar author={activity.actor} badge={getActivityBadge(activity)} />
|
||||
<div>
|
||||
<div className='text-grey-600'>
|
||||
<span className='mr-1 font-bold text-black'>{activity.actor.name}</span>
|
||||
|
@ -17,7 +17,7 @@ const ActivityItem: React.FC<ActivityItemProps> = ({children, url = null}) => {
|
||||
|
||||
const Item = (
|
||||
<div className='flex w-full max-w-[560px] flex-col hover:bg-grey-75'>
|
||||
<div className='flex w-full items-center gap-3 border-b border-grey-100 py-4'>
|
||||
<div className='flex w-full items-center gap-4 border-b border-grey-100 px-2 py-4'>
|
||||
{childrenArray[0]}
|
||||
{childrenArray[1]}
|
||||
{childrenArray[2]}
|
||||
|
Loading…
Reference in New Issue
Block a user