Compare commits

...

5 Commits

Author SHA1 Message Date
pluja
f4525e3d32 Release 2025-05-22-SwZ1 2025-05-22 23:07:55 +00:00
pluja
ecc8f67fc4 Release 2025-05-22-XDxe 2025-05-22 22:58:18 +00:00
pluja
72c238a4dc Release 2025-05-22-16vM 2025-05-22 22:38:41 +00:00
pluja
d79bedf219 Release 2025-05-22-5X5Q 2025-05-22 19:43:20 +00:00
pluja
2362d2cc73 Release 2025-05-22-Uvv4 2025-05-22 19:19:07 +00:00
18 changed files with 535 additions and 284 deletions

View File

@@ -0,0 +1,4 @@
#!/bin/bash
pwd
just dump-db

View File

@@ -70,7 +70,7 @@ services:
expose: expose:
- 4321 - 4321
healthcheck: healthcheck:
test: ["CMD", "curl", "-k", "--silent", "--fail", "http://localhost:4321"] test: ["CMD", "curl", "-k", "--silent", "--fail", "http://localhost:4321/health"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5

View File

@@ -19,9 +19,8 @@ ENV HOST=0.0.0.0
ENV PORT=4321 ENV PORT=4321
EXPOSE 4321 EXPOSE 4321
# Add entrypoint script and make it executable # Add knm-migrate command script and make it executable
COPY docker-entrypoint.sh /usr/local/bin/ COPY migrate.sh /usr/local/bin/knm-migrate
RUN chmod +x /usr/local/bin/docker-entrypoint.sh RUN chmod +x /usr/local/bin/knm-migrate
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["node", "./dist/server/entry.mjs"] CMD ["node", "./dist/server/entry.mjs"]

View File

@@ -16,6 +16,4 @@ for trigger_file in prisma/triggers/*.sql; do
fi fi
done done
# Start the application echo "Migrations completed."
echo "Starting the application..."
exec "$@"

View File

@@ -19,6 +19,7 @@ type Props<Tag extends 'a' | 'button' | 'label' = 'button'> = Polymorphic<
dataAstroReload?: boolean dataAstroReload?: boolean
children?: never children?: never
disabled?: boolean disabled?: boolean
inlineIcon?: boolean
} }
> >
@@ -26,7 +27,7 @@ export type ButtonProps<Tag extends 'a' | 'button' | 'label' = 'button'> = Props
const button = tv({ const button = tv({
slots: { slots: {
base: 'inline-flex items-center justify-center gap-2 rounded-lg border transition-colors duration-100 focus-visible:ring-2 focus-visible:ring-current focus-visible:ring-offset-2 focus-visible:ring-offset-black focus-visible:outline-hidden', base: 'inline-flex shrink-0 items-center justify-center gap-2 rounded-lg border transition-colors duration-100 focus-visible:ring-2 focus-visible:ring-current focus-visible:ring-offset-2 focus-visible:ring-offset-black focus-visible:outline-hidden',
icon: 'size-4 shrink-0', icon: 'size-4 shrink-0',
label: 'text-left whitespace-nowrap', label: 'text-left whitespace-nowrap',
endIcon: 'size-4 shrink-0', endIcon: 'size-4 shrink-0',
@@ -51,6 +52,11 @@ const button = tv({
label: 'font-bold tracking-wider uppercase', label: 'font-bold tracking-wider uppercase',
}, },
}, },
iconOnly: {
true: {
base: 'p-0',
},
},
color: { color: {
black: { black: {
base: 'border-night-500 bg-night-800 hover:bg-night-900 hover:text-day-200 focus-visible:bg-night-500 text-white/50 focus-visible:text-white focus-visible:ring-white', base: 'border-night-500 bg-night-800 hover:bg-night-900 hover:text-day-200 focus-visible:bg-night-500 text-white/50 focus-visible:text-white focus-visible:ring-white',
@@ -121,12 +127,28 @@ const button = tv({
shadow: true, shadow: true,
class: 'shadow-blue-500/30', class: 'shadow-blue-500/30',
}, },
{
iconOnly: true,
size: 'sm',
class: 'w-8',
},
{
iconOnly: true,
size: 'md',
class: 'w-9',
},
{
iconOnly: true,
size: 'lg',
class: 'w-10',
},
], ],
defaultVariants: { defaultVariants: {
size: 'md', size: 'md',
color: 'black', color: 'black',
shadow: false, shadow: false,
disabled: false, disabled: false,
iconOnly: false,
}, },
}) })
@@ -143,6 +165,7 @@ const {
role, role,
dataAstroReload, dataAstroReload,
disabled, disabled,
inlineIcon,
...htmlProps ...htmlProps
} = Astro.props } = Astro.props
@@ -151,7 +174,7 @@ const {
icon: iconSlot, icon: iconSlot,
label: labelSlot, label: labelSlot,
endIcon: endIconSlot, endIcon: endIconSlot,
} = button({ size, color, shadow, disabled }) } = button({ size, color, shadow, disabled, iconOnly: !label && !(!!icon && !!endIcon) })
const ActualTag = disabled && Tag === 'a' ? 'span' : Tag const ActualTag = disabled && Tag === 'a' ? 'span' : Tag
--- ---
@@ -164,11 +187,11 @@ const ActualTag = disabled && Tag === 'a' ? 'span' : Tag
{...dataAstroReload && { 'data-astro-reload': dataAstroReload }} {...dataAstroReload && { 'data-astro-reload': dataAstroReload }}
{...htmlProps} {...htmlProps}
> >
{!!icon && <Icon name={icon} class={iconSlot({ class: classNames?.icon })} />} {!!icon && <Icon name={icon} class={iconSlot({ class: classNames?.icon })} is:inline={inlineIcon} />}
{!!label && <span class={labelSlot({ class: classNames?.label })}>{label}</span>} {!!label && <span class={labelSlot({ class: classNames?.label })}>{label}</span>}
{ {
!!endIcon && ( !!endIcon && (
<Icon name={endIcon} class={endIconSlot({ class: classNames?.endIcon })}> <Icon name={endIcon} class={endIconSlot({ class: classNames?.endIcon })} is:inline={inlineIcon}>
{endIcon} {endIcon}
</Icon> </Icon>
) )

View File

@@ -119,7 +119,7 @@ const splashText = showSplashText ? sample(splashTexts) : null
<Tooltip <Tooltip
as="a" as="a"
href="/admin" href="/admin"
class="text-red-500 transition-colors hover:text-red-400" class="flex h-full items-center text-red-500 transition-colors hover:text-red-400"
transition:name="header-admin-link" transition:name="header-admin-link"
text="Admin Dashboard" text="Admin Dashboard"
position="left" position="left"

View File

@@ -10,7 +10,9 @@ import InputWrapper from './InputWrapper.astro'
import type { ComponentProps, HTMLAttributes } from 'astro/types' import type { ComponentProps, HTMLAttributes } from 'astro/types'
type Props = Omit<ComponentProps<typeof InputWrapper>, 'children' | 'inputId' | 'required'> & { type Props = Omit<ComponentProps<typeof InputWrapper>, 'children' | 'inputId' | 'required'> & {
inputProps?: Omit<HTMLAttributes<'input'>, 'name'> inputProps?: Omit<HTMLAttributes<'input'>, 'name'> & {
'transition:persist'?: boolean
}
inputIcon?: string inputIcon?: string
inputIconClass?: string inputIconClass?: string
} }
@@ -26,7 +28,7 @@ const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
inputIcon ? ( inputIcon ? (
<div class="relative"> <div class="relative">
<input <input
transition:persist transition:persist={inputProps?.['transition:persist'] === false ? undefined : true}
{...omit(inputProps, ['class', 'id', 'name'])} {...omit(inputProps, ['class', 'id', 'name'])}
id={inputId} id={inputId}
class={cn( class={cn(

View File

@@ -18,6 +18,7 @@ type Props = HTMLAttributes<'div'> & {
error?: string[] | string error?: string[] | string
icon?: string icon?: string
inputId?: string inputId?: string
hideLabel?: boolean
} }
const { const {
@@ -30,6 +31,7 @@ const {
icon, icon,
class: className, class: className,
inputId, inputId,
hideLabel,
...htmlProps ...htmlProps
} = Astro.props } = Astro.props
@@ -37,17 +39,20 @@ const hasError = !!error && error.length > 0
--- ---
<fieldset class={cn('space-y-1', className)} {...htmlProps}> <fieldset class={cn('space-y-1', className)} {...htmlProps}>
<div class={cn('contents', !!descriptionLabel && 'flex flex-wrap items-center gap-x-4')}> {
<legend class={cn('font-title block text-sm font-medium', hasError && 'text-red-500')}> !hideLabel && (
{icon && <Icon name={icon} class="inline-block size-4 align-[-0.2em]" />} <div class={cn('contents', !!descriptionLabel && 'flex flex-wrap items-center gap-x-4')}>
<label for={inputId}>{label}</label>{required && '*'} <legend class={cn('font-title block text-sm font-medium', hasError && 'text-red-500')}>
</legend> {icon && <Icon name={icon} class="inline-block size-4 align-[-0.2em]" />}
{ <label for={inputId}>{label}</label>
!!descriptionLabel && ( {required && '*'}
<span class="text-day-400 flex-1 basis-24 text-xs text-pretty">{descriptionLabel}</span> </legend>
) {!!descriptionLabel && (
} <span class="text-day-400 flex-1 basis-24 text-xs text-pretty">{descriptionLabel}</span>
</div> )}
</div>
)
}
<slot /> <slot />

View File

@@ -9,10 +9,11 @@ type Props = HTMLAttributes<'div'> & {
value: HTMLAttributes<'input'>['value'] value: HTMLAttributes<'input'>['value']
label: string label: string
}[] }[]
inputProps?: Omit<HTMLAttributes<'input'>, 'checked' | 'class' | 'name' | 'type' | 'value'>
selectedValue?: string | null selectedValue?: string | null
} }
const { name, options, selectedValue, class: className, ...rest } = Astro.props const { name, options, selectedValue, inputProps, class: className, ...rest } = Astro.props
--- ---
<div <div
@@ -31,6 +32,7 @@ const { name, options, selectedValue, class: className, ...rest } = Astro.props
value={option.value} value={option.value}
checked={selectedValue === option.value} checked={selectedValue === option.value}
class="peer sr-only" class="peer sr-only"
{...inputProps}
/> />
<span class="peer-checked:bg-night-400 inline-block cursor-pointer px-1.5 py-0.5 text-white peer-checked:text-green-500"> <span class="peer-checked:bg-night-400 inline-block cursor-pointer px-1.5 py-0.5 text-white peer-checked:text-green-500">
{option.label} {option.label}

View File

@@ -88,12 +88,26 @@ const overallScoreInfo = makeOverallScoreInfo(overallScore)
<h3 class="font-title text-lg leading-none font-medium tracking-wide text-white"> <h3 class="font-title text-lg leading-none font-medium tracking-wide text-white">
{name}{ {name}{
statusIcon && ( statusIcon && (
<Tooltip text={statusIcon.label} position="right" class="-my-2 shrink-0"> <Tooltip
<Icon text={statusIcon.label}
is:inline={inlineIcons} position="right"
name={statusIcon.icon} class="-my-2 shrink-0 whitespace-nowrap"
class={cn('inline-block size-6 shrink-0 rounded-lg p-1', statusIcon.classNames.icon)} enabled={verificationStatus !== 'VERIFICATION_FAILED'}
/> >
{[
<Icon
is:inline={inlineIcons}
name={statusIcon.icon}
class={cn(
'inline-block size-6 shrink-0 rounded-lg p-1 align-[-0.37em]',
verificationStatus === 'VERIFICATION_FAILED' && 'pr-0',
statusIcon.classNames.icon
)}
/>,
verificationStatus === 'VERIFICATION_FAILED' && (
<span class="text-sm font-bold text-red-500">SCAM</span>
),
]}
</Tooltip> </Tooltip>
) )
} }

View File

@@ -34,7 +34,8 @@ const {
<form <form
method="GET" method="GET"
hx-get={Astro.url.pathname} hx-get={Astro.url.pathname}
hx-trigger={`input delay:500ms from:input[type='text'], keyup[key=='Enter'], change from:input:not([data-show-more-input], #${showFiltersId}), change from:select`} hx-trigger={// NOTE: I need to do the [data-trigger-on-change] hack, because HTMX doesnt suport the :not() selector, and I need to exclude the Show more buttons, and not trigger for inputs outside the form
"input delay:500ms from:([data-services-filters-form] input[type='text']), keyup[key=='Enter'], change from:([data-services-filters-form] [data-trigger-on-change])"}
hx-target={`#${searchResultsId}`} hx-target={`#${searchResultsId}`}
hx-select={`#${searchResultsId}`} hx-select={`#${searchResultsId}`}
hx-push-url="true" hx-push-url="true"
@@ -44,7 +45,11 @@ const {
.filter((verification) => verification.default) .filter((verification) => verification.default)
.map((verification) => verification.slug)} .map((verification) => verification.slug)}
{...formProps} {...formProps}
class={cn('', className)} class={cn(
// Check the scam filter when there is a text quey and the user has checked verified and approved
'has-[input[name=q]:not(:placeholder-shown)]:has-[&_input[name=verification][value=verified]:checked]:has-[&_input[name=verification][value=approved]:checked]:[&_input[name=verification][value=scam]]:checkbox-force-checked',
className
)}
> >
<div class="mb-4 flex items-center justify-between"> <div class="mb-4 flex items-center justify-between">
<h2 class="font-title text-xl text-green-500">FILTERS</h2> <h2 class="font-title text-xl text-green-500">FILTERS</h2>
@@ -64,6 +69,7 @@ const {
name="sort" name="sort"
id="sort" id="sort"
class="border-night-600 bg-night-900 w-full rounded-md border p-2 text-white focus:border-green-500 focus:outline-hidden" class="border-night-600 bg-night-900 w-full rounded-md border p-2 text-white focus:border-green-500 focus:outline-hidden"
data-trigger-on-change
> >
{ {
options.sort.map((option) => ( options.sort.map((option) => (
@@ -108,6 +114,7 @@ const {
name="categories" name="categories"
value={category.slug} value={category.slug}
checked={category.checked} checked={category.checked}
data-trigger-on-change
/> />
<span class="peer-checked:font-bold"> <span class="peer-checked:font-bold">
{category.name} {category.name}
@@ -121,13 +128,7 @@ const {
{ {
options.categories.filter((category) => category.showAlways).length < options.categories.length && ( options.categories.filter((category) => category.showAlways).length < options.categories.length && (
<> <>
<input <input type="checkbox" id="show-more-categories" class="peer sr-only" hx-preserve />
type="checkbox"
id="show-more-categories"
class="peer sr-only"
hx-preserve
data-show-more-input
/>
<label <label
for="show-more-categories" for="show-more-categories"
class="peer-focus-visible:ring-offset-night-700 mt-2 block cursor-pointer rounded-sm text-sm text-green-500 peer-checked:hidden peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2" class="peer-focus-visible:ring-offset-night-700 mt-2 block cursor-pointer rounded-sm text-sm text-green-500 peer-checked:hidden peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2"
@@ -158,6 +159,7 @@ const {
name="verification" name="verification"
value={verification.slug} value={verification.slug}
checked={filters.verification.includes(verification.value)} checked={filters.verification.includes(verification.value)}
data-trigger-on-change
/> />
<Icon name={verification.icon} class={cn('size-4', verification.classNames.icon)} /> <Icon name={verification.icon} class={cn('size-4', verification.classNames.icon)} />
<span class="peer-checked:font-bold">{verification.labelShort}</span> <span class="peer-checked:font-bold">{verification.labelShort}</span>
@@ -176,6 +178,9 @@ const {
options={options.modeOptions} options={options.modeOptions}
selectedValue={filters['currency-mode']} selectedValue={filters['currency-mode']}
class="-my-2" class="-my-2"
inputProps={{
'data-trigger-on-change': true,
}}
/> />
</div> </div>
<div> <div>
@@ -188,6 +193,7 @@ const {
name="currencies" name="currencies"
value={currency.slug} value={currency.slug}
checked={filters.currencies?.some((id) => id === currency.id)} checked={filters.currencies?.some((id) => id === currency.id)}
data-trigger-on-change
/> />
<Icon name={currency.icon} class="size-4" /> <Icon name={currency.icon} class="size-4" />
<span class="peer-checked:font-bold">{currency.name}</span> <span class="peer-checked:font-bold">{currency.name}</span>
@@ -210,6 +216,7 @@ const {
name="networks" name="networks"
value={network.slug} value={network.slug}
checked={filters.networks?.some((slug) => slug === network.slug)} checked={filters.networks?.some((slug) => slug === network.slug)}
data-trigger-on-change
/> />
<Icon name={network.icon} class="size-4" /> <Icon name={network.icon} class="size-4" />
<span class="peer-checked:font-bold">{network.name}</span> <span class="peer-checked:font-bold">{network.name}</span>
@@ -233,6 +240,7 @@ const {
id="max-kyc" id="max-kyc"
value={filters['max-kyc'] ?? 4} value={filters['max-kyc'] ?? 4}
class="w-full accent-green-500" class="w-full accent-green-500"
data-trigger-on-change
/> />
</div> </div>
<div class="text-day-400 mt-1 flex justify-between px-1 text-xs"> <div class="text-day-400 mt-1 flex justify-between px-1 text-xs">
@@ -261,6 +269,7 @@ const {
id="user-rating" id="user-rating"
value={filters['user-rating']} value={filters['user-rating']}
class="w-full accent-green-500" class="w-full accent-green-500"
data-trigger-on-change
/> />
</div> </div>
<div class="text-day-400 mt-1 flex justify-between px-2 text-xs"> <div class="text-day-400 mt-1 flex justify-between px-2 text-xs">
@@ -289,12 +298,22 @@ const {
options={options.modeOptions} options={options.modeOptions}
selectedValue={filters['attribute-mode']} selectedValue={filters['attribute-mode']}
class="-my-2" class="-my-2"
inputProps={{
'data-trigger-on-change': true,
}}
/> />
</div> </div>
{ {
options.attributesByCategory.map(({ category, attributes }) => ( options.attributesByCategory.map(({ categoryInfo, attributes }) => (
<fieldset class="min-w-0"> <fieldset class="min-w-0">
<legend class="font-title mb-0.5 text-xs tracking-wide text-white">{category}</legend> <legend class="font-title mb-0.5 inline-flex items-center gap-1 text-[0.8125rem] tracking-wide text-white uppercase">
<Icon
name={categoryInfo.icon}
class={cn('size-4 shrink-0 opacity-80', categoryInfo.classNames.icon)}
aria-hidden="true"
/>
{categoryInfo.label}
</legend>
<ul class="[:not(:has(~_.peer:checked))]:[&>li:not([data-show-always])]:hidden"> <ul class="[:not(:has(~_.peer:checked))]:[&>li:not([data-show-always])]:hidden">
{attributes.map((attribute) => { {attributes.map((attribute) => {
@@ -318,6 +337,7 @@ const {
value="" value=""
checked={!attribute.value} checked={!attribute.value}
aria-label="Ignore" aria-label="Ignore"
data-trigger-on-change
/> />
<input <input
type="radio" type="radio"
@@ -327,6 +347,7 @@ const {
class="peer/yes sr-only" class="peer/yes sr-only"
checked={attribute.value === 'yes'} checked={attribute.value === 'yes'}
aria-label="Include" aria-label="Include"
data-trigger-on-change
/> />
<input <input
type="radio" type="radio"
@@ -336,6 +357,7 @@ const {
class="peer/no sr-only" class="peer/no sr-only"
checked={attribute.value === 'no'} checked={attribute.value === 'no'}
aria-label="Exclude" aria-label="Exclude"
data-trigger-on-change
/> />
<div class="pointer-events-none absolute inset-y-0 -left-[2px] hidden w-[calc(var(--spacing)*4.5*2+1px)] rounded-md border-2 border-blue-500 peer-focus-visible/empty:block peer-focus-visible/no:block peer-focus-visible/yes:block" /> <div class="pointer-events-none absolute inset-y-0 -left-[2px] hidden w-[calc(var(--spacing)*4.5*2+1px)] rounded-md border-2 border-blue-500 peer-focus-visible/empty:block peer-focus-visible/no:block peer-focus-visible/yes:block" />
@@ -356,11 +378,9 @@ const {
</label> </label>
<span <span
class="bg-night-400 border-night-500 pointer-events-none block h-4 w-px border-y peer-checked/no:w-[0.5px] peer-checked/yes:w-[0.5px]" class="bg-night-400 border-night-500 before:bg-night-400 before:border-night-600 pointer-events-none block h-4 w-px border-y peer-checked/no:w-[0.5px] peer-checked/yes:w-[0.5px] before:h-full before:w-px before:border-y-2"
aria-hidden="true" aria-hidden="true"
> />
<span class="bg-night-400 border-night-600 block h-full w-px border-y-2" />
</span>
<label <label
for={noId} for={noId}
@@ -383,8 +403,8 @@ const {
aria-hidden="true" aria-hidden="true"
> >
<Icon <Icon
name={attribute.info.icon} name={attribute.typeInfo.icon}
class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.info.classNames.icon)} class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.typeInfo.classNames.icon)}
aria-hidden="true" aria-hidden="true"
/> />
<span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap"> <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
@@ -398,8 +418,8 @@ const {
aria-hidden="true" aria-hidden="true"
> >
<Icon <Icon
name={attribute.info.icon} name={attribute.typeInfo.icon}
class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.info.classNames.icon)} class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.typeInfo.classNames.icon)}
aria-hidden="true" aria-hidden="true"
/> />
<span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap"> <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
@@ -417,19 +437,18 @@ const {
<> <>
<input <input
type="checkbox" type="checkbox"
id={`show-more-attributes-${category}`} id={`show-more-attributes-${categoryInfo.slug}`}
class="peer sr-only" class="peer sr-only"
hx-preserve hx-preserve
data-show-more-input
/> />
<label <label
for={`show-more-attributes-${category}`} for={`show-more-attributes-${categoryInfo.slug}`}
class="peer-focus-visible:ring-offset-night-700 mt-2 block cursor-pointer rounded-sm text-sm text-green-500 peer-checked:hidden peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2" class="peer-focus-visible:ring-offset-night-700 mt-2 block cursor-pointer rounded-sm text-sm text-green-500 peer-checked:hidden peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2"
> >
+ Show more + Show more
</label> </label>
<label <label
for={`show-more-attributes-${category}`} for={`show-more-attributes-${categoryInfo.slug}`}
class="peer-focus-visible:ring-offset-night-700 mt-2 hidden cursor-pointer rounded-sm text-sm text-green-500 peer-checked:block peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2" class="peer-focus-visible:ring-offset-night-700 mt-2 hidden cursor-pointer rounded-sm text-sm text-green-500 peer-checked:block peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2"
> >
- Show less - Show less
@@ -455,6 +474,7 @@ const {
id="min-score" id="min-score"
value={filters['min-score']} value={filters['min-score']}
class="w-full accent-green-500" class="w-full accent-green-500"
data-trigger-on-change
/> />
</div> </div>
<div class="-mx-1.5 mt-2 flex justify-between px-1"> <div class="-mx-1.5 mt-2 flex justify-between px-1">

View File

@@ -1,9 +1,11 @@
--- ---
import { Icon } from 'astro-icon/components' import { Icon } from 'astro-icon/components'
import { uniq } from 'lodash-es'
import { verificationStatusesByValue } from '../constants/verificationStatus'
import { cn } from '../lib/cn' import { cn } from '../lib/cn'
import { pluralize } from '../lib/pluralize' import { pluralize } from '../lib/pluralize'
import { createPageUrl } from '../lib/urls' import { createPageUrl, urlWithParams } from '../lib/urls'
import Button from './Button.astro' import Button from './Button.astro'
import ServiceCard from './ServiceCard.astro' import ServiceCard from './ServiceCard.astro'
@@ -19,7 +21,9 @@ type Props = HTMLAttributes<'div'> & {
pageSize: number pageSize: number
sortSeed?: string sortSeed?: string
filters: ServicesFiltersObject filters: ServicesFiltersObject
hadToIncludeCommunityContributed: boolean includeScams: boolean
countCommunityOnly: number | null
inlineIcons?: boolean
} }
const { const {
@@ -31,89 +35,184 @@ const {
sortSeed, sortSeed,
class: className, class: className,
filters, filters,
hadToIncludeCommunityContributed, includeScams,
countCommunityOnly,
inlineIcons,
...divProps ...divProps
} = Astro.props } = Astro.props
const hasScams = filters.verification.includes('VERIFICATION_FAILED') const hasScams =
const hasCommunityContributed =
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
filters.verification.includes('COMMUNITY_CONTRIBUTED') || hadToIncludeCommunityContributed filters.verification.includes('VERIFICATION_FAILED') || includeScams
const hasSomeScam = !!services?.some((service) => service.verificationStatus.includes('VERIFICATION_FAILED'))
const hasCommunityContributed = filters.verification.includes('COMMUNITY_CONTRIBUTED')
const hasSomeCommunityContributed = !!services?.some((service) =>
service.verificationStatus.includes('COMMUNITY_CONTRIBUTED')
)
const totalPages = Math.ceil(total / pageSize) || 1 const totalPages = Math.ceil(total / pageSize) || 1
const urlIfIncludingCommunity = urlWithParams(Astro.url, {
verification: uniq([
...filters.verification.map((v) => verificationStatusesByValue[v].slug),
verificationStatusesByValue.COMMUNITY_CONTRIBUTED.slug,
]),
})
--- ---
<div {...divProps} class={cn('flex-1', className)}> <div {...divProps} class={cn('flex-1', className)}>
<div class="mb-6 flex items-center justify-between"> <div class="flex items-center justify-between">
<span class="text-day-500 text-sm"> <span class="text-day-500 xs:gap-x-3 flex flex-wrap items-center gap-x-2 gap-y-1 text-sm sm:gap-x-6">
{total.toLocaleString()} {total.toLocaleString()}
{pluralize('result', total)} {pluralize('result', total)}
<span <Icon
name="ri:loader-4-line"
id="search-indicator" id="search-indicator"
class="htmx-request:opacity-100 text-white opacity-0 transition-opacity duration-500" class="htmx-request:opacity-100 xs:-mx-1.5 -mx-1 inline-block size-4 animate-spin text-white opacity-0 transition-opacity duration-500 sm:-mx-3"
> is:inline={inlineIcons}
<Icon name="ri:loader-4-line" class="inline-block size-4 animate-spin" /> />
Loading...
</span> {
countCommunityOnly && (
<>
<Button
as="a"
href={urlIfIncludingCommunity}
label={`Include +${countCommunityOnly.toLocaleString()} community contributed`}
size="sm"
class="hidden lg:inline-flex"
icon="ri:search-line"
inlineIcon={inlineIcons}
/>
<Button
as="a"
href={urlIfIncludingCommunity}
label={`Include +${countCommunityOnly.toLocaleString()}`}
size="sm"
class="hidden sm:inline-flex lg:hidden"
icon="ri:search-line"
endIcon="ri:question-line"
classNames={{
endIcon: 'text-yellow-200/50',
}}
inlineIcon={inlineIcons}
/>
<a
href={urlIfIncludingCommunity}
class="border-night-500 bg-night-800 flex items-center gap-1 rounded-md border px-2 py-0.5 text-sm sm:hidden"
>
<Icon
name="ri:search-line"
class="mr-0.5 inline-block size-3.5 shrink-0 align-[-0.15em]"
is:inline={inlineIcons}
/>
Include
{countCommunityOnly.toLocaleString()}
<Icon
name="ri:question-line"
class="inline-block size-3.5 shrink-0 align-[-0.15em] text-yellow-200/50"
is:inline={inlineIcons}
/>
</a>
</>
)
}
</span> </span>
<Button as="a" href="/service-suggestion/new" label="Add service" icon="ri:add-line" /> <Button
as="a"
href="/service-suggestion/new"
label="Add service"
icon="ri:add-line"
inlineIcon={inlineIcons}
class="max-xs:w-9 max-xs:px-0"
classNames={{
label: 'max-xs:hidden',
}}
/>
</div> </div>
{ {
hasScams && hasCommunityContributed && ( hasScams && hasCommunityContributed && (
<div class="font-title mb-6 rounded-lg border border-red-500/30 bg-red-950 p-4 text-sm text-red-500"> <div class="font-title mt-2 rounded-lg bg-red-900/50 px-3 py-2 text-sm text-pretty text-red-400">
<Icon name="ri:alert-fill" class="-mr-1 inline-block size-4 text-red-500" /> <Icon
<Icon name="ri:question-line" class="mr-2 inline-block size-4 text-yellow-500" /> name="ri:alert-fill"
Showing SCAM and unverified community-contributed services. class="inline-block size-4 shrink-0 align-[-0.2em] text-red-500"
{hadToIncludeCommunityContributed && 'Because there were no other results.'} is:inline={inlineIcons}
/>
<Icon
name="ri:question-line"
class="mr-1 inline-block size-4 shrink-0 align-[-0.2em] text-yellow-400"
is:inline={inlineIcons}
/>
Results {hasSomeScam || hasSomeCommunityContributed ? 'include' : 'may include'} SCAMs or
community-contributed services.
</div> </div>
) )
} }
{ {
hasScams && !hasCommunityContributed && ( hasScams && !hasCommunityContributed && (
<div class="font-title mb-6 rounded-lg border border-red-500/30 bg-red-950 p-4 text-sm text-red-500"> <div class="font-title mt-2 rounded-lg bg-red-900/50 px-3 py-2 text-sm text-pretty text-red-400">
<Icon name="ri:alert-fill" class="mr-2 inline-block size-4 text-red-500" /> <Icon
Showing SCAM services! name="ri:alert-fill"
class="mr-1 inline-block size-4 shrink-0 align-[-0.2em] text-red-500"
is:inline={inlineIcons}
/>
Results {hasSomeScam ? 'include' : 'may include'} SCAM services
</div> </div>
) )
} }
{ {
!hasScams && hasCommunityContributed && ( !hasScams && hasCommunityContributed && (
<div class="font-title mb-6 rounded-lg border border-yellow-500/30 bg-yellow-950 p-4 text-sm text-yellow-500"> <div class="font-title mt-2 rounded-lg bg-yellow-600/30 px-3 py-2 text-sm text-pretty text-yellow-200">
<Icon name="ri:question-line" class="mr-2 inline-block size-4" /> <Icon
name="ri:question-line"
{hadToIncludeCommunityContributed class="mr-1 inline-block size-4 shrink-0 align-[-0.2em] text-yellow-400"
? 'Showing unverified community-contributed services, because there were no other results. Some might be scams.' is:inline={inlineIcons}
: 'Showing unverified community-contributed services, some might be scams.'} />
Results {hasSomeCommunityContributed ? 'include' : 'may include'} unverified community-contributed
services, some might be scams.
</div> </div>
) )
} }
{ {
!services || services.length === 0 ? ( !services || services.length === 0 ? (
<div class="sticky top-20 flex flex-col items-center justify-center rounded-lg border border-green-500/30 bg-black/40 p-12 text-center"> <div class="sticky top-20 mt-6 flex flex-col items-center justify-center py-12 text-center">
<Icon name="ri:emotion-sad-line" class="mb-4 size-16 text-green-500/50" /> <Icon name="ri:emotion-sad-line" class="mb-4 size-16 text-green-500/50" is:inline={inlineIcons} />
<h3 class="font-title mb-3 text-xl text-green-500">No services found</h3> <h3 class="font-title mb-3 text-xl text-green-500">No services found</h3>
<p class="text-day-400">Try adjusting your filters to find more services</p> <p class="text-day-400">Try adjusting your filters to find more services</p>
<a <div class="mt-4 flex justify-center gap-2">
href={Astro.url.pathname} {!hasDefaultFilters && (
class={cn( <Button
'bg-night-800 font-title mt-4 rounded-md px-4 py-2 text-sm tracking-wider text-white uppercase', as="a"
hasDefaultFilters && 'hidden' href={Astro.url.pathname}
label="Clear filters"
icon="ri:close-line"
inlineIcon={inlineIcons}
/>
)} )}
> {countCommunityOnly && (
Clear filters <Button
</a> as="a"
href={urlIfIncludingCommunity}
label={`Show ${countCommunityOnly.toLocaleString()} community contributed`}
icon="ri:search-line"
inlineIcon={inlineIcons}
/>
)}
</div>
</div> </div>
) : ( ) : (
<> <>
<div class="grid grid-cols-1 gap-4 sm:gap-6 md:grid-cols-[repeat(auto-fill,minmax(calc(var(--spacing)*80),1fr))]"> <div class="mt-6 grid grid-cols-1 gap-4 sm:gap-6 md:grid-cols-[repeat(auto-fill,minmax(calc(var(--spacing)*80),1fr))]">
{services.map((service, i) => ( {services.map((service, i) => (
<ServiceCard <ServiceCard
inlineIcons inlineIcons={inlineIcons}
service={service} service={service}
data-hx-search-results-card data-hx-search-results-card
{...(i === services.length - 1 && currentPage < totalPages {...(i === services.length - 1 && currentPage < totalPages
@@ -131,11 +230,25 @@ const totalPages = Math.ceil(total / pageSize) || 1
<div class="no-js:hidden mt-8 flex justify-center" id="infinite-scroll-indicator"> <div class="no-js:hidden mt-8 flex justify-center" id="infinite-scroll-indicator">
<div class="htmx-request:opacity-100 flex items-center gap-2 opacity-0 transition-opacity duration-500"> <div class="htmx-request:opacity-100 flex items-center gap-2 opacity-0 transition-opacity duration-500">
<Icon name="ri:loader-4-line" class="size-8 animate-spin text-green-500" /> <Icon
name="ri:loader-4-line"
class="size-8 animate-spin text-green-500"
is:inline={inlineIcons}
/>
Loading more services... Loading more services...
</div> </div>
</div> </div>
</> </>
) )
} }
<div class="mt-4 text-center">
<Button
as="a"
href="/service-suggestion/new"
label="Add service"
icon="ri:add-line"
inlineIcon={inlineIcons}
class="mx-auto"
/>
</div>
</div> </div>

View File

@@ -48,9 +48,9 @@ export const {
}, },
{ {
value: 'pending', value: 'pending',
label: commentStatusById.PENDING.label, label: 'AI pending',
color: commentStatusById.PENDING.color, color: commentStatusById.PENDING.color,
icon: commentStatusById.PENDING.icon, icon: 'ri:robot-2-line',
whereClause: { whereClause: {
OR: [{ status: 'PENDING' }, { status: 'HUMAN_PENDING' }], OR: [{ status: 'PENDING' }, { status: 'HUMAN_PENDING' }],
}, },
@@ -60,9 +60,9 @@ export const {
}, },
{ {
value: 'human-pending', value: 'human-pending',
label: commentStatusById.HUMAN_PENDING.label, label: 'Human needed',
color: commentStatusById.HUMAN_PENDING.color, color: commentStatusById.HUMAN_PENDING.color,
icon: commentStatusById.HUMAN_PENDING.icon, icon: 'ri:user-search-line',
whereClause: { status: 'HUMAN_PENDING' }, whereClause: { status: 'HUMAN_PENDING' },
classNames: { classNames: {
filter: 'border-blue-500 bg-blue-500/20 text-blue-400', filter: 'border-blue-500 bg-blue-500/20 text-blue-400',

View File

@@ -82,12 +82,13 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
<a <a
href={urlWithParams(Astro.url, { status: filter.value })} href={urlWithParams(Astro.url, { status: filter.value })}
class={cn([ class={cn([
'font-title rounded-md border px-3 py-1 text-sm', 'font-title flex items-center gap-2 rounded-md border px-3 py-1 text-sm',
params.status === filter.value params.status === filter.value
? filter.classNames.filter ? filter.classNames.filter
: 'border-zinc-700 transition-colors hover:border-green-500/50', : 'border-zinc-700 transition-colors hover:border-green-500/50',
])} ])}
> >
<Icon name={filter.icon} class="size-4 shrink-0" />
{filter.label} {filter.label}
</a> </a>
)) ))

View File

@@ -169,7 +169,7 @@ const createUrlWithoutFilter = (paramName: keyof typeof params) => {
'[&:has(~[data-has-default-filters="true"])_[data-clear-filters-button]]:hidden' '[&:has(~[data-has-default-filters="true"])_[data-clear-filters-button]]:hidden'
)} )}
hx-get={Astro.url.pathname} hx-get={Astro.url.pathname}
hx-trigger="input from:input, keyup[key=='Enter'], change from:select" hx-trigger="input from:find input, keyup[key=='Enter'], change from:find select"
hx-target="#events-list-container" hx-target="#events-list-container"
hx-select="#events-list-container" hx-select="#events-list-container"
hx-swap="outerHTML" hx-swap="outerHTML"

16
web/src/pages/health.ts Normal file
View File

@@ -0,0 +1,16 @@
import type { APIRoute } from 'astro'
export const GET: APIRoute = () => {
return new Response(
JSON.stringify({
message: 'OK',
timestamp: new Date().toISOString(),
}),
{
status: 200,
headers: {
'Content-Type': 'application/json',
},
}
)
}

View File

@@ -1,14 +1,16 @@
--- ---
import { ServiceVisibility } from '@prisma/client' import { ServiceVisibility } from '@prisma/client'
import { z } from 'astro:schema' import { z } from 'astro:schema'
import { groupBy, orderBy } from 'lodash-es' import { groupBy, omit, orderBy, uniq } from 'lodash-es'
import seedrandom from 'seedrandom' import seedrandom from 'seedrandom'
import Button from '../components/Button.astro' import Button from '../components/Button.astro'
import InputText from '../components/InputText.astro'
import Pagination from '../components/Pagination.astro' import Pagination from '../components/Pagination.astro'
import ServiceFiltersPill from '../components/ServiceFiltersPill.astro' import ServiceFiltersPill from '../components/ServiceFiltersPill.astro'
import ServicesFilters from '../components/ServicesFilters.astro' import ServicesFilters from '../components/ServicesFilters.astro'
import ServicesSearchResults from '../components/ServicesSearchResults.astro' import ServicesSearchResults from '../components/ServicesSearchResults.astro'
import { getAttributeCategoryInfo } from '../constants/attributeCategories'
import { getAttributeTypeInfo } from '../constants/attributeTypes' import { getAttributeTypeInfo } from '../constants/attributeTypes'
import { import {
currencies, currencies,
@@ -26,6 +28,7 @@ import {
import BaseLayout from '../layouts/BaseLayout.astro' import BaseLayout from '../layouts/BaseLayout.astro'
import { areEqualArraysWithoutOrder, zodEnumFromConstant } from '../lib/arrays' import { areEqualArraysWithoutOrder, zodEnumFromConstant } from '../lib/arrays'
import { parseIntWithFallback } from '../lib/numbers' import { parseIntWithFallback } from '../lib/numbers'
import { areEqualObjectsWithoutOrder } from '../lib/objects'
import { zodParseQueryParamsStoringErrors } from '../lib/parseUrlFilters' import { zodParseQueryParamsStoringErrors } from '../lib/parseUrlFilters'
import { prisma } from '../lib/prisma' import { prisma } from '../lib/prisma'
import { makeSortSeed } from '../lib/sortSeed' import { makeSortSeed } from '../lib/sortSeed'
@@ -130,9 +133,12 @@ const attributeOptions = [
prefix: string prefix: string
}[] }[]
const ignoredKeysForDefaultData = ['sort-seed']
const { const {
data: filters, data: filters,
hasDefaultData: hasDefaultFilters, hasDefaultData: hasDefaultFilters,
defaultData: defaultFilters,
redirectUrl, redirectUrl,
} = zodParseQueryParamsStoringErrors( } = zodParseQueryParamsStoringErrors(
{ {
@@ -164,7 +170,7 @@ const {
}, },
Astro, Astro,
{ {
ignoredKeysForDefaultData: ['sort-seed'], ignoredKeysForDefaultData,
cleanUrl: { cleanUrl: {
removeUneededObjectParams: true, removeUneededObjectParams: true,
removeParams: { removeParams: {
@@ -181,11 +187,130 @@ const {
} }
) )
const hasDefaultFiltersIgnoringQ = areEqualObjectsWithoutOrder(
omit(filters, [...ignoredKeysForDefaultData, 'q']),
omit(defaultFilters, [...ignoredKeysForDefaultData, 'q'])
)
if (redirectUrl) return Astro.redirect(redirectUrl.toString()) if (redirectUrl) return Astro.redirect(redirectUrl.toString())
const includeScams =
!!filters.q &&
(areEqualArraysWithoutOrder(filters.verification, ['VERIFICATION_SUCCESS', 'APPROVED']) ||
areEqualArraysWithoutOrder(filters.verification, [
'VERIFICATION_SUCCESS',
'APPROVED',
'COMMUNITY_CONTRIBUTED',
]))
export type ServicesFiltersObject = typeof filters export type ServicesFiltersObject = typeof filters
const [categories, [services, totalServices, hadToIncludeCommunityContributed]] = const groupedAttributes = groupBy(
Object.entries(filters.attr ?? {}).flatMap(([key, value]) => {
const id = parseIntWithFallback(key)
if (id === null) return []
return [{ id, value }]
}),
'value'
)
const where = {
listedAt: {
lte: new Date(),
},
categories: filters.categories.length ? { some: { slug: { in: filters.categories } } } : undefined,
verificationStatus: {
in: includeScams ? uniq([...filters.verification, 'VERIFICATION_FAILED'] as const) : filters.verification,
},
serviceVisibility: ServiceVisibility.PUBLIC,
overallScore: { gte: filters['min-score'] },
acceptedCurrencies: filters.currencies.length
? filters['currency-mode'] === 'and'
? { hasEvery: filters.currencies }
: { hasSome: filters.currencies }
: undefined,
kycLevel: {
lte: filters['max-kyc'],
},
AND: [
...(filters['user-rating'] > 0
? [
{
averageUserRating: {
gte: filters['user-rating'],
},
} satisfies Prisma.ServiceWhereInput,
]
: []),
...(filters.q
? [
{
OR: [
{ name: { contains: filters.q, mode: 'insensitive' as const } },
{ description: { contains: filters.q, mode: 'insensitive' as const } },
],
} satisfies Prisma.ServiceWhereInput,
]
: []),
...(filters.networks.length
? [
{
OR: [
...(filters.networks.includes('onion') ? [{ onionUrls: { isEmpty: false } }] : []),
...(filters.networks.includes('i2p') ? [{ i2pUrls: { isEmpty: false } }] : []),
...(filters.networks.includes('clearnet') ? [{ serviceUrls: { isEmpty: false } }] : []),
],
} satisfies Prisma.ServiceWhereInput,
]
: []),
...(filters.attr && (groupedAttributes.yes?.length ?? 0) + (groupedAttributes.no?.length ?? 0) > 0
? [
{
AND: [
...(groupedAttributes.yes && groupedAttributes.yes.length > 0
? [
{
[filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.yes.map(
({ id }) =>
({
attributes: {
some: {
attribute: {
id,
},
},
},
}) satisfies Prisma.ServiceWhereInput
),
},
]
: []),
...(groupedAttributes.no && groupedAttributes.no.length > 0
? [
{
[filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.no.map(
({ id }) =>
({
attributes: {
none: {
attribute: {
id,
},
},
},
}) satisfies Prisma.ServiceWhereInput
),
},
]
: []),
],
},
]
: []),
],
} as const satisfies Prisma.ServiceWhereInput
const [categories, [services, totalServices], countCommunityOnly, attributes] =
await Astro.locals.banners.tryMany([ await Astro.locals.banners.tryMany([
[ [
'Unable to load category filters.', 'Unable to load category filters.',
@@ -206,146 +331,16 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
[ [
'Unable to load services.', 'Unable to load services.',
async () => { async () => {
const groupedAttributes = groupBy( const [unsortedServices, totalServices] = await prisma.service.findManyAndCount({
Object.entries(filters.attr ?? {}).flatMap(([key, value]) => {
const id = parseIntWithFallback(key)
if (id === null) return []
return [{ id, value }]
}),
'value'
)
const where = {
listedAt: {
lte: new Date(),
},
categories: filters.categories.length ? { some: { slug: { in: filters.categories } } } : undefined,
verificationStatus: {
in: filters.verification,
},
serviceVisibility: ServiceVisibility.PUBLIC,
overallScore: { gte: filters['min-score'] },
acceptedCurrencies: filters.currencies.length
? filters['currency-mode'] === 'and'
? { hasEvery: filters.currencies }
: { hasSome: filters.currencies }
: undefined,
kycLevel: {
lte: filters['max-kyc'],
},
AND: [
...(filters['user-rating'] > 0
? [
{
averageUserRating: {
gte: filters['user-rating'],
},
} satisfies Prisma.ServiceWhereInput,
]
: []),
...(filters.q
? [
{
OR: [
{ name: { contains: filters.q, mode: 'insensitive' as const } },
{ description: { contains: filters.q, mode: 'insensitive' as const } },
],
} satisfies Prisma.ServiceWhereInput,
]
: []),
...(filters.networks.length
? [
{
OR: [
...(filters.networks.includes('onion') ? [{ onionUrls: { isEmpty: false } }] : []),
...(filters.networks.includes('i2p') ? [{ i2pUrls: { isEmpty: false } }] : []),
...(filters.networks.includes('clearnet') ? [{ serviceUrls: { isEmpty: false } }] : []),
],
} satisfies Prisma.ServiceWhereInput,
]
: []),
...(filters.attr && (groupedAttributes.yes?.length ?? 0) + (groupedAttributes.no?.length ?? 0) > 0
? [
{
AND: [
...(groupedAttributes.yes && groupedAttributes.yes.length > 0
? [
{
[filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.yes.map(
({ id }) =>
({
attributes: {
some: {
attribute: {
id,
},
},
},
}) satisfies Prisma.ServiceWhereInput
),
},
]
: []),
...(groupedAttributes.no && groupedAttributes.no.length > 0
? [
{
[filters['attribute-mode'] === 'and' ? 'AND' : 'OR']: groupedAttributes.no.map(
({ id }) =>
({
attributes: {
none: {
attribute: {
id,
},
},
},
}) satisfies Prisma.ServiceWhereInput
),
},
]
: []),
],
},
]
: []),
],
} as const satisfies Prisma.ServiceWhereInput
const select = {
id: true,
...(Object.fromEntries(sortOptions.map((option) => [option.orderBy.key, true])) as Record<
(typeof sortOptions)[number]['orderBy']['key'],
true
>),
} as const satisfies Prisma.ServiceSelect
let [unsortedServices, totalServices] = await prisma.service.findManyAndCount({
where, where,
select, select: {
id: true,
...(Object.fromEntries(sortOptions.map((option) => [option.orderBy.key, true])) as Record<
(typeof sortOptions)[number]['orderBy']['key'],
true
>),
},
}) })
let hadToIncludeCommunityContributed = false
if (
totalServices === 0 &&
areEqualArraysWithoutOrder(where.verificationStatus.in, ['VERIFICATION_FAILED', 'APPROVED'])
) {
const [unsortedServiceCommunityServices, totalCommunityServices] =
await prisma.service.findManyAndCount({
where: {
...where,
verificationStatus: {
...where.verificationStatus,
in: [...where.verificationStatus.in, 'COMMUNITY_CONTRIBUTED'],
},
},
select,
})
if (totalCommunityServices !== 0) {
hadToIncludeCommunityContributed = true
unsortedServices = unsortedServiceCommunityServices
totalServices = totalCommunityServices
}
}
const rng = seedrandom(filters['sort-seed']) const rng = seedrandom(filters['sort-seed'])
const selectedSort = sortOptions.find((sort) => sort.value === filters.sort) ?? defaultSortOption const selectedSort = sortOptions.find((sort) => sort.value === filters.sort) ?? defaultSortOption
@@ -405,39 +400,56 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
[selectedSort.orderBy.direction, 'asc'] [selectedSort.orderBy.direction, 'asc']
) )
return [sortedServicesWithInfo, totalServices, hadToIncludeCommunityContributed] as const return [sortedServicesWithInfo, totalServices] as const
}, },
[[] as [], 0, false] as const, [[] as [], 0, false] as const,
], ],
]) [
'Unable to load count if including community.',
const attributes = await Astro.locals.banners.try( () =>
'Unable to load attribute filters.', areEqualArraysWithoutOrder(filters.verification, ['VERIFICATION_SUCCESS', 'APPROVED']) ||
() => areEqualArraysWithoutOrder(filters.verification, [
prisma.attribute.findMany({ 'VERIFICATION_SUCCESS',
select: { 'APPROVED',
id: true, 'VERIFICATION_FAILED',
slug: true, ])
title: true, ? prisma.service.count({
category: true, where: {
type: true, ...where,
_count: { verificationStatus: 'COMMUNITY_CONTRIBUTED',
},
})
: null,
null,
],
[
'Unable to load attribute filters.',
() =>
prisma.attribute.findMany({
select: { select: {
services: true, id: true,
slug: true,
title: true,
category: true,
type: true,
_count: {
select: {
services: true,
},
},
}, },
}, orderBy: [{ category: 'asc' }, { type: 'asc' }, { title: 'asc' }],
}, }),
orderBy: [{ category: 'asc' }, { type: 'asc' }, { title: 'asc' }], [],
}), ],
[] ])
)
const attributesByCategory = orderBy( const attributesByCategory = orderBy(
Object.entries( Object.entries(
groupBy( groupBy(
attributes.map((attr) => { attributes.map((attr) => {
return { return {
info: getAttributeTypeInfo(attr.type), typeInfo: getAttributeTypeInfo(attr.type),
...attr, ...attr,
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
value: filters.attr?.[attr.id] || undefined, value: filters.attr?.[attr.id] || undefined,
@@ -447,6 +459,7 @@ const attributesByCategory = orderBy(
) )
).map(([category, attributes]) => ({ ).map(([category, attributes]) => ({
category, category,
categoryInfo: getAttributeCategoryInfo(category),
attributes: orderBy( attributes: orderBy(
attributes, attributes,
['value', 'type', '_count.services', 'title'], ['value', 'type', '_count.services', 'title'],
@@ -488,7 +501,8 @@ const filtersOptions = {
export type ServicesFiltersOptions = typeof filtersOptions export type ServicesFiltersOptions = typeof filtersOptions
// const searchResultsId = 'search-results'
const showFiltersId = 'show-filters'
--- ---
<BaseLayout <BaseLayout
@@ -509,7 +523,33 @@ export type ServicesFiltersOptions = typeof filtersOptions
class='[&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-night-700 flex items-stretch sm:hidden [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-2 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-green-500 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-2' class='[&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-night-700 flex items-stretch sm:hidden [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-2 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-green-500 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-2'
> >
{ {
!hasDefaultFilters ? ( hasDefaultFilters || hasDefaultFiltersIgnoringQ ? (
<form
method="GET"
hx-get={Astro.url.pathname}
hx-trigger="input delay:500ms, keyup[key=='Enter']"
hx-target={`#${searchResultsId}`}
hx-select={`#${searchResultsId}`}
hx-push-url="true"
hx-indicator="#search-indicator"
class="contents"
>
<InputText
name="q"
label="Search..."
hideLabel
inputIcon="ri:search-line"
inputIconClass="text-day-500 size-4.5"
inputProps={{
placeholder: 'Search',
value: filters.q,
class: 'bg-night-800 border-night-500',
'transition:persist': false,
}}
class="mr-4 flex-1"
/>
</form>
) : (
<div class="-ml-4 flex flex-1 items-center gap-2 overflow-x-auto mask-r-from-[calc(100%-var(--spacing)*16)] pr-12 pl-4"> <div class="-ml-4 flex flex-1 items-center gap-2 overflow-x-auto mask-r-from-[calc(100%-var(--spacing)*16)] pr-12 pl-4">
{filters.q && ( {filters.q && (
<ServiceFiltersPill text={`"${filters.q}"`} searchParamName="q" searchParamValue={filters.q} /> <ServiceFiltersPill text={`"${filters.q}"`} searchParamName="q" searchParamValue={filters.q} />
@@ -618,12 +658,19 @@ export type ServicesFiltersOptions = typeof filtersOptions
) )
})} })}
</div> </div>
) : (
<div class="text-day-500 flex flex-1 items-center">No filters</div>
) )
} }
<Button as="label" for="show-filters" label="Filters" icon="ri:filter-3-line" /> <Button
as="label"
for="show-filters"
label="Filters"
icon="ri:filter-3-line"
class="max-2xs:w-9 max-2xs:px-0"
classNames={{
label: 'max-2xs:hidden',
}}
/>
</div> </div>
<input <input
@@ -637,8 +684,8 @@ export type ServicesFiltersOptions = typeof filtersOptions
class="bg-night-700 fixed top-0 left-0 z-50 hidden h-dvh w-dvw shrink-0 translate-y-full overflow-y-auto overscroll-contain border-t border-green-500/30 px-8 pt-4 transition-transform peer-checked:translate-y-0 max-sm:peer-checked:block sm:relative sm:z-auto sm:block sm:h-auto sm:w-64 sm:translate-y-0 sm:overflow-visible sm:border-none sm:bg-none sm:p-0" class="bg-night-700 fixed top-0 left-0 z-50 hidden h-dvh w-dvw shrink-0 translate-y-full overflow-y-auto overscroll-contain border-t border-green-500/30 px-8 pt-4 transition-transform peer-checked:translate-y-0 max-sm:peer-checked:block sm:relative sm:z-auto sm:block sm:h-auto sm:w-64 sm:translate-y-0 sm:overflow-visible sm:border-none sm:bg-none sm:p-0"
> >
<ServicesFilters <ServicesFilters
searchResultsId="search-results" searchResultsId={searchResultsId}
showFiltersId="show-filters" showFiltersId={showFiltersId}
filters={{ filters={{
...filters, ...filters,
'sort-seed': makeSortSeed(), 'sort-seed': makeSortSeed(),
@@ -656,7 +703,9 @@ export type ServicesFiltersOptions = typeof filtersOptions
pageSize={PAGE_SIZE} pageSize={PAGE_SIZE}
sortSeed={filters['sort-seed']} sortSeed={filters['sort-seed']}
filters={filters} filters={filters}
hadToIncludeCommunityContributed={hadToIncludeCommunityContributed} includeScams={includeScams}
countCommunityOnly={countCommunityOnly}
inlineIcons
/> />
</div> </div>
{ {

View File

@@ -93,15 +93,20 @@
--color-night-950: oklch(11.97% 0.004 145.32); --color-night-950: oklch(11.97% 0.004 145.32);
} }
@layer utilities { @utility text-shadow-glow {
.text-shadow-glow { text-shadow:
text-shadow: 0 0 16px color-mix(in oklab, currentColor 30%, transparent),
0 0 16px color-mix(in oklab, currentColor 30%, transparent), 0 0 4px color-mix(in oklab, currentColor 60%, transparent);
0 0 4px color-mix(in oklab, currentColor 60%, transparent); }
} @utility drop-shadow-glow {
.drop-shadow-glow { filter: drop-shadow(0 0 16px color-mix(in oklab, currentColor 30%, transparent))
filter: drop-shadow(0 0 16px color-mix(in oklab, currentColor 30%, transparent)) drop-shadow(0 0 4px color-mix(in oklab, currentColor 60%, transparent));
drop-shadow(0 0 4px color-mix(in oklab, currentColor 60%, transparent)); }
@utility checkbox-force-checked {
&:not(:checked) {
@apply border-transparent! bg-current/50!;
background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e") !important;
} }
} }