feat: add label and fix some ui problem

This commit is contained in:
Joel 2024-10-10 11:29:11 +08:00
parent 6d62840aff
commit 19f5684960
7 changed files with 42 additions and 15 deletions

View File

@ -20,6 +20,7 @@ const PluginList = async () => {
<Card <Card
payload={toolNotion as any} payload={toolNotion as any}
descriptionLineRows={1} descriptionLineRows={1}
showVersion
/> />
</div> </div>
<h3 className='my-1'>Installed</h3> <h3 className='my-1'>Installed</h3>

View File

@ -5,22 +5,28 @@ type BadgeProps = {
className?: string className?: string
text: string text: string
uppercase?: boolean uppercase?: boolean
hasRedCornerMark?: boolean
} }
const Badge = ({ const Badge = ({
className, className,
text, text,
uppercase = true, uppercase = true,
hasRedCornerMark,
}: BadgeProps) => { }: BadgeProps) => {
return ( return (
<div <div
className={cn( className={cn(
'inline-flex items-center px-[5px] h-5 rounded-[5px] border border-divider-deep leading-3 text-text-tertiary', 'relative inline-flex items-center px-[5px] h-5 rounded-[5px] border border-divider-deep leading-3 text-text-tertiary',
uppercase ? 'system-2xs-medium-uppercase' : 'system-xs-medium', uppercase ? 'system-2xs-medium-uppercase' : 'system-xs-medium',
className, className,
)} )}
> >
{text} {text}
{hasRedCornerMark && (
<div className='absolute top-[-2px] right-[-2px] w-1.5 h-1.5 border border-components-badge-status-light-error-border-inner bg-components-badge-status-light-error-bg rounded-[2px] shadow-sm'>
</div>
)}
</div> </div>
) )
} }

View File

@ -1,18 +1,21 @@
import cn from '@/utils/classnames' import cn from '@/utils/classnames'
type Props = {
className?: string
orgName: string
packageName: string
packageNameClassName?: string
}
const OrgInfo = ({ const OrgInfo = ({
className, className,
orgName, orgName,
packageName, packageName,
}: { packageNameClassName,
className?: string }: Props) => {
orgName: string
packageName: string
}) => {
return <div className={cn('flex items-center h-4 space-x-0.5', className)}> return <div className={cn('flex items-center h-4 space-x-0.5', className)}>
<span className="shrink-0 text-text-tertiary system-xs-regular">{orgName}</span> <span className='shrink-0 text-text-tertiary system-xs-regular'>{orgName}</span>
<span className='shrink-0 text-text-quaternary system-xs-regular'>/</span> <span className='shrink-0 text-text-quaternary system-xs-regular'>/</span>
<span className="shrink-0 w-0 grow truncate text-text-tertiary system-xs-regular">{packageName}</span> <span className={cn('shrink-0 w-0 grow truncate text-text-tertiary system-xs-regular', packageNameClassName)}>{packageName}</span>
</div> </div>
} }

View File

@ -4,7 +4,8 @@ export const toolNotion = {
type: PluginType.tool, type: PluginType.tool,
org: 'Notion', org: 'Notion',
name: 'notion page search', name: 'notion page search',
latest_version: '1.0.0', version: '1.2.0',
latest_version: '1.3.0',
icon: 'https://via.placeholder.com/150', icon: 'https://via.placeholder.com/150',
label: { label: {
'en-US': 'Notion Page Search', 'en-US': 'Notion Page Search',
@ -20,7 +21,8 @@ export const extensionDallE = {
type: PluginType.extension, type: PluginType.extension,
org: 'OpenAI', org: 'OpenAI',
name: 'DALL-E', name: 'DALL-E',
latest_version: '1.0.0', version: '1.1.0',
latest_version: '1.2.0',
icon: 'https://via.placeholder.com/150', icon: 'https://via.placeholder.com/150',
label: { label: {
'en-US': 'DALL-E', 'en-US': 'DALL-E',
@ -36,6 +38,7 @@ export const modelGPT4 = {
type: PluginType.model, type: PluginType.model,
org: 'OpenAI', org: 'OpenAI',
name: 'GPT-4', name: 'GPT-4',
version: '1.0.0',
latest_version: '1.0.0', latest_version: '1.0.0',
icon: 'https://via.placeholder.com/150', icon: 'https://via.placeholder.com/150',
label: { label: {

View File

@ -1,6 +1,7 @@
import React from 'react' import React from 'react'
import { RiVerifiedBadgeLine } from '@remixicon/react' import { RiVerifiedBadgeLine } from '@remixicon/react'
import type { Plugin } from '../types' import type { Plugin } from '../types'
import Badge from '../../base/badge'
import CornerMark from './base/corner-mark' import CornerMark from './base/corner-mark'
import Icon from './base/icon' import Icon from './base/icon'
import Title from './base/title' import Title from './base/title'
@ -12,6 +13,7 @@ import { getLocaleOnServer } from '@/i18n/server'
type Props = { type Props = {
className?: string className?: string
payload: Plugin payload: Plugin
showVersion?: boolean
installed?: boolean installed?: boolean
descriptionLineRows?: number descriptionLineRows?: number
footer?: React.ReactNode footer?: React.ReactNode
@ -20,13 +22,14 @@ type Props = {
const Card = ({ const Card = ({
className, className,
payload, payload,
showVersion,
installed, installed,
descriptionLineRows = 2, descriptionLineRows = 2,
footer, footer,
}: Props) => { }: Props) => {
const locale = getLocaleOnServer() const locale = getLocaleOnServer()
const { type, name, org, label } = payload const { type, name, org, label } = payload
return ( return (
<div className={cn('relative p-4 pb-3 border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg hover-bg-components-panel-on-panel-item-bg rounded-xl shadow-xs', className)}> <div className={cn('relative p-4 pb-3 border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg hover-bg-components-panel-on-panel-item-bg rounded-xl shadow-xs', className)}>
<CornerMark text={type} /> <CornerMark text={type} />
@ -37,6 +40,9 @@ const Card = ({
<div className="flex items-center h-5"> <div className="flex items-center h-5">
<Title title={label[locale]} /> <Title title={label[locale]} />
<RiVerifiedBadgeLine className="shrink-0 ml-0.5 w-4 h-4 text-text-accent" /> <RiVerifiedBadgeLine className="shrink-0 ml-0.5 w-4 h-4 text-text-accent" />
{
showVersion && <Badge className='ml-1' text={payload.latest_version} />
}
</div> </div>
<OrgInfo <OrgInfo
className="mt-0.5" className="mt-0.5"

View File

@ -1,7 +1,8 @@
import type { FC } from 'react' import type { FC } from 'react'
import React from 'react' import React from 'react'
import { RiArrowRightUpLine, RiVerifiedBadgeLine } from '@remixicon/react' import { RiArrowRightUpLine, RiLoginCircleLine, RiVerifiedBadgeLine } from '@remixicon/react'
import { Github } from '../base/icons/src/public/common' import { Github } from '../base/icons/src/public/common'
import Badge from '../base/badge'
import type { Plugin } from './types' import type { Plugin } from './types'
import CornerMark from './card/base/corner-mark' import CornerMark from './card/base/corner-mark'
import Description from './card/base/description' import Description from './card/base/description'
@ -23,6 +24,7 @@ const PluginItem: FC<Props> = ({
}) => { }) => {
const locale = getLocaleOnServer() const locale = getLocaleOnServer()
const { type, name, org, label } = payload const { type, name, org, label } = payload
const hasNewVersion = payload.latest_version !== payload.version
return ( return (
<div className='p-1 bg-background-section-burn rounded-xl'> <div className='p-1 bg-background-section-burn rounded-xl'>
@ -31,24 +33,29 @@ const PluginItem: FC<Props> = ({
{/* Header */} {/* Header */}
<div className="flex"> <div className="flex">
<Icon src={payload.icon} /> <Icon src={payload.icon} />
<div className="ml-3 grow"> <div className="ml-3 w-0 grow">
<div className="flex items-center h-5"> <div className="flex items-center h-5">
<Title title={label[locale]} /> <Title title={label[locale]} />
<RiVerifiedBadgeLine className="shrink-0 ml-0.5 w-4 h-4 text-text-accent" /> <RiVerifiedBadgeLine className="shrink-0 ml-0.5 w-4 h-4 text-text-accent" />
<Badge className='ml-1' text={payload.version} hasRedCornerMark={hasNewVersion} />
</div> </div>
<Description text={payload.brief[locale]} descriptionLineRows={1}></Description> <Description text={payload.brief[locale]} descriptionLineRows={1}></Description>
</div> </div>
</div> </div>
</div> </div>
<div className='mt-1.5 mb-1 flex justify-between items-center h-4'> <div className='mt-1.5 mb-1 flex justify-between items-center h-4 px-3'>
<div className='flex items-center'> <div className='flex items-center'>
<OrgInfo <OrgInfo
className="mt-0.5" className="mt-0.5"
orgName={org} orgName={org}
packageName={name} packageName={name}
packageNameClassName='w-auto max-w-[150px]'
/> />
<div className='mx-2 text-text-quaternary system-xs-regular'>·</div> <div className='mx-2 text-text-quaternary system-xs-regular'>·</div>
<div className='text-text-tertiary system-xs-regular'>2 sets of endpoints enabled</div> <div className='flex text-text-tertiary system-xs-regular space-x-1'>
<RiLoginCircleLine className='w-4 h-4' />
<span>2 sets of endpoints enabled</span>
</div>
</div> </div>
<div className='flex items-center'> <div className='flex items-center'>

View File

@ -11,6 +11,7 @@ export type Plugin = {
'type': PluginType 'type': PluginType
'org': string 'org': string
'name': string 'name': string
'version': string
'latest_version': string 'latest_version': string
'icon': string 'icon': string
'label': Record<Locale, string> 'label': Record<Locale, string>