Release 202505261804
This commit is contained in:
@@ -126,11 +126,13 @@ type Props<Tag extends 'a' | 'div' | 'li' = 'div'> = Polymorphic<
|
||||
VariantProps<typeof badge> & {
|
||||
as: Tag
|
||||
icon?: string
|
||||
endIcon?: string
|
||||
text: string
|
||||
inlineIcon?: boolean
|
||||
classNames?: {
|
||||
icon?: string
|
||||
text?: string
|
||||
endIcon?: string
|
||||
}
|
||||
}
|
||||
>
|
||||
@@ -138,6 +140,7 @@ type Props<Tag extends 'a' | 'div' | 'li' = 'div'> = Polymorphic<
|
||||
const {
|
||||
as: Tag = 'div',
|
||||
icon: iconName,
|
||||
endIcon: endIconName,
|
||||
text: textContent,
|
||||
inlineIcon,
|
||||
classNames,
|
||||
@@ -159,4 +162,9 @@ const { base, icon: iconSlot, text: textSlot } = badge({ color, variant })
|
||||
)
|
||||
}
|
||||
<span class={textSlot({ class: classNames?.text })}>{textContent}</span>
|
||||
{
|
||||
!!endIconName && (
|
||||
<Icon name={endIconName} class={iconSlot({ class: classNames?.endIcon })} is:inline={inlineIcon} />
|
||||
)
|
||||
}
|
||||
</Tag>
|
||||
|
||||
@@ -8,11 +8,12 @@ import type { Polymorphic } from 'astro/types'
|
||||
type Props<Tag extends 'a' | 'div' | 'li' = 'div'> = Polymorphic<{
|
||||
as: Tag
|
||||
icon: string
|
||||
endIcon?: string
|
||||
text: string
|
||||
inlineIcon?: boolean
|
||||
}>
|
||||
|
||||
const { icon, text, class: className, inlineIcon, as: Tag = 'div', ...divProps } = Astro.props
|
||||
const { icon, text, class: className, inlineIcon, endIcon, as: Tag = 'div', ...divProps } = Astro.props
|
||||
---
|
||||
|
||||
<Tag
|
||||
@@ -24,4 +25,5 @@ const { icon, text, class: className, inlineIcon, as: Tag = 'div', ...divProps }
|
||||
>
|
||||
<Icon name={icon} class="size-4" is:inline={inlineIcon} />
|
||||
<span>{text}</span>
|
||||
{!!endIcon && <Icon name={endIcon} class="size-4" is:inline={inlineIcon} />}
|
||||
</Tag>
|
||||
|
||||
41
web/src/components/BadgeStandardFilter.astro
Normal file
41
web/src/components/BadgeStandardFilter.astro
Normal file
@@ -0,0 +1,41 @@
|
||||
---
|
||||
import { uniq } from 'lodash-es'
|
||||
|
||||
import { cn } from '../lib/cn'
|
||||
|
||||
import BadgeStandard from './BadgeStandard.astro'
|
||||
|
||||
import type { ComponentProps } from 'astro/types'
|
||||
|
||||
type Props = Omit<
|
||||
ComponentProps<typeof BadgeStandard>,
|
||||
'as' | 'endIcon' | 'href' | 'icon' | 'text' | 'variant'
|
||||
> & {
|
||||
name: string
|
||||
value: string
|
||||
label: string
|
||||
icon: string
|
||||
}
|
||||
|
||||
const { name, value, label, icon, ...props } = Astro.props
|
||||
|
||||
const selectedValues = Astro.url.searchParams.getAll(name)
|
||||
const isSelected = selectedValues.includes(value)
|
||||
|
||||
const url = new URL(Astro.url)
|
||||
url.searchParams.delete(name)
|
||||
const valuesToSet = uniq(isSelected ? selectedValues.filter((v) => v !== value) : [...selectedValues, value])
|
||||
for (const value of valuesToSet) {
|
||||
url.searchParams.set(name, value)
|
||||
}
|
||||
---
|
||||
|
||||
<BadgeStandard
|
||||
as="a"
|
||||
href={url.href}
|
||||
class={cn(isSelected && 'bg-green-950 text-green-500')}
|
||||
text={label}
|
||||
icon={icon}
|
||||
endIcon={isSelected ? 'ri:close-fill' : undefined}
|
||||
{...props}
|
||||
/>
|
||||
@@ -76,7 +76,15 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
/>
|
||||
|
||||
<Tooltip text="Send">
|
||||
<Button type="submit" icon="ri:send-plane-fill" size="lg" color="success" class="h-16" />
|
||||
<Button
|
||||
type="submit"
|
||||
icon="ri:send-plane-fill"
|
||||
size="lg"
|
||||
color="success"
|
||||
class="h-16"
|
||||
label="Send"
|
||||
iconOnly
|
||||
/>
|
||||
</Tooltip>
|
||||
</form>
|
||||
{!!inputErrors.content && <div class="text-sm text-red-500">{inputErrors.content}</div>}
|
||||
|
||||
@@ -47,12 +47,9 @@ const averageUserRatingFromQuery =
|
||||
totalComments > 0 ? sum(ratings.map((stat) => stat.rating * stat.count)) / totalComments : null
|
||||
|
||||
if (averageUserRatingFromProps !== undefined) {
|
||||
if (
|
||||
averageUserRatingFromQuery !== averageUserRatingFromProps ||
|
||||
(averageUserRatingFromQuery !== null &&
|
||||
averageUserRatingFromProps !== null &&
|
||||
round(averageUserRatingFromQuery, 2) !== round(averageUserRatingFromProps, 2))
|
||||
) {
|
||||
const a = averageUserRatingFromQuery === null ? null : round(averageUserRatingFromQuery, 2)
|
||||
const b = averageUserRatingFromProps === null ? null : round(averageUserRatingFromProps, 2)
|
||||
if (a !== b) {
|
||||
console.error(
|
||||
`The averageUserRating of the comments shown is different from the averageUserRating from the database. Service ID: ${serviceId} ratingUi: ${averageUserRatingFromQuery} ratingDb: ${averageUserRatingFromProps}`
|
||||
)
|
||||
|
||||
@@ -43,7 +43,7 @@ const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
|
||||
: Array.from({ length: icons.length }, () => option.iconClassName)
|
||||
: []
|
||||
return (
|
||||
<label class="hover:bg-night-500 flex cursor-pointer items-center gap-2 px-5 py-1">
|
||||
<label class="hover:bg-night-500 flex cursor-pointer items-center gap-2 px-5 py-1 has-checked:bg-green-800/20 has-checked:hover:bg-green-800/30">
|
||||
<input
|
||||
transition:persist
|
||||
type="checkbox"
|
||||
|
||||
Reference in New Issue
Block a user