Skip to content

minor changes in dashboard ui #2221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

minor changes in dashboard ui #2221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 38 additions & 30 deletions src/containers/ProDashboard/components/DashboardCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { useMemo, useState } from 'react'
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime'
import { Icon } from '~/components/Icon'
import { BasicLink } from '~/components/Link'
import { LoadingSpinner } from '~/components/Loaders'
import { Tooltip } from '~/components/Tooltip'
import { Dashboard } from '../services/DashboardAPI'
import { DashboardItemConfig } from '../types'

dayjs.extend(relativeTime)

interface DashboardCardProps {
dashboard: Dashboard
onTagClick?: (tag: string) => void
Expand Down Expand Up @@ -68,6 +72,8 @@ export function DashboardCard({ dashboard, onTagClick, onDelete, viewMode = 'gri
return summary
}, [dashboard.data.items])

console.log({ dashboard })

return (
<div
className={`hover:bg-pro-blue-300/5 dark:hover:bg-pro-blue-300/10 relative isolate flex ${viewMode === 'grid' ? 'min-h-[220px]' : ''} flex-col gap-1 rounded-md border border-(--cards-border) bg-(--cards-bg) p-2.5`}
Expand Down Expand Up @@ -103,10 +109,8 @@ export function DashboardCard({ dashboard, onTagClick, onDelete, viewMode = 'gri
) : null}
</div>

{viewMode === 'grid' && <Tags dashboard={dashboard} onTagClick={onTagClick} />}

{dashboard.description ? (
<p className="line-clamp-2 text-sm text-(--text-label)">{dashboard.description}</p>
<p className="line-clamp-3 text-sm text-(--text-label)">{dashboard.description}</p>
) : null}

{dashboard.data.items?.length ? (
Expand All @@ -119,34 +123,36 @@ export function DashboardCard({ dashboard, onTagClick, onDelete, viewMode = 'gri
</div>
) : null}

<div
className={`mt-auto flex items-center justify-between gap-2 text-(--text-label) ${viewMode === 'grid' ? 'pt-5' : 'pt-2'}`}
>
<div className="flex items-center gap-2">
<p className="flex items-center gap-1" title="Views">
<Icon name="eye" height={16} width={16} />
<span className="sr-only">Views</span>
<span>{dashboard.viewCount || 0}</span>
</p>
<p className="flex items-center gap-1" title="Likes">
<Icon
name="star"
height={16}
width={16}
className={dashboard.liked ? 'fill-current text-yellow-400' : 'fill-none'}
/>
<span className="sr-only">Favorites</span>
<span>{dashboard.likeCount || 0}</span>
<div className={`mt-auto ${viewMode === 'grid' ? 'pt-5' : 'pt-2'}`}>
{viewMode === 'grid' && <Tags dashboard={dashboard} onTagClick={onTagClick} />}

<div className={`flex items-center justify-between gap-2 text-(--text-label) ${viewMode === 'grid' && 'mt-3'}`}>
<div className="flex items-center gap-2">
<p className="flex items-center gap-1" title="Views">
<Icon name="eye" height={16} width={16} />
<span className="sr-only">Views</span>
<span>{dashboard.viewCount || 0}</span>
</p>
<p className="flex items-center gap-1" title="Likes">
<Icon
name="star"
height={16}
width={16}
className={dashboard.liked ? 'fill-current text-yellow-400' : 'fill-none'}
/>
<span className="sr-only">Favorites</span>
<span>{dashboard.likeCount || 0}</span>
</p>
</div>

<p
className="flex items-center gap-1 text-xs text-(--text-form)"
title={new Date(dashboard.updated).toLocaleString()}
>
<Icon name="clock" height={12} width={12} />
<span>Updated {dayjs(dashboard.updated).fromNow()}</span>
</p>
</div>

<p
className="flex items-center gap-1 text-xs text-(--text-form)"
title={new Date(dashboard.updated).toLocaleString()}
>
<Icon name="clock" height={12} width={12} />
<span>Updated {new Date(dashboard.updated).toLocaleDateString()}</span>
</p>
</div>
<BasicLink href={`/pro/${dashboard.id}`} className="absolute inset-0">
<span className="sr-only">View dashboard</span>
Expand All @@ -171,7 +177,9 @@ const Tags = ({ dashboard, onTagClick }: { dashboard: Dashboard; onTagClick?: (t
{tag}
</button>
))}
{dashboard.tags.length > 2 && <span className="text-xs">+{dashboard.tags.length - 2}</span>}
{dashboard.tags.length > 2 && (
<span className="text-xs text-(--text-form)">+{dashboard.tags.length - 2} more</span>
)}
</div>
)
}