Compare commits
9 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdfdcfc122 | ||
|
|
f4525e3d32 | ||
|
|
ecc8f67fc4 | ||
|
|
72c238a4dc | ||
|
|
d79bedf219 | ||
|
|
2362d2cc73 | ||
|
|
a69c0aeed4 | ||
|
|
ed86f863e3 | ||
|
|
845aa1185c |
4
.platform/hooks/predeploy/01_dump_database.sh
Normal file
4
.platform/hooks/predeploy/01_dump_database.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
pwd
|
||||
just dump-db
|
||||
@@ -70,7 +70,7 @@ services:
|
||||
expose:
|
||||
- 4321
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-k", "--silent", "--fail", "http://localhost:4321"]
|
||||
test: ["CMD", "curl", "-k", "--silent", "--fail", "http://localhost:4321/health"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
@@ -19,9 +19,8 @@ ENV HOST=0.0.0.0
|
||||
ENV PORT=4321
|
||||
EXPOSE 4321
|
||||
|
||||
# Add entrypoint script and make it executable
|
||||
COPY docker-entrypoint.sh /usr/local/bin/
|
||||
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
|
||||
# Add knm-migrate command script and make it executable
|
||||
COPY migrate.sh /usr/local/bin/knm-migrate
|
||||
RUN chmod +x /usr/local/bin/knm-migrate
|
||||
|
||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||
CMD ["node", "./dist/server/entry.mjs"]
|
||||
|
||||
@@ -16,6 +16,4 @@ for trigger_file in prisma/triggers/*.sql; do
|
||||
fi
|
||||
done
|
||||
|
||||
# Start the application
|
||||
echo "Starting the application..."
|
||||
exec "$@"
|
||||
echo "Migrations completed."
|
||||
@@ -0,0 +1,11 @@
|
||||
-- AlterEnum
|
||||
ALTER TYPE "NotificationType" ADD VALUE 'KARMA_CHANGE';
|
||||
|
||||
-- AlterTable
|
||||
ALTER TABLE "Notification" ADD COLUMN "aboutKarmaTransactionId" INTEGER;
|
||||
|
||||
-- AlterTable
|
||||
ALTER TABLE "NotificationPreferences" ADD COLUMN "karmaNotificationThreshold" INTEGER NOT NULL DEFAULT 10;
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "Notification" ADD CONSTRAINT "Notification_aboutKarmaTransactionId_fkey" FOREIGN KEY ("aboutKarmaTransactionId") REFERENCES "KarmaTransaction"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||
@@ -0,0 +1,13 @@
|
||||
/*
|
||||
Warnings:
|
||||
|
||||
- You are about to drop the column `iconId` on the `ServiceContactMethod` table. All the data in the column will be lost.
|
||||
- You are about to drop the column `info` on the `ServiceContactMethod` table. All the data in the column will be lost.
|
||||
|
||||
*/
|
||||
-- AlterTable
|
||||
ALTER TABLE "ServiceContactMethod" DROP COLUMN "iconId",
|
||||
DROP COLUMN "info",
|
||||
ADD COLUMN "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
ADD COLUMN "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
ALTER COLUMN "label" DROP NOT NULL;
|
||||
@@ -135,6 +135,7 @@ enum NotificationType {
|
||||
SUGGESTION_MESSAGE
|
||||
SUGGESTION_STATUS_CHANGE
|
||||
// KARMA_UNLOCK // TODO: [KARMA_UNLOCK] Will be added later, when karma unloks are in the database, not in the code.
|
||||
KARMA_CHANGE
|
||||
/// Marked as spammer, promoted to admin, etc.
|
||||
ACCOUNT_STATUS_CHANGE
|
||||
EVENT_CREATED
|
||||
@@ -207,6 +208,8 @@ model Notification {
|
||||
aboutCommentStatusChange CommentStatusChange?
|
||||
aboutServiceVerificationStatusChange ServiceVerificationStatusChange?
|
||||
aboutSuggestionStatusChange ServiceSuggestionStatusChange?
|
||||
aboutKarmaTransaction KarmaTransaction? @relation(fields: [aboutKarmaTransactionId], references: [id])
|
||||
aboutKarmaTransactionId Int?
|
||||
|
||||
@@index([userId])
|
||||
@@index([read])
|
||||
@@ -229,6 +232,7 @@ model NotificationPreferences {
|
||||
enableOnMyCommentStatusChange Boolean @default(true)
|
||||
enableAutowatchMyComments Boolean @default(true)
|
||||
enableNotifyPendingRepliesOnWatch Boolean @default(false)
|
||||
karmaNotificationThreshold Int @default(10)
|
||||
|
||||
onEventCreatedForServices Service[] @relation("onEventCreatedForServices")
|
||||
onRootCommentCreatedForServices Service[] @relation("onRootCommentCreatedForServices")
|
||||
@@ -393,12 +397,15 @@ model Service {
|
||||
}
|
||||
|
||||
model ServiceContactMethod {
|
||||
id Int @id @default(autoincrement())
|
||||
label String
|
||||
id Int @id @default(autoincrement())
|
||||
/// Only include it if you want to override the formatted value.
|
||||
label String?
|
||||
/// Including the protocol (e.g. "mailto:", "tel:", "https://")
|
||||
value String
|
||||
iconId String
|
||||
info String
|
||||
value String
|
||||
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @default(now()) @updatedAt
|
||||
|
||||
services Service @relation("ServiceToContactMethod", fields: [serviceId], references: [id], onDelete: Cascade)
|
||||
serviceId Int
|
||||
}
|
||||
@@ -522,6 +529,7 @@ model KarmaTransaction {
|
||||
createdAt DateTime @default(now())
|
||||
grantedBy User? @relation("KarmaGrantedBy", fields: [grantedByUserId], references: [id], onDelete: SetNull)
|
||||
grantedByUserId Int?
|
||||
Notification Notification[]
|
||||
|
||||
@@index([createdAt])
|
||||
@@index([userId])
|
||||
|
||||
29
web/prisma/triggers/11_notifications_karma.sql
Normal file
29
web/prisma/triggers/11_notifications_karma.sql
Normal file
@@ -0,0 +1,29 @@
|
||||
CREATE OR REPLACE FUNCTION trigger_karma_notifications()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
-- Only create notification if the user has enabled karma notifications
|
||||
-- and the karma change exceeds their threshold
|
||||
INSERT INTO "Notification" ("userId", "type", "aboutKarmaTransactionId")
|
||||
SELECT NEW."userId", 'KARMA_CHANGE', NEW.id
|
||||
FROM "NotificationPreferences" np
|
||||
WHERE np."userId" = NEW."userId"
|
||||
AND ABS(NEW.points) >= COALESCE(np."karmaNotificationThreshold", 10)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM "Notification" n
|
||||
WHERE n."userId" = NEW."userId"
|
||||
AND n."type" = 'KARMA_CHANGE'
|
||||
AND n."aboutKarmaTransactionId" = NEW.id
|
||||
);
|
||||
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
-- Drop the trigger if it exists to ensure a clean setup
|
||||
DROP TRIGGER IF EXISTS karma_notifications_trigger ON "KarmaTransaction";
|
||||
|
||||
-- Create the trigger to fire after inserts
|
||||
CREATE TRIGGER karma_notifications_trigger
|
||||
AFTER INSERT ON "KarmaTransaction"
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION trigger_karma_notifications();
|
||||
@@ -845,40 +845,29 @@ const generateFakeComment = (userId: number, serviceId: number, parentId?: numbe
|
||||
const generateFakeServiceContactMethod = (serviceId: number) => {
|
||||
const types = [
|
||||
{
|
||||
label: 'Email',
|
||||
value: `mailto:${faker.internet.email()}`,
|
||||
iconId: 'ri:mail-line',
|
||||
info: faker.lorem.sentence(),
|
||||
},
|
||||
{
|
||||
label: 'Phone',
|
||||
value: `tel:${faker.phone.number({ style: 'international' })}`,
|
||||
iconId: 'ri:phone-line',
|
||||
info: faker.lorem.sentence(),
|
||||
},
|
||||
{
|
||||
label: 'WhatsApp',
|
||||
value: `https://wa.me/${faker.phone.number({ style: 'international' })}`,
|
||||
iconId: 'ri:whatsapp-line',
|
||||
info: faker.lorem.sentence(),
|
||||
},
|
||||
{
|
||||
label: 'Telegram',
|
||||
value: `https://t.me/${faker.internet.username()}`,
|
||||
iconId: 'ri:telegram-line',
|
||||
info: faker.lorem.sentence(),
|
||||
},
|
||||
{
|
||||
label: 'Website',
|
||||
value: `https://x.com/${faker.internet.username()}`,
|
||||
},
|
||||
{
|
||||
value: faker.internet.url(),
|
||||
},
|
||||
{
|
||||
label: faker.lorem.word({ length: 2 }),
|
||||
value: faker.internet.url(),
|
||||
iconId: 'ri:global-line',
|
||||
info: faker.lorem.sentence(),
|
||||
},
|
||||
{
|
||||
label: 'LinkedIn',
|
||||
value: `https://www.linkedin.com/company/${faker.helpers.slugify(faker.company.name())}`,
|
||||
iconId: 'ri:linkedin-box-line',
|
||||
info: faker.lorem.sentence(),
|
||||
},
|
||||
] as const satisfies Partial<Prisma.ServiceContactMethodCreateInput>[]
|
||||
|
||||
|
||||
@@ -151,15 +151,10 @@ export const accountActions = {
|
||||
permissions: 'user',
|
||||
input: z.object({
|
||||
id: z.coerce.number().int().positive(),
|
||||
displayName: z.string().max(100, 'Display name must be 100 characters or less').optional().nullable(),
|
||||
link: z
|
||||
.string()
|
||||
.url('Must be a valid URL')
|
||||
.max(255, 'URL must be 255 characters or less')
|
||||
.optional()
|
||||
.nullable(),
|
||||
displayName: z.string().max(100, 'Display name must be 100 characters or less').nullable(),
|
||||
link: z.string().url('Must be a valid URL').max(255, 'URL must be 255 characters or less').nullable(),
|
||||
pictureFile: imageFileSchema,
|
||||
removePicture: z.coerce.boolean().default(false),
|
||||
removePicture: z.coerce.boolean(),
|
||||
}),
|
||||
handler: async (input, context) => {
|
||||
if (input.id !== context.locals.user.id) {
|
||||
@@ -170,7 +165,7 @@ export const accountActions = {
|
||||
}
|
||||
|
||||
if (
|
||||
input.displayName !== undefined &&
|
||||
input.displayName !== null &&
|
||||
input.displayName !== context.locals.user.displayName &&
|
||||
!context.locals.user.karmaUnlocks.displayName
|
||||
) {
|
||||
@@ -181,7 +176,7 @@ export const accountActions = {
|
||||
}
|
||||
|
||||
if (
|
||||
input.link !== undefined &&
|
||||
input.link !== null &&
|
||||
input.link !== context.locals.user.link &&
|
||||
!context.locals.user.karmaUnlocks.websiteLink
|
||||
) {
|
||||
@@ -198,6 +193,13 @@ export const accountActions = {
|
||||
})
|
||||
}
|
||||
|
||||
if (input.removePicture && !context.locals.user.karmaUnlocks.profilePicture) {
|
||||
throw new ActionError({
|
||||
code: 'FORBIDDEN',
|
||||
message: makeKarmaUnlockMessage(karmaUnlocksById.profilePicture),
|
||||
})
|
||||
}
|
||||
|
||||
const pictureUrl =
|
||||
input.pictureFile && input.pictureFile.size > 0
|
||||
? await saveFileLocally(
|
||||
@@ -210,9 +212,13 @@ export const accountActions = {
|
||||
const user = await prisma.user.update({
|
||||
where: { id: context.locals.user.id },
|
||||
data: {
|
||||
displayName: input.displayName ?? null,
|
||||
link: input.link ?? null,
|
||||
picture: input.removePicture ? null : (pictureUrl ?? undefined),
|
||||
displayName: context.locals.user.karmaUnlocks.displayName ? (input.displayName ?? null) : undefined,
|
||||
link: context.locals.user.karmaUnlocks.websiteLink ? (input.link ?? null) : undefined,
|
||||
picture: context.locals.user.karmaUnlocks.profilePicture
|
||||
? input.removePicture
|
||||
? null
|
||||
: (pictureUrl ?? undefined)
|
||||
: undefined,
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ import {
|
||||
} from '../../lib/zodUtils'
|
||||
|
||||
const serviceSchemaBase = z.object({
|
||||
id: z.number(),
|
||||
id: z.number().int().positive(),
|
||||
slug: z
|
||||
.string()
|
||||
.regex(/^[a-z0-9-]+$/, 'Allowed characters: lowercase letters, numbers, and hyphens')
|
||||
@@ -56,15 +56,6 @@ const addSlugIfMissing = <
|
||||
}),
|
||||
})
|
||||
|
||||
const contactMethodSchema = z.object({
|
||||
id: z.number().optional(),
|
||||
label: z.string().min(1).max(50),
|
||||
value: z.string().min(1).max(200),
|
||||
iconId: z.string().min(1).max(50),
|
||||
info: z.string().max(200).optional().default(''),
|
||||
serviceId: z.number(),
|
||||
})
|
||||
|
||||
export const adminServiceActions = {
|
||||
create: defineProtectedAction({
|
||||
accept: 'form',
|
||||
@@ -195,7 +186,11 @@ export const adminServiceActions = {
|
||||
createContactMethod: defineProtectedAction({
|
||||
accept: 'form',
|
||||
permissions: 'admin',
|
||||
input: contactMethodSchema.omit({ id: true }),
|
||||
input: z.object({
|
||||
label: z.string().min(1).max(50).optional(),
|
||||
value: z.string().url(),
|
||||
serviceId: z.number().int().positive(),
|
||||
}),
|
||||
handler: async (input) => {
|
||||
const contactMethod = await prisma.serviceContactMethod.create({
|
||||
data: input,
|
||||
@@ -207,7 +202,12 @@ export const adminServiceActions = {
|
||||
updateContactMethod: defineProtectedAction({
|
||||
accept: 'form',
|
||||
permissions: 'admin',
|
||||
input: contactMethodSchema,
|
||||
input: z.object({
|
||||
id: z.number().int().positive().optional(),
|
||||
label: z.string().min(1).max(50).optional(),
|
||||
value: z.string().url(),
|
||||
serviceId: z.number().int().positive(),
|
||||
}),
|
||||
handler: async (input) => {
|
||||
const { id, ...data } = input
|
||||
const contactMethod = await prisma.serviceContactMethod.update({
|
||||
@@ -222,7 +222,7 @@ export const adminServiceActions = {
|
||||
accept: 'form',
|
||||
permissions: 'admin',
|
||||
input: z.object({
|
||||
id: z.number(),
|
||||
id: z.number().int().positive(),
|
||||
}),
|
||||
handler: async (input) => {
|
||||
await prisma.serviceContactMethod.delete({
|
||||
|
||||
@@ -14,9 +14,9 @@ import { timeTrapSecretKey } from '../lib/timeTrapSecret'
|
||||
|
||||
import type { CommentStatus, Prisma } from '@prisma/client'
|
||||
|
||||
const COMMENT_RATE_LIMIT_WINDOW_MINUTES = 5
|
||||
const COMMENT_RATE_LIMIT_WINDOW_MINUTES = 2
|
||||
const MAX_COMMENTS_PER_WINDOW = 1
|
||||
const MAX_COMMENTS_PER_WINDOW_VERIFIED_USER = 5
|
||||
const MAX_COMMENTS_PER_WINDOW_VERIFIED_USER = 10
|
||||
|
||||
export const commentActions = {
|
||||
vote: defineProtectedAction({
|
||||
|
||||
@@ -31,6 +31,7 @@ export const notificationActions = {
|
||||
enableOnMyCommentStatusChange: z.coerce.boolean().optional(),
|
||||
enableAutowatchMyComments: z.coerce.boolean().optional(),
|
||||
enableNotifyPendingRepliesOnWatch: z.coerce.boolean().optional(),
|
||||
karmaNotificationThreshold: z.coerce.number().int().min(1).optional(),
|
||||
}),
|
||||
handler: async (input, context) => {
|
||||
await prisma.notificationPreferences.upsert({
|
||||
@@ -39,12 +40,14 @@ export const notificationActions = {
|
||||
enableOnMyCommentStatusChange: input.enableOnMyCommentStatusChange,
|
||||
enableAutowatchMyComments: input.enableAutowatchMyComments,
|
||||
enableNotifyPendingRepliesOnWatch: input.enableNotifyPendingRepliesOnWatch,
|
||||
karmaNotificationThreshold: input.karmaNotificationThreshold,
|
||||
},
|
||||
create: {
|
||||
userId: context.locals.user.id,
|
||||
enableOnMyCommentStatusChange: input.enableOnMyCommentStatusChange,
|
||||
enableAutowatchMyComments: input.enableAutowatchMyComments,
|
||||
enableNotifyPendingRepliesOnWatch: input.enableNotifyPendingRepliesOnWatch,
|
||||
karmaNotificationThreshold: input.karmaNotificationThreshold,
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
@@ -70,7 +70,7 @@ const Tag = announcement.link ? 'a' : 'div'
|
||||
<Icon name={typeInfo.icon} class={cn('size-5 flex-shrink-0')} />
|
||||
<span
|
||||
class={cn(
|
||||
'font-title line-clamp-3 bg-[linear-gradient(90deg,var(--gradient-edge,#FFEBF9)_0%,var(--gradient-center,#8a56cc)_50%,var(--gradient-edge,#FFEBF9)_100%)] bg-clip-text text-sm leading-tight text-pretty text-transparent [&_a]:underline',
|
||||
'font-title animate-text-gradient line-clamp-3 bg-[linear-gradient(90deg,var(--gradient-edge,#FFEBF9)_0%,var(--gradient-center,#8a56cc)_50%,var(--gradient-edge,#FFEBF9)_100%)] bg-size-[200%] bg-clip-text text-sm leading-tight text-pretty text-transparent [&_a]:underline',
|
||||
typeInfo.classNames.content
|
||||
)}
|
||||
>
|
||||
|
||||
@@ -19,6 +19,7 @@ type Props<Tag extends 'a' | 'button' | 'label' = 'button'> = Polymorphic<
|
||||
dataAstroReload?: boolean
|
||||
children?: never
|
||||
disabled?: boolean
|
||||
inlineIcon?: boolean
|
||||
}
|
||||
>
|
||||
|
||||
@@ -26,7 +27,7 @@ export type ButtonProps<Tag extends 'a' | 'button' | 'label' = 'button'> = Props
|
||||
|
||||
const button = tv({
|
||||
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',
|
||||
label: 'text-left whitespace-nowrap',
|
||||
endIcon: 'size-4 shrink-0',
|
||||
@@ -51,6 +52,11 @@ const button = tv({
|
||||
label: 'font-bold tracking-wider uppercase',
|
||||
},
|
||||
},
|
||||
iconOnly: {
|
||||
true: {
|
||||
base: 'p-0',
|
||||
},
|
||||
},
|
||||
color: {
|
||||
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',
|
||||
@@ -121,12 +127,28 @@ const button = tv({
|
||||
shadow: true,
|
||||
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: {
|
||||
size: 'md',
|
||||
color: 'black',
|
||||
shadow: false,
|
||||
disabled: false,
|
||||
iconOnly: false,
|
||||
},
|
||||
})
|
||||
|
||||
@@ -143,6 +165,7 @@ const {
|
||||
role,
|
||||
dataAstroReload,
|
||||
disabled,
|
||||
inlineIcon,
|
||||
...htmlProps
|
||||
} = Astro.props
|
||||
|
||||
@@ -151,7 +174,7 @@ const {
|
||||
icon: iconSlot,
|
||||
label: labelSlot,
|
||||
endIcon: endIconSlot,
|
||||
} = button({ size, color, shadow, disabled })
|
||||
} = button({ size, color, shadow, disabled, iconOnly: !label && !(!!icon && !!endIcon) })
|
||||
|
||||
const ActualTag = disabled && Tag === 'a' ? 'span' : Tag
|
||||
---
|
||||
@@ -164,11 +187,11 @@ const ActualTag = disabled && Tag === 'a' ? 'span' : Tag
|
||||
{...dataAstroReload && { 'data-astro-reload': dataAstroReload }}
|
||||
{...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>}
|
||||
{
|
||||
!!endIcon && (
|
||||
<Icon name={endIcon} class={endIconSlot({ class: classNames?.endIcon })}>
|
||||
<Icon name={endIcon} class={endIconSlot({ class: classNames?.endIcon })} is:inline={inlineIcon}>
|
||||
{endIcon}
|
||||
</Icon>
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { cn } from '../lib/cn'
|
||||
import { formatDateShort } from '../lib/timeAgo'
|
||||
|
||||
import MyPicture from './MyPicture.astro'
|
||||
import UserBadge from './UserBadge.astro'
|
||||
|
||||
import type { Prisma } from '@prisma/client'
|
||||
import type { HTMLAttributes } from 'astro/types'
|
||||
@@ -15,6 +15,7 @@ export type ChatMessage = {
|
||||
select: {
|
||||
id: true
|
||||
name: true
|
||||
displayName: true
|
||||
picture: true
|
||||
}
|
||||
}>
|
||||
@@ -71,31 +72,19 @@ const { messages, userId, class: className, ...htmlProps } = Astro.props
|
||||
)}
|
||||
>
|
||||
{!isCurrentUser && !isNextFromSameUser && (
|
||||
<p class="text-day-500 mb-0.5 text-xs">
|
||||
{!!message.user.picture && (
|
||||
<MyPicture
|
||||
src={message.user.picture}
|
||||
height={16}
|
||||
width={16}
|
||||
class="inline-block rounded-full align-[-0.33em]"
|
||||
alt=""
|
||||
/>
|
||||
)}
|
||||
{message.user.name}
|
||||
</p>
|
||||
<UserBadge user={message.user} size="sm" class="text-day-500 mb-0.5 text-xs" />
|
||||
)}
|
||||
<p
|
||||
class={cn(
|
||||
'rounded-xl p-3 text-sm whitespace-pre-wrap',
|
||||
'rounded-xl p-3 text-sm wrap-anywhere whitespace-pre-wrap',
|
||||
isCurrentUser ? 'bg-blue-900 text-white' : 'bg-night-500 text-day-300',
|
||||
isCurrentUser ? 'rounded-br-xs' : 'rounded-bl-xs',
|
||||
isCurrentUser && isNextFromSameUser && isNextSameDate && 'rounded-tr-xs',
|
||||
!isCurrentUser && isNextFromSameUser && isNextSameDate && 'rounded-tl-xs'
|
||||
)}
|
||||
id={`message-${message.id.toString()}`}
|
||||
>
|
||||
{message.content}
|
||||
</p>
|
||||
set:text={message.content}
|
||||
/>
|
||||
{(!isPrevFromSameUser || !isPrevSameDate) && (
|
||||
<p class="text-day-500 mt-0.5 mb-2 text-xs">{message.formattedCreatedAt}</p>
|
||||
)}
|
||||
|
||||
@@ -4,6 +4,7 @@ import { Markdown } from 'astro-remote'
|
||||
import { Schema } from 'astro-seo-schema'
|
||||
import { actions } from 'astro:actions'
|
||||
|
||||
import { commentStatusById } from '../constants/commentStatus'
|
||||
import { karmaUnlocksById } from '../constants/karmaUnlocks'
|
||||
import { getServiceUserRoleInfo } from '../constants/serviceUserRoles'
|
||||
import { cn } from '../lib/cn'
|
||||
@@ -18,9 +19,9 @@ import { formatDateShort } from '../lib/timeAgo'
|
||||
import BadgeSmall from './BadgeSmall.astro'
|
||||
import CommentModeration from './CommentModeration.astro'
|
||||
import CommentReply from './CommentReply.astro'
|
||||
import MyPicture from './MyPicture.astro'
|
||||
import TimeFormatted from './TimeFormatted.astro'
|
||||
import Tooltip from './Tooltip.astro'
|
||||
import UserBadge from './UserBadge.astro'
|
||||
|
||||
import type { HTMLAttributes } from 'astro/types'
|
||||
|
||||
@@ -156,27 +157,11 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
|
||||
</label>
|
||||
|
||||
<span class="flex items-center gap-1">
|
||||
{
|
||||
comment.author.picture && (
|
||||
<MyPicture
|
||||
src={comment.author.picture}
|
||||
alt={`Profile for ${comment.author.displayName ?? comment.author.name}`}
|
||||
class="size-6 rounded-full bg-zinc-700 object-cover"
|
||||
height={24}
|
||||
width={24}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
<a
|
||||
href={`/u/${comment.author.name}`}
|
||||
class={cn([
|
||||
'font-title text-day-300 font-medium hover:underline focus-visible:underline',
|
||||
isAuthor && 'font-medium text-green-500',
|
||||
])}
|
||||
>
|
||||
{comment.author.displayName ?? comment.author.name}
|
||||
</a>
|
||||
<UserBadge
|
||||
user={comment.author}
|
||||
size="md"
|
||||
class={cn('text-day-300', isAuthor && 'font-medium text-green-500')}
|
||||
/>
|
||||
|
||||
{
|
||||
(comment.author.verified || comment.author.admin || comment.author.verifier) && (
|
||||
@@ -307,20 +292,35 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
|
||||
|
||||
{
|
||||
comment.status === 'VERIFIED' && (
|
||||
<BadgeSmall icon="ri:check-double-fill" color="green" text="Verified" inlineIcon />
|
||||
<BadgeSmall
|
||||
icon={commentStatusById.VERIFIED.icon}
|
||||
color={commentStatusById.VERIFIED.color}
|
||||
text={commentStatusById.VERIFIED.label}
|
||||
inlineIcon
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
{
|
||||
(comment.status === 'PENDING' || comment.status === 'HUMAN_PENDING') &&
|
||||
(showPending || isHighlightParent || isAuthorOrPrivileged) && (
|
||||
<BadgeSmall icon="ri:time-fill" color="yellow" text="Unmoderated" inlineIcon />
|
||||
<BadgeSmall
|
||||
icon={commentStatusById.PENDING.icon}
|
||||
color={commentStatusById.PENDING.color}
|
||||
text={commentStatusById.PENDING.label}
|
||||
inlineIcon
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
{
|
||||
comment.status === 'REJECTED' && isAuthorOrPrivileged && (
|
||||
<BadgeSmall icon="ri:close-circle-fill" color="red" text="Rejected" inlineIcon />
|
||||
<BadgeSmall
|
||||
icon={commentStatusById.REJECTED.icon}
|
||||
color={commentStatusById.REJECTED.color}
|
||||
text={commentStatusById.REJECTED.label}
|
||||
inlineIcon
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -371,8 +371,9 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
|
||||
comment.communityNote && (
|
||||
<div class="mt-2 peer-checked/collapse:hidden">
|
||||
<div class="border-l-2 border-zinc-600 bg-zinc-900/30 py-0.5 pl-2 text-xs">
|
||||
<span class="font-medium text-zinc-400">Added context:</span>
|
||||
<span class="text-zinc-300">{comment.communityNote}</span>
|
||||
<span class="prose prose-sm prose-invert prose-strong:text-zinc-300/90 text-xs text-zinc-300">
|
||||
<Markdown content={`**Added context:** ${comment.communityNote}`} />
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -110,16 +110,18 @@ if (!user || !user.admin || !user.verifier) return null
|
||||
<button
|
||||
class={cn(
|
||||
'rounded-sm px-1.5 py-0.5 text-xs transition-colors',
|
||||
comment.status === 'PENDING'
|
||||
comment.status === 'PENDING' || comment.status === 'HUMAN_PENDING'
|
||||
? 'border border-blue-500/30 bg-blue-500/20 text-blue-400'
|
||||
: 'bg-night-700 hover:bg-blue-500/20 hover:text-blue-400'
|
||||
)}
|
||||
data-action="status"
|
||||
data-value={comment.status === 'PENDING' ? 'APPROVED' : 'PENDING'}
|
||||
data-value={comment.status === 'PENDING' || comment.status === 'HUMAN_PENDING'
|
||||
? 'APPROVED'
|
||||
: 'PENDING'}
|
||||
data-comment-id={comment.id}
|
||||
data-user-id={user.id}
|
||||
>
|
||||
{comment.status === 'PENDING' ? 'Approve' : 'Pending'}
|
||||
{comment.status === 'PENDING' || comment.status === 'HUMAN_PENDING' ? 'Approve' : 'Pending'}
|
||||
</button>
|
||||
|
||||
<button
|
||||
|
||||
@@ -11,6 +11,7 @@ import InputHoneypotTrap from './InputHoneypotTrap.astro'
|
||||
import InputRating from './InputRating.astro'
|
||||
import InputText from './InputText.astro'
|
||||
import InputWrapper from './InputWrapper.astro'
|
||||
import UserBadge from './UserBadge.astro'
|
||||
|
||||
import type { Prisma } from '@prisma/client'
|
||||
import type { HTMLAttributes } from 'astro/types'
|
||||
@@ -67,7 +68,7 @@ const userCommentsDisabled = user ? user.karmaUnlocks.commentsDisabled : false
|
||||
<div class="text-day-400 flex items-center gap-2 text-xs peer-checked/use-form-secret-token:hidden">
|
||||
<Icon name="ri:user-line" class="size-3.5" />
|
||||
<span>
|
||||
Commenting as: <span class="font-title font-medium text-green-400">{user.name}</span>
|
||||
Commenting as: <UserBadge user={user} size="sm" class="text-green-400" />
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import HeaderNotificationIndicator from './HeaderNotificationIndicator.astro'
|
||||
import HeaderSplashTextScript from './HeaderSplashTextScript.astro'
|
||||
import Logo from './Logo.astro'
|
||||
import Tooltip from './Tooltip.astro'
|
||||
import UserBadge from './UserBadge.astro'
|
||||
|
||||
const user = Astro.locals.user
|
||||
const actualUser = Astro.locals.actualUser
|
||||
@@ -118,7 +119,7 @@ const splashText = showSplashText ? sample(splashTexts) : null
|
||||
<Tooltip
|
||||
as="a"
|
||||
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"
|
||||
text="Admin Dashboard"
|
||||
position="left"
|
||||
@@ -131,9 +132,12 @@ const splashText = showSplashText ? sample(splashTexts) : null
|
||||
user ? (
|
||||
<>
|
||||
{actualUser && (
|
||||
<span class="text-sm text-white/40 hover:text-white" transition:name="header-actual-user-name">
|
||||
({actualUser.name})
|
||||
</span>
|
||||
<UserBadge
|
||||
user={actualUser}
|
||||
size="sm"
|
||||
class="text-white/40 hover:text-white"
|
||||
transition:name="header-actual-user-name"
|
||||
/>
|
||||
)}
|
||||
|
||||
<HeaderNotificationIndicator
|
||||
@@ -141,13 +145,17 @@ const splashText = showSplashText ? sample(splashTexts) : null
|
||||
transition:name="header-notification-indicator"
|
||||
/>
|
||||
|
||||
<a
|
||||
<UserBadge
|
||||
href="/account"
|
||||
class="xs:px-3 2xs:px-2 last:xs:-mr-3 last:2xs:-mr-2 flex h-full items-center px-1 text-sm text-zinc-400 transition-colors last:-mr-1 hover:text-zinc-300"
|
||||
user={user}
|
||||
size="md"
|
||||
class="xs:px-3 2xs:px-2 last:xs:-mr-3 last:2xs:-mr-2 h-full px-1 text-zinc-400 transition-colors last:-mr-1 hover:text-zinc-300"
|
||||
classNames={{
|
||||
image: 'max-2xs:hidden',
|
||||
}}
|
||||
transition:name="header-user-link"
|
||||
>
|
||||
{user.name}
|
||||
</a>
|
||||
/>
|
||||
|
||||
{actualUser ? (
|
||||
<a
|
||||
href={makeUnimpersonateUrl(Astro.url)}
|
||||
|
||||
@@ -25,8 +25,19 @@ const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
|
||||
<InputWrapper inputId={inputId} {...wrapperProps}>
|
||||
{
|
||||
!!removeCheckbox && (
|
||||
<label class="flex cursor-pointer items-center gap-2 py-1 pl-1 text-sm leading-none">
|
||||
<input transition:persist type="checkbox" name={removeCheckbox.name} data-remove-checkbox />
|
||||
<label
|
||||
class={cn(
|
||||
'flex cursor-pointer items-center gap-2 py-1 pl-1 text-sm leading-none',
|
||||
disabled && 'cursor-not-allowed opacity-50'
|
||||
)}
|
||||
>
|
||||
<input
|
||||
transition:persist
|
||||
type="checkbox"
|
||||
name={removeCheckbox.name}
|
||||
data-remove-checkbox
|
||||
disabled={disabled}
|
||||
/>
|
||||
{removeCheckbox.label || 'Remove'}
|
||||
</label>
|
||||
)
|
||||
|
||||
@@ -10,7 +10,9 @@ import InputWrapper from './InputWrapper.astro'
|
||||
import type { ComponentProps, HTMLAttributes } from 'astro/types'
|
||||
|
||||
type Props = Omit<ComponentProps<typeof InputWrapper>, 'children' | 'inputId' | 'required'> & {
|
||||
inputProps?: Omit<HTMLAttributes<'input'>, 'name'>
|
||||
inputProps?: Omit<HTMLAttributes<'input'>, 'name'> & {
|
||||
'transition:persist'?: boolean
|
||||
}
|
||||
inputIcon?: string
|
||||
inputIconClass?: string
|
||||
}
|
||||
@@ -26,7 +28,7 @@ const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
|
||||
inputIcon ? (
|
||||
<div class="relative">
|
||||
<input
|
||||
transition:persist
|
||||
transition:persist={inputProps?.['transition:persist'] === false ? undefined : true}
|
||||
{...omit(inputProps, ['class', 'id', 'name'])}
|
||||
id={inputId}
|
||||
class={cn(
|
||||
|
||||
@@ -31,6 +31,7 @@ const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
|
||||
hasError && baseInputClassNames.error,
|
||||
!!inputProps?.disabled && baseInputClassNames.disabled
|
||||
)}
|
||||
name={wrapperProps.name}>{value}</textarea
|
||||
>
|
||||
name={wrapperProps.name}
|
||||
set:text={value}
|
||||
/>
|
||||
</InputWrapper>
|
||||
|
||||
@@ -18,6 +18,7 @@ type Props = HTMLAttributes<'div'> & {
|
||||
error?: string[] | string
|
||||
icon?: string
|
||||
inputId?: string
|
||||
hideLabel?: boolean
|
||||
}
|
||||
|
||||
const {
|
||||
@@ -30,6 +31,7 @@ const {
|
||||
icon,
|
||||
class: className,
|
||||
inputId,
|
||||
hideLabel,
|
||||
...htmlProps
|
||||
} = Astro.props
|
||||
|
||||
@@ -37,17 +39,20 @@ const hasError = !!error && error.length > 0
|
||||
---
|
||||
|
||||
<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')}>
|
||||
{icon && <Icon name={icon} class="inline-block size-4 align-[-0.2em]" />}
|
||||
<label for={inputId}>{label}</label>{required && '*'}
|
||||
</legend>
|
||||
{
|
||||
!!descriptionLabel && (
|
||||
<span class="text-day-400 flex-1 basis-24 text-xs text-pretty">{descriptionLabel}</span>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
{
|
||||
!hideLabel && (
|
||||
<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')}>
|
||||
{icon && <Icon name={icon} class="inline-block size-4 align-[-0.2em]" />}
|
||||
<label for={inputId}>{label}</label>
|
||||
{required && '*'}
|
||||
</legend>
|
||||
{!!descriptionLabel && (
|
||||
<span class="text-day-400 flex-1 basis-24 text-xs text-pretty">{descriptionLabel}</span>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
<slot />
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import type { ComponentProps } from 'react'
|
||||
import { Picture } from 'astro:assets'
|
||||
|
||||
import defaultServiceImage from '../assets/fallback-service-image.jpg'
|
||||
import { cn } from '../lib/cn'
|
||||
|
||||
const fallbackImages = {
|
||||
service: defaultServiceImage,
|
||||
@@ -20,6 +21,7 @@ const {
|
||||
fallback = undefined as keyof typeof fallbackImages | undefined,
|
||||
height,
|
||||
width,
|
||||
pictureAttributes,
|
||||
...props
|
||||
} = Astro.props
|
||||
|
||||
@@ -36,6 +38,10 @@ const fallbackImage = fallback ? fallbackImages[fallback] : undefined
|
||||
formats={formats}
|
||||
height={height ? Number(height) * 2 : undefined}
|
||||
width={width ? Number(width) * 2 : undefined}
|
||||
pictureAttributes={{
|
||||
...pictureAttributes,
|
||||
class: cn('shrink-0', pictureAttributes?.class),
|
||||
}}
|
||||
{...(props as any)}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -9,10 +9,11 @@ type Props = HTMLAttributes<'div'> & {
|
||||
value: HTMLAttributes<'input'>['value']
|
||||
label: string
|
||||
}[]
|
||||
inputProps?: Omit<HTMLAttributes<'input'>, 'checked' | 'class' | 'name' | 'type' | 'value'>
|
||||
selectedValue?: string | null
|
||||
}
|
||||
|
||||
const { name, options, selectedValue, class: className, ...rest } = Astro.props
|
||||
const { name, options, selectedValue, inputProps, class: className, ...rest } = Astro.props
|
||||
---
|
||||
|
||||
<div
|
||||
@@ -31,6 +32,7 @@ const { name, options, selectedValue, class: className, ...rest } = Astro.props
|
||||
value={option.value}
|
||||
checked={selectedValue === option.value}
|
||||
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">
|
||||
{option.label}
|
||||
|
||||
@@ -88,12 +88,26 @@ const overallScoreInfo = makeOverallScoreInfo(overallScore)
|
||||
<h3 class="font-title text-lg leading-none font-medium tracking-wide text-white">
|
||||
{name}{
|
||||
statusIcon && (
|
||||
<Tooltip text={statusIcon.label} position="right" class="-my-2 shrink-0">
|
||||
<Icon
|
||||
is:inline={inlineIcons}
|
||||
name={statusIcon.icon}
|
||||
class={cn('inline-block size-6 shrink-0 rounded-lg p-1', statusIcon.classNames.icon)}
|
||||
/>
|
||||
<Tooltip
|
||||
text={statusIcon.label}
|
||||
position="right"
|
||||
class="-my-2 shrink-0 whitespace-nowrap"
|
||||
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>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -34,7 +34,8 @@ const {
|
||||
<form
|
||||
method="GET"
|
||||
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-select={`#${searchResultsId}`}
|
||||
hx-push-url="true"
|
||||
@@ -44,7 +45,11 @@ const {
|
||||
.filter((verification) => verification.default)
|
||||
.map((verification) => verification.slug)}
|
||||
{...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">
|
||||
<h2 class="font-title text-xl text-green-500">FILTERS</h2>
|
||||
@@ -64,6 +69,7 @@ const {
|
||||
name="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"
|
||||
data-trigger-on-change
|
||||
>
|
||||
{
|
||||
options.sort.map((option) => (
|
||||
@@ -108,6 +114,7 @@ const {
|
||||
name="categories"
|
||||
value={category.slug}
|
||||
checked={category.checked}
|
||||
data-trigger-on-change
|
||||
/>
|
||||
<span class="peer-checked:font-bold">
|
||||
{category.name}
|
||||
@@ -121,13 +128,7 @@ const {
|
||||
{
|
||||
options.categories.filter((category) => category.showAlways).length < options.categories.length && (
|
||||
<>
|
||||
<input
|
||||
type="checkbox"
|
||||
id="show-more-categories"
|
||||
class="peer sr-only"
|
||||
hx-preserve
|
||||
data-show-more-input
|
||||
/>
|
||||
<input type="checkbox" id="show-more-categories" class="peer sr-only" hx-preserve />
|
||||
<label
|
||||
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"
|
||||
@@ -158,6 +159,7 @@ const {
|
||||
name="verification"
|
||||
value={verification.slug}
|
||||
checked={filters.verification.includes(verification.value)}
|
||||
data-trigger-on-change
|
||||
/>
|
||||
<Icon name={verification.icon} class={cn('size-4', verification.classNames.icon)} />
|
||||
<span class="peer-checked:font-bold">{verification.labelShort}</span>
|
||||
@@ -176,6 +178,9 @@ const {
|
||||
options={options.modeOptions}
|
||||
selectedValue={filters['currency-mode']}
|
||||
class="-my-2"
|
||||
inputProps={{
|
||||
'data-trigger-on-change': true,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
@@ -188,6 +193,7 @@ const {
|
||||
name="currencies"
|
||||
value={currency.slug}
|
||||
checked={filters.currencies?.some((id) => id === currency.id)}
|
||||
data-trigger-on-change
|
||||
/>
|
||||
<Icon name={currency.icon} class="size-4" />
|
||||
<span class="peer-checked:font-bold">{currency.name}</span>
|
||||
@@ -210,6 +216,7 @@ const {
|
||||
name="networks"
|
||||
value={network.slug}
|
||||
checked={filters.networks?.some((slug) => slug === network.slug)}
|
||||
data-trigger-on-change
|
||||
/>
|
||||
<Icon name={network.icon} class="size-4" />
|
||||
<span class="peer-checked:font-bold">{network.name}</span>
|
||||
@@ -233,6 +240,7 @@ const {
|
||||
id="max-kyc"
|
||||
value={filters['max-kyc'] ?? 4}
|
||||
class="w-full accent-green-500"
|
||||
data-trigger-on-change
|
||||
/>
|
||||
</div>
|
||||
<div class="text-day-400 mt-1 flex justify-between px-1 text-xs">
|
||||
@@ -261,6 +269,7 @@ const {
|
||||
id="user-rating"
|
||||
value={filters['user-rating']}
|
||||
class="w-full accent-green-500"
|
||||
data-trigger-on-change
|
||||
/>
|
||||
</div>
|
||||
<div class="text-day-400 mt-1 flex justify-between px-2 text-xs">
|
||||
@@ -289,12 +298,22 @@ const {
|
||||
options={options.modeOptions}
|
||||
selectedValue={filters['attribute-mode']}
|
||||
class="-my-2"
|
||||
inputProps={{
|
||||
'data-trigger-on-change': true,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{
|
||||
options.attributesByCategory.map(({ category, attributes }) => (
|
||||
options.attributesByCategory.map(({ categoryInfo, attributes }) => (
|
||||
<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">
|
||||
{attributes.map((attribute) => {
|
||||
@@ -318,6 +337,7 @@ const {
|
||||
value=""
|
||||
checked={!attribute.value}
|
||||
aria-label="Ignore"
|
||||
data-trigger-on-change
|
||||
/>
|
||||
<input
|
||||
type="radio"
|
||||
@@ -327,6 +347,7 @@ const {
|
||||
class="peer/yes sr-only"
|
||||
checked={attribute.value === 'yes'}
|
||||
aria-label="Include"
|
||||
data-trigger-on-change
|
||||
/>
|
||||
<input
|
||||
type="radio"
|
||||
@@ -336,6 +357,7 @@ const {
|
||||
class="peer/no sr-only"
|
||||
checked={attribute.value === 'no'}
|
||||
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" />
|
||||
@@ -356,11 +378,9 @@ const {
|
||||
</label>
|
||||
|
||||
<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"
|
||||
>
|
||||
<span class="bg-night-400 border-night-600 block h-full w-px border-y-2" />
|
||||
</span>
|
||||
/>
|
||||
|
||||
<label
|
||||
for={noId}
|
||||
@@ -383,8 +403,8 @@ const {
|
||||
aria-hidden="true"
|
||||
>
|
||||
<Icon
|
||||
name={attribute.info.icon}
|
||||
class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.info.classNames.icon)}
|
||||
name={attribute.typeInfo.icon}
|
||||
class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.typeInfo.classNames.icon)}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
<span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
|
||||
@@ -398,8 +418,8 @@ const {
|
||||
aria-hidden="true"
|
||||
>
|
||||
<Icon
|
||||
name={attribute.info.icon}
|
||||
class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.info.classNames.icon)}
|
||||
name={attribute.typeInfo.icon}
|
||||
class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.typeInfo.classNames.icon)}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
<span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
|
||||
@@ -417,19 +437,18 @@ const {
|
||||
<>
|
||||
<input
|
||||
type="checkbox"
|
||||
id={`show-more-attributes-${category}`}
|
||||
id={`show-more-attributes-${categoryInfo.slug}`}
|
||||
class="peer sr-only"
|
||||
hx-preserve
|
||||
data-show-more-input
|
||||
/>
|
||||
<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"
|
||||
>
|
||||
+ Show more
|
||||
</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"
|
||||
>
|
||||
- Show less
|
||||
@@ -455,6 +474,7 @@ const {
|
||||
id="min-score"
|
||||
value={filters['min-score']}
|
||||
class="w-full accent-green-500"
|
||||
data-trigger-on-change
|
||||
/>
|
||||
</div>
|
||||
<div class="-mx-1.5 mt-2 flex justify-between px-1">
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
---
|
||||
import { Icon } from 'astro-icon/components'
|
||||
import { uniq } from 'lodash-es'
|
||||
|
||||
import { verificationStatusesByValue } from '../constants/verificationStatus'
|
||||
import { cn } from '../lib/cn'
|
||||
import { pluralize } from '../lib/pluralize'
|
||||
import { createPageUrl } from '../lib/urls'
|
||||
import { createPageUrl, urlWithParams } from '../lib/urls'
|
||||
|
||||
import Button from './Button.astro'
|
||||
import ServiceCard from './ServiceCard.astro'
|
||||
@@ -19,7 +21,9 @@ type Props = HTMLAttributes<'div'> & {
|
||||
pageSize: number
|
||||
sortSeed?: string
|
||||
filters: ServicesFiltersObject
|
||||
hadToIncludeCommunityContributed: boolean
|
||||
includeScams: boolean
|
||||
countCommunityOnly: number | null
|
||||
inlineIcons?: boolean
|
||||
}
|
||||
|
||||
const {
|
||||
@@ -31,89 +35,184 @@ const {
|
||||
sortSeed,
|
||||
class: className,
|
||||
filters,
|
||||
hadToIncludeCommunityContributed,
|
||||
includeScams,
|
||||
countCommunityOnly,
|
||||
inlineIcons,
|
||||
...divProps
|
||||
} = Astro.props
|
||||
|
||||
const hasScams = filters.verification.includes('VERIFICATION_FAILED')
|
||||
const hasCommunityContributed =
|
||||
const hasScams =
|
||||
// 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 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 class="mb-6 flex items-center justify-between">
|
||||
<span class="text-day-500 text-sm">
|
||||
<div class="flex items-center justify-between">
|
||||
<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()}
|
||||
{pluralize('result', total)}
|
||||
|
||||
<span
|
||||
<Icon
|
||||
name="ri:loader-4-line"
|
||||
id="search-indicator"
|
||||
class="htmx-request:opacity-100 text-white opacity-0 transition-opacity duration-500"
|
||||
>
|
||||
<Icon name="ri:loader-4-line" class="inline-block size-4 animate-spin" />
|
||||
Loading...
|
||||
</span>
|
||||
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}
|
||||
/>
|
||||
|
||||
{
|
||||
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>
|
||||
<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>
|
||||
|
||||
{
|
||||
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">
|
||||
<Icon name="ri:alert-fill" class="-mr-1 inline-block size-4 text-red-500" />
|
||||
<Icon name="ri:question-line" class="mr-2 inline-block size-4 text-yellow-500" />
|
||||
Showing SCAM and unverified community-contributed services.
|
||||
{hadToIncludeCommunityContributed && 'Because there were no other results.'}
|
||||
<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="inline-block size-4 shrink-0 align-[-0.2em] text-red-500"
|
||||
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>
|
||||
)
|
||||
}
|
||||
|
||||
{
|
||||
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">
|
||||
<Icon name="ri:alert-fill" class="mr-2 inline-block size-4 text-red-500" />
|
||||
Showing SCAM services!
|
||||
<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 shrink-0 align-[-0.2em] text-red-500"
|
||||
is:inline={inlineIcons}
|
||||
/>
|
||||
Results {hasSomeScam ? 'include' : 'may include'} SCAM services
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
{
|
||||
!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">
|
||||
<Icon name="ri:question-line" class="mr-2 inline-block size-4" />
|
||||
|
||||
{hadToIncludeCommunityContributed
|
||||
? 'Showing unverified community-contributed services, because there were no other results. Some might be scams.'
|
||||
: 'Showing unverified community-contributed services, some might be scams.'}
|
||||
<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-1 inline-block size-4 shrink-0 align-[-0.2em] text-yellow-400"
|
||||
is:inline={inlineIcons}
|
||||
/>
|
||||
Results {hasSomeCommunityContributed ? 'include' : 'may include'} unverified community-contributed
|
||||
services, some might be scams.
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
{
|
||||
!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">
|
||||
<Icon name="ri:emotion-sad-line" class="mb-4 size-16 text-green-500/50" />
|
||||
<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" is:inline={inlineIcons} />
|
||||
<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>
|
||||
<a
|
||||
href={Astro.url.pathname}
|
||||
class={cn(
|
||||
'bg-night-800 font-title mt-4 rounded-md px-4 py-2 text-sm tracking-wider text-white uppercase',
|
||||
hasDefaultFilters && 'hidden'
|
||||
<div class="mt-4 flex justify-center gap-2">
|
||||
{!hasDefaultFilters && (
|
||||
<Button
|
||||
as="a"
|
||||
href={Astro.url.pathname}
|
||||
label="Clear filters"
|
||||
icon="ri:close-line"
|
||||
inlineIcon={inlineIcons}
|
||||
/>
|
||||
)}
|
||||
>
|
||||
Clear filters
|
||||
</a>
|
||||
{countCommunityOnly && (
|
||||
<Button
|
||||
as="a"
|
||||
href={urlIfIncludingCommunity}
|
||||
label={`Show ${countCommunityOnly.toLocaleString()} community contributed`}
|
||||
icon="ri:search-line"
|
||||
inlineIcon={inlineIcons}
|
||||
/>
|
||||
)}
|
||||
</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) => (
|
||||
<ServiceCard
|
||||
inlineIcons
|
||||
inlineIcons={inlineIcons}
|
||||
service={service}
|
||||
data-hx-search-results-card
|
||||
{...(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="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...
|
||||
</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>
|
||||
|
||||
@@ -36,7 +36,7 @@ const {
|
||||
class={cn(
|
||||
'pointer-events-none hidden select-none group-hover/tooltip:flex',
|
||||
'ease-out-cubic scale-75 opacity-0 transition-all transition-discrete duration-100 group-hover/tooltip:scale-100 group-hover/tooltip:opacity-100 starting:group-hover/tooltip:scale-75 starting:group-hover/tooltip:opacity-0',
|
||||
'z-1000 w-max max-w-sm rounded-lg px-3 py-2 font-sans text-sm font-normal tracking-normal text-pretty whitespace-pre-wrap',
|
||||
'z-1000 w-max max-w-sm rounded-lg px-3 py-2 font-sans text-sm font-normal tracking-normal text-pretty wrap-anywhere whitespace-pre-wrap',
|
||||
// Position classes
|
||||
{
|
||||
'absolute -top-2 left-1/2 origin-bottom -translate-x-1/2 translate-y-[calc(-100%+0.5rem)] text-center group-hover/tooltip:-translate-y-full starting:group-hover/tooltip:translate-y-[calc(-100%+0.25rem)]':
|
||||
@@ -85,9 +85,8 @@ const {
|
||||
},
|
||||
classNames?.tooltip
|
||||
)}
|
||||
>
|
||||
{text}
|
||||
</span>
|
||||
set:text={text}
|
||||
/>
|
||||
)
|
||||
}
|
||||
</Component>
|
||||
|
||||
87
web/src/components/UserBadge.astro
Normal file
87
web/src/components/UserBadge.astro
Normal file
@@ -0,0 +1,87 @@
|
||||
---
|
||||
import { tv, type VariantProps } from 'tailwind-variants'
|
||||
|
||||
import { getSizePxFromTailwindClasses } from '../lib/tailwind'
|
||||
|
||||
import MyPicture from './MyPicture.astro'
|
||||
|
||||
import type { Prisma } from '@prisma/client'
|
||||
import type { HTMLAttributes } from 'astro/types'
|
||||
import type { O } from 'ts-toolbelt'
|
||||
|
||||
const userBadge = tv({
|
||||
slots: {
|
||||
base: 'group/user-badge font-title inline-flex max-w-full items-center gap-1 overflow-hidden font-medium',
|
||||
image: 'inline-block rounded-full object-cover',
|
||||
text: 'truncate',
|
||||
},
|
||||
variants: {
|
||||
size: {
|
||||
sm: {
|
||||
base: 'gap-1 text-xs',
|
||||
image: 'size-4',
|
||||
},
|
||||
md: {
|
||||
base: 'gap-2 text-sm',
|
||||
image: 'size-5',
|
||||
},
|
||||
lg: {
|
||||
base: 'gap-2 text-base',
|
||||
image: 'size-6',
|
||||
},
|
||||
},
|
||||
noLink: {
|
||||
true: {
|
||||
text: 'cursor-default',
|
||||
},
|
||||
false: {
|
||||
base: 'cursor-pointer',
|
||||
text: 'group-hover/user-badge:underline',
|
||||
},
|
||||
},
|
||||
},
|
||||
defaultVariants: {
|
||||
size: 'sm',
|
||||
noLink: false,
|
||||
},
|
||||
})
|
||||
|
||||
type Props = O.Optional<HTMLAttributes<'a'>, 'href'> &
|
||||
VariantProps<typeof userBadge> & {
|
||||
user: Prisma.UserGetPayload<{
|
||||
select: {
|
||||
name: true
|
||||
displayName: true
|
||||
picture: true
|
||||
}
|
||||
}>
|
||||
classNames?: {
|
||||
image?: string
|
||||
text?: string
|
||||
}
|
||||
children?: never
|
||||
}
|
||||
|
||||
const { user, href, class: className, size = 'sm', classNames, noLink = false, ...htmlProps } = Astro.props
|
||||
const { base, image, text } = userBadge({ size, noLink })
|
||||
|
||||
const imageClassName = image({ class: classNames?.image })
|
||||
const imageSizePx = getSizePxFromTailwindClasses(imageClassName, 16)
|
||||
|
||||
const Tag = noLink ? 'span' : 'a'
|
||||
---
|
||||
|
||||
<Tag
|
||||
href={Tag === 'a' ? (href ?? `/u/${user.name}`) : undefined}
|
||||
class={base({ class: className })}
|
||||
{...htmlProps}
|
||||
>
|
||||
{
|
||||
!!user.picture && (
|
||||
<MyPicture src={user.picture} height={imageSizePx} width={imageSizePx} class={imageClassName} alt="" />
|
||||
)
|
||||
}
|
||||
<span class={text({ class: classNames?.text })}>
|
||||
{user.displayName ?? user.name}
|
||||
</span>
|
||||
</Tag>
|
||||
@@ -19,6 +19,11 @@ type Props = {
|
||||
verificationSummary: true
|
||||
listedAt: true
|
||||
createdAt: true
|
||||
verificationSteps: {
|
||||
select: {
|
||||
status: true
|
||||
}
|
||||
}
|
||||
}
|
||||
}>
|
||||
}
|
||||
@@ -45,7 +50,7 @@ const wasRecentlyAdded = isPast(listedDate) && differenceInDays(new Date(), list
|
||||
)}
|
||||
</p>
|
||||
{!!service.verificationSummary && (
|
||||
<div class="mt-2 whitespace-pre-wrap">{service.verificationSummary}</div>
|
||||
<div class="mt-2 wrap-anywhere whitespace-pre-wrap" set:text={service.verificationSummary} />
|
||||
)}
|
||||
</div>
|
||||
) : service.verificationStatus === 'COMMUNITY_CONTRIBUTED' ? (
|
||||
@@ -67,3 +72,18 @@ const wasRecentlyAdded = isPast(listedDate) && differenceInDays(new Date(), list
|
||||
</div>
|
||||
) : null
|
||||
}
|
||||
|
||||
{
|
||||
service.verificationStatus !== 'VERIFICATION_FAILED' &&
|
||||
service.verificationSteps.some((step) => step.status === 'FAILED') && (
|
||||
<div class="mb-3 flex items-center gap-2 rounded-md bg-red-900/50 p-2 text-sm text-red-400">
|
||||
<Icon
|
||||
name={verificationStatusesByValue.VERIFICATION_FAILED.icon}
|
||||
class={cn('size-5', verificationStatusesByValue.VERIFICATION_FAILED.classNames.icon)}
|
||||
/>
|
||||
<span>
|
||||
This service has failed one or more verification steps. Review the verification details carefully.
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -25,12 +25,12 @@ export const {
|
||||
(value): AnnouncementTypeInfo<typeof value> => ({
|
||||
value,
|
||||
label: value ? transformCase(value.replaceAll('_', ' '), 'title') : String(value),
|
||||
icon: 'ri:information-fill',
|
||||
icon: 'ri:question-line',
|
||||
classNames: {
|
||||
container: 'bg-blue-950',
|
||||
bg: 'from-blue-400 to-blue-700',
|
||||
content: '[--gradient-edge:var(--color-blue-100)] [--gradient-center:var(--color-blue-200)]',
|
||||
icon: 'text-blue-400/80',
|
||||
container: 'bg-cyan-950',
|
||||
bg: 'from-cyan-400 to-cyan-700',
|
||||
content: '[--gradient-edge:var(--color-green-100)] [--gradient-center:var(--color-cyan-400)]',
|
||||
icon: 'text-cyan-300/80',
|
||||
badge: 'bg-blue-900/30 text-blue-400',
|
||||
},
|
||||
}),
|
||||
@@ -38,12 +38,12 @@ export const {
|
||||
{
|
||||
value: 'INFO',
|
||||
label: 'Info',
|
||||
icon: 'ri:information-fill',
|
||||
icon: 'ri:information-line',
|
||||
classNames: {
|
||||
container: 'bg-green-950',
|
||||
bg: 'from-green-400 to-green-700',
|
||||
content: '[--gradient-edge:var(--color-green-100)] [--gradient-center:var(--color-lime-200)]',
|
||||
icon: 'text-green-400/80',
|
||||
container: 'bg-cyan-950',
|
||||
bg: 'from-cyan-400 to-cyan-700',
|
||||
content: '[--gradient-edge:var(--color-green-100)] [--gradient-center:var(--color-cyan-400)]',
|
||||
icon: 'text-cyan-300/80',
|
||||
badge: 'bg-blue-900/30 text-blue-400',
|
||||
},
|
||||
},
|
||||
@@ -54,7 +54,7 @@ export const {
|
||||
classNames: {
|
||||
container: 'bg-yellow-950',
|
||||
bg: 'from-yellow-400 to-yellow-700',
|
||||
content: '[--gradient-edge:var(--color-yellow-100)] [--gradient-center:var(--color-amber-200)]',
|
||||
content: '[--gradient-edge:var(--color-lime-100)] [--gradient-center:var(--color-yellow-400)]',
|
||||
icon: 'text-yellow-400/80',
|
||||
badge: 'bg-yellow-900/30 text-yellow-400',
|
||||
},
|
||||
@@ -66,7 +66,7 @@ export const {
|
||||
classNames: {
|
||||
container: 'bg-red-950',
|
||||
bg: 'from-red-400 to-red-700',
|
||||
content: '[--gradient-edge:var(--color-red-100)] [--gradient-center:var(--color-rose-200)]',
|
||||
content: '[--gradient-edge:var(--color-red-100)] [--gradient-center:var(--color-rose-400)]',
|
||||
icon: 'text-red-400/80',
|
||||
badge: 'bg-red-900/30 text-red-400',
|
||||
},
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
|
||||
import { transformCase } from '../lib/strings'
|
||||
|
||||
import type BadgeSmall from '../components/BadgeSmall.astro'
|
||||
import type { CommentStatus } from '@prisma/client'
|
||||
import type { ComponentProps } from 'astro/types'
|
||||
|
||||
type CommentStatusInfo<T extends string | null | undefined = string> = {
|
||||
id: T
|
||||
icon: string
|
||||
label: string
|
||||
color: ComponentProps<typeof BadgeSmall>['color']
|
||||
creativeWorkStatus: string | undefined
|
||||
}
|
||||
|
||||
@@ -20,37 +23,43 @@ export const {
|
||||
id,
|
||||
icon: 'ri:question-line',
|
||||
label: id ? transformCase(id, 'title') : String(id),
|
||||
color: 'gray',
|
||||
creativeWorkStatus: undefined,
|
||||
}),
|
||||
[
|
||||
{
|
||||
id: 'PENDING',
|
||||
icon: 'ri:question-line',
|
||||
label: 'Pending',
|
||||
label: 'Unmoderated',
|
||||
color: 'yellow',
|
||||
creativeWorkStatus: 'Deleted',
|
||||
},
|
||||
{
|
||||
id: 'HUMAN_PENDING',
|
||||
icon: 'ri:question-line',
|
||||
label: 'Pending 2',
|
||||
label: 'Unmoderated',
|
||||
color: 'yellow',
|
||||
creativeWorkStatus: 'Deleted',
|
||||
},
|
||||
{
|
||||
id: 'VERIFIED',
|
||||
icon: 'ri:check-line',
|
||||
icon: 'ri:verified-badge-fill',
|
||||
label: 'Verified',
|
||||
color: 'blue',
|
||||
creativeWorkStatus: 'Verified',
|
||||
},
|
||||
{
|
||||
id: 'REJECTED',
|
||||
icon: 'ri:close-line',
|
||||
label: 'Rejected',
|
||||
color: 'red',
|
||||
creativeWorkStatus: 'Deleted',
|
||||
},
|
||||
{
|
||||
id: 'APPROVED',
|
||||
icon: 'ri:check-line',
|
||||
label: 'Approved',
|
||||
color: 'green',
|
||||
creativeWorkStatus: 'Active',
|
||||
},
|
||||
] as const satisfies CommentStatusInfo<CommentStatus>[]
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
|
||||
import { transformCase } from '../lib/strings'
|
||||
|
||||
import { commentStatusById } from './commentStatus'
|
||||
|
||||
import type BadgeSmall from '../components/BadgeSmall.astro'
|
||||
import type { Prisma } from '@prisma/client'
|
||||
import type { ComponentProps } from 'astro/types'
|
||||
|
||||
type CommentStatusFilterInfo<T extends string | null | undefined = string> = {
|
||||
value: T
|
||||
label: string
|
||||
color: ComponentProps<typeof BadgeSmall>['color']
|
||||
icon: string
|
||||
whereClause: Prisma.CommentWhereInput
|
||||
styles: {
|
||||
classNames: {
|
||||
filter: string
|
||||
badge: string
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,9 +29,10 @@ export const {
|
||||
value,
|
||||
label: value ? transformCase(value, 'title') : String(value),
|
||||
whereClause: {},
|
||||
styles: {
|
||||
color: 'gray',
|
||||
icon: 'ri:question-line',
|
||||
classNames: {
|
||||
filter: 'border-zinc-700 transition-colors hover:border-green-500/50',
|
||||
badge: '',
|
||||
},
|
||||
}),
|
||||
[
|
||||
@@ -34,75 +40,92 @@ export const {
|
||||
label: 'All',
|
||||
value: 'all',
|
||||
whereClause: {},
|
||||
styles: {
|
||||
color: 'gray',
|
||||
icon: 'ri:question-line',
|
||||
classNames: {
|
||||
filter: 'border-green-500 bg-green-500/20 text-green-400',
|
||||
badge: '',
|
||||
},
|
||||
},
|
||||
{
|
||||
label: 'Pending',
|
||||
value: 'pending',
|
||||
label: 'AI pending',
|
||||
color: commentStatusById.PENDING.color,
|
||||
icon: 'ri:robot-2-line',
|
||||
whereClause: {
|
||||
OR: [{ status: 'PENDING' }, { status: 'HUMAN_PENDING' }],
|
||||
},
|
||||
styles: {
|
||||
classNames: {
|
||||
filter: 'border-blue-500 bg-blue-500/20 text-blue-400',
|
||||
},
|
||||
},
|
||||
{
|
||||
value: 'human-pending',
|
||||
label: 'Human needed',
|
||||
color: commentStatusById.HUMAN_PENDING.color,
|
||||
icon: 'ri:user-search-line',
|
||||
whereClause: { status: 'HUMAN_PENDING' },
|
||||
classNames: {
|
||||
filter: 'border-blue-500 bg-blue-500/20 text-blue-400',
|
||||
badge: 'rounded-sm bg-blue-500/20 px-2 py-0.5 text-[12px] font-medium text-blue-500',
|
||||
},
|
||||
},
|
||||
{
|
||||
label: 'Rejected',
|
||||
value: 'rejected',
|
||||
label: commentStatusById.REJECTED.label,
|
||||
color: commentStatusById.REJECTED.color,
|
||||
icon: commentStatusById.REJECTED.icon,
|
||||
whereClause: {
|
||||
status: 'REJECTED',
|
||||
},
|
||||
styles: {
|
||||
classNames: {
|
||||
filter: 'border-red-500 bg-red-500/20 text-red-400',
|
||||
badge: 'rounded-sm bg-red-500/20 px-2 py-0.5 text-[12px] font-medium text-red-500',
|
||||
},
|
||||
},
|
||||
{
|
||||
label: 'Suspicious',
|
||||
value: 'suspicious',
|
||||
color: 'red',
|
||||
icon: 'ri:close-circle-fill',
|
||||
whereClause: {
|
||||
suspicious: true,
|
||||
},
|
||||
styles: {
|
||||
classNames: {
|
||||
filter: 'border-red-500 bg-red-500/20 text-red-400',
|
||||
badge: 'rounded-sm bg-red-500/20 px-2 py-0.5 text-[12px] font-medium text-red-500',
|
||||
},
|
||||
},
|
||||
{
|
||||
label: 'Verified',
|
||||
value: 'verified',
|
||||
label: commentStatusById.VERIFIED.label,
|
||||
color: commentStatusById.VERIFIED.color,
|
||||
icon: commentStatusById.VERIFIED.icon,
|
||||
whereClause: {
|
||||
status: 'VERIFIED',
|
||||
},
|
||||
styles: {
|
||||
classNames: {
|
||||
filter: 'border-blue-500 bg-blue-500/20 text-blue-400',
|
||||
badge: 'rounded-sm bg-blue-500/20 px-2 py-0.5 text-[12px] font-medium text-blue-500',
|
||||
},
|
||||
},
|
||||
{
|
||||
label: 'Approved',
|
||||
value: 'approved',
|
||||
label: commentStatusById.APPROVED.label,
|
||||
color: commentStatusById.APPROVED.color,
|
||||
icon: commentStatusById.APPROVED.icon,
|
||||
whereClause: {
|
||||
status: 'APPROVED',
|
||||
},
|
||||
styles: {
|
||||
classNames: {
|
||||
filter: 'border-green-500 bg-green-500/20 text-green-400',
|
||||
badge: 'rounded-sm bg-green-500/20 px-2 py-0.5 text-[12px] font-medium text-green-500',
|
||||
},
|
||||
},
|
||||
{
|
||||
label: 'Needs Review',
|
||||
value: 'needs-review',
|
||||
color: 'yellow',
|
||||
icon: 'ri:question-line',
|
||||
whereClause: {
|
||||
requiresAdminReview: true,
|
||||
},
|
||||
styles: {
|
||||
classNames: {
|
||||
filter: 'border-yellow-500 bg-yellow-500/20 text-yellow-400',
|
||||
badge: 'rounded-sm bg-yellow-500/20 px-2 py-0.5 text-[12px] font-medium text-yellow-500',
|
||||
},
|
||||
},
|
||||
] as const satisfies CommentStatusFilterInfo[]
|
||||
@@ -123,10 +146,12 @@ export function getCommentStatusFilterValue(
|
||||
if (comment.suspicious) return 'suspicious'
|
||||
|
||||
switch (comment.status) {
|
||||
case 'PENDING':
|
||||
case 'HUMAN_PENDING': {
|
||||
case 'PENDING': {
|
||||
return 'pending'
|
||||
}
|
||||
case 'HUMAN_PENDING': {
|
||||
return 'human-pending'
|
||||
}
|
||||
case 'VERIFIED': {
|
||||
return 'verified'
|
||||
}
|
||||
|
||||
122
web/src/constants/contactMethods.ts
Normal file
122
web/src/constants/contactMethods.ts
Normal file
@@ -0,0 +1,122 @@
|
||||
import { parsePhoneNumberWithError } from 'libphonenumber-js'
|
||||
|
||||
import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
|
||||
import { transformCase } from '../lib/strings'
|
||||
|
||||
type ContactMethodInfo<T extends string | null | undefined = string> = {
|
||||
type: T
|
||||
label: string
|
||||
/** Notice that the first capture group is then used to format the value */
|
||||
matcher: RegExp
|
||||
formatter: (value: string) => string | null
|
||||
icon: string
|
||||
}
|
||||
|
||||
export const {
|
||||
dataArray: contactMethods,
|
||||
dataObject: contactMethodsById,
|
||||
/** Use {@link formatContactMethod} instead */
|
||||
getFn: getContactMethodInfo,
|
||||
} = makeHelpersForOptions(
|
||||
'type',
|
||||
(type): ContactMethodInfo<typeof type> => ({
|
||||
type,
|
||||
label: type ? transformCase(type, 'title') : String(type),
|
||||
icon: 'ri:shield-fill',
|
||||
matcher: /(.*)/,
|
||||
formatter: (value) => value,
|
||||
}),
|
||||
[
|
||||
{
|
||||
type: 'email',
|
||||
label: 'Email',
|
||||
matcher: /mailto:(.*)/,
|
||||
formatter: (value) => value,
|
||||
icon: 'ri:mail-line',
|
||||
},
|
||||
{
|
||||
type: 'telephone',
|
||||
label: 'Telephone',
|
||||
matcher: /tel:(.*)/,
|
||||
formatter: (value) => {
|
||||
return parsePhoneNumberWithError(value).formatInternational()
|
||||
},
|
||||
icon: 'ri:phone-line',
|
||||
},
|
||||
{
|
||||
type: 'whatsapp',
|
||||
label: 'WhatsApp',
|
||||
matcher: /https?:\/\/(?:www\.)?wa\.me\/(.*)\/?/,
|
||||
formatter: (value) => {
|
||||
return parsePhoneNumberWithError(value).formatInternational()
|
||||
},
|
||||
icon: 'ri:whatsapp-line',
|
||||
},
|
||||
{
|
||||
type: 'telegram',
|
||||
label: 'Telegram',
|
||||
matcher: /https?:\/\/(?:www\.)?t\.me\/(.*)\/?/,
|
||||
formatter: (value) => `t.me/${value}`,
|
||||
icon: 'ri:telegram-line',
|
||||
},
|
||||
{
|
||||
type: 'linkedin',
|
||||
label: 'LinkedIn',
|
||||
matcher: /https?:\/\/(?:www\.)?linkedin\.com\/(?:in|company)\/(.*)\/?/,
|
||||
formatter: (value) => `in/${value}`,
|
||||
icon: 'ri:linkedin-box-line',
|
||||
},
|
||||
{
|
||||
type: 'website',
|
||||
label: 'Website',
|
||||
matcher: /https?:\/\/(?:www\.)?((?:[a-zA-Z0-9-]+\.)+[a-zA-Z]+)/,
|
||||
formatter: (value) => value,
|
||||
icon: 'ri:global-line',
|
||||
},
|
||||
{
|
||||
type: 'x',
|
||||
label: 'X',
|
||||
matcher: /https?:\/\/(?:www\.)?x\.com\/(.*)\/?/,
|
||||
formatter: (value) => `@${value}`,
|
||||
icon: 'ri:twitter-x-line',
|
||||
},
|
||||
{
|
||||
type: 'instagram',
|
||||
label: 'Instagram',
|
||||
matcher: /https?:\/\/(?:www\.)?instagram\.com\/(.*)\/?/,
|
||||
formatter: (value) => `@${value}`,
|
||||
icon: 'ri:instagram-line',
|
||||
},
|
||||
{
|
||||
type: 'matrix',
|
||||
label: 'Matrix',
|
||||
matcher: /https?:\/\/(?:www\.)?matrix\.to\/#\/(.*)\/?/,
|
||||
formatter: (value) => value,
|
||||
icon: 'ri:hashtag',
|
||||
},
|
||||
{
|
||||
type: 'bitcointalk',
|
||||
label: 'BitcoinTalk',
|
||||
matcher: /https?:\/\/(?:www\.)?bitcointalk\.org/,
|
||||
formatter: () => 'BitcoinTalk',
|
||||
icon: 'ri:btc-line',
|
||||
},
|
||||
] as const satisfies ContactMethodInfo[]
|
||||
)
|
||||
|
||||
export function formatContactMethod(url: string) {
|
||||
for (const contactMethod of contactMethods) {
|
||||
const captureGroup = url.match(contactMethod.matcher)?.[1]
|
||||
if (!captureGroup) continue
|
||||
|
||||
const formattedValue = contactMethod.formatter(captureGroup)
|
||||
if (!formattedValue) continue
|
||||
|
||||
return {
|
||||
...contactMethod,
|
||||
formattedValue,
|
||||
} as const
|
||||
}
|
||||
|
||||
return { ...getContactMethodInfo('unknown'), formattedValue: url } as const
|
||||
}
|
||||
@@ -78,8 +78,8 @@ export const {
|
||||
},
|
||||
{
|
||||
value: 'MANUAL_ADJUSTMENT',
|
||||
slug: 'manual-adjustment',
|
||||
label: 'Manual adjustment',
|
||||
slug: 'gift',
|
||||
label: 'Gift',
|
||||
icon: 'ri:gift-line',
|
||||
},
|
||||
] as const satisfies KarmaTransactionActionInfo<KarmaTransactionAction>[]
|
||||
|
||||
@@ -46,11 +46,11 @@ export const {
|
||||
icon: 'ri:lightbulb-line',
|
||||
},
|
||||
// TODO: [KARMA_UNLOCK] Will be added later, when karma unloks are in the database, not in the code.
|
||||
// {
|
||||
// id: 'KARMA_UNLOCK',
|
||||
// label: 'Karma unlock',
|
||||
// icon: 'ri:award-line',
|
||||
// },
|
||||
{
|
||||
id: 'KARMA_CHANGE',
|
||||
label: 'Karma recieved',
|
||||
icon: 'ri:award-line',
|
||||
},
|
||||
{
|
||||
id: 'ACCOUNT_STATUS_CHANGE',
|
||||
label: 'Change in account status',
|
||||
|
||||
@@ -70,7 +70,7 @@ export const {
|
||||
description:
|
||||
'Thoroughly tested and verified by the team. But things might change, this is not a guarantee.',
|
||||
privacyPoints: 0,
|
||||
trustPoints: 5,
|
||||
trustPoints: 10,
|
||||
classNames: {
|
||||
icon: 'text-[#40e6c2]',
|
||||
badgeBig: 'bg-green-800/50 text-green-100',
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
import { parsePhoneNumberWithError } from 'libphonenumber-js'
|
||||
|
||||
type Formatter = {
|
||||
id: string
|
||||
matcher: RegExp
|
||||
formatter: (value: string) => string | null
|
||||
}
|
||||
const formatters = [
|
||||
{
|
||||
id: 'email',
|
||||
matcher: /mailto:(.*)/,
|
||||
formatter: (value) => value,
|
||||
},
|
||||
{
|
||||
id: 'telephone',
|
||||
matcher: /tel:(.*)/,
|
||||
formatter: (value) => {
|
||||
return parsePhoneNumberWithError(value).formatInternational()
|
||||
},
|
||||
},
|
||||
{
|
||||
id: 'whatsapp',
|
||||
matcher: /https?:\/\/wa\.me\/(.*)\/?/,
|
||||
formatter: (value) => {
|
||||
return parsePhoneNumberWithError(value).formatInternational()
|
||||
},
|
||||
},
|
||||
{
|
||||
id: 'telegram',
|
||||
matcher: /https?:\/\/t\.me\/(.*)\/?/,
|
||||
formatter: (value) => `t.me/${value}`,
|
||||
},
|
||||
{
|
||||
id: 'linkedin',
|
||||
matcher: /https?:\/\/(?:www\.)?linkedin\.com\/(?:in|company)\/(.*)\/?/,
|
||||
formatter: (value) => `in/${value}`,
|
||||
},
|
||||
{
|
||||
id: 'website',
|
||||
matcher: /https?:\/\/(?:www\.)?((?:[a-zA-Z0-9-]+\.)+[a-zA-Z]+)/,
|
||||
formatter: (value) => value,
|
||||
},
|
||||
] as const satisfies Formatter[]
|
||||
|
||||
export function formatContactMethod(url: string) {
|
||||
for (const formatter of formatters) {
|
||||
const captureGroup = url.match(formatter.matcher)?.[1]
|
||||
if (!captureGroup) continue
|
||||
|
||||
const formattedValue = formatter.formatter(captureGroup)
|
||||
if (!formattedValue) continue
|
||||
|
||||
return {
|
||||
type: formatter.id,
|
||||
formattedValue,
|
||||
} as const
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { accountStatusChangesById } from '../constants/accountStatusChange'
|
||||
import { commentStatusChangesById } from '../constants/commentStatusChange'
|
||||
import { eventTypesById } from '../constants/eventTypes'
|
||||
import { getKarmaTransactionActionInfo } from '../constants/karmaTransactionActions'
|
||||
import { serviceVerificationStatusChangesById } from '../constants/serviceStatusChange'
|
||||
import { serviceSuggestionStatusChangesById } from '../constants/suggestionStatusChange'
|
||||
|
||||
@@ -16,6 +17,12 @@ export function makeNotificationTitle(
|
||||
aboutCommentStatusChange: true
|
||||
aboutServiceVerificationStatusChange: true
|
||||
aboutSuggestionStatusChange: true
|
||||
aboutKarmaTransaction: {
|
||||
select: {
|
||||
points: true
|
||||
action: true
|
||||
}
|
||||
}
|
||||
aboutComment: {
|
||||
select: {
|
||||
author: { select: { id: true } }
|
||||
@@ -137,6 +144,13 @@ export function makeNotificationTitle(
|
||||
// case 'KARMA_UNLOCK': {
|
||||
// return 'New karma level unlocked'
|
||||
// }
|
||||
case 'KARMA_CHANGE': {
|
||||
if (!notification.aboutKarmaTransaction) return 'Your karma has changed'
|
||||
const { points, action } = notification.aboutKarmaTransaction
|
||||
const sign = points > 0 ? '+' : ''
|
||||
const karmaInfo = getKarmaTransactionActionInfo(action)
|
||||
return `${sign}${points.toLocaleString()} karma for ${karmaInfo.label}`
|
||||
}
|
||||
case 'ACCOUNT_STATUS_CHANGE': {
|
||||
if (!notification.aboutAccountStatusChange) return 'Your account status has been updated'
|
||||
const accountStatusChange = accountStatusChangesById[notification.aboutAccountStatusChange]
|
||||
@@ -165,6 +179,11 @@ export function makeNotificationContent(
|
||||
notification: Prisma.NotificationGetPayload<{
|
||||
select: {
|
||||
type: true
|
||||
aboutKarmaTransaction: {
|
||||
select: {
|
||||
description: true
|
||||
}
|
||||
}
|
||||
aboutComment: {
|
||||
select: {
|
||||
content: true
|
||||
@@ -187,6 +206,10 @@ export function makeNotificationContent(
|
||||
switch (notification.type) {
|
||||
// TODO: [KARMA_UNLOCK] Will be added later, when karma unloks are in the database, not in the code.
|
||||
// case 'KARMA_UNLOCK':
|
||||
case 'KARMA_CHANGE': {
|
||||
if (!notification.aboutKarmaTransaction) return null
|
||||
return notification.aboutKarmaTransaction.description
|
||||
}
|
||||
case 'SUGGESTION_STATUS_CHANGE':
|
||||
case 'ACCOUNT_STATUS_CHANGE':
|
||||
case 'SERVICE_VERIFICATION_STATUS_CHANGE': {
|
||||
@@ -280,6 +303,9 @@ export function makeNotificationLink(
|
||||
// case 'KARMA_UNLOCK': {
|
||||
// return `${origin}/account#karma-unlocks`
|
||||
// }
|
||||
case 'KARMA_CHANGE': {
|
||||
return `${origin}/account#karma-transactions`
|
||||
}
|
||||
case 'ACCOUNT_STATUS_CHANGE': {
|
||||
return `${origin}/account#account-status`
|
||||
}
|
||||
|
||||
8
web/src/lib/tailwind.ts
Normal file
8
web/src/lib/tailwind.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
import { parseIntWithFallback } from './numbers'
|
||||
|
||||
const TW_SIZING_TO_PX_RATIO = 4
|
||||
|
||||
export function getSizePxFromTailwindClasses(className: string, fallbackPxSize: number) {
|
||||
const twSizing = /(?: |^|\n)(?:(?:size-(\d+))|(?:w-(\d+))|(?:h-(\d+)))(?: |$|\n)/.exec(className)?.[1]
|
||||
return parseIntWithFallback(twSizing, fallbackPxSize / TW_SIZING_TO_PX_RATIO) * TW_SIZING_TO_PX_RATIO
|
||||
}
|
||||
@@ -39,16 +39,19 @@ const {
|
||||
</p>
|
||||
{
|
||||
(DEPLOYMENT_MODE !== 'production' || Astro.locals.user?.admin) && (
|
||||
<div class="bg-night-800 mt-4 block max-h-96 min-h-32 w-full max-w-4xl overflow-auto rounded-lg p-4 text-left text-sm break-words whitespace-pre-wrap">
|
||||
{error instanceof Error
|
||||
? error.message
|
||||
: error === undefined
|
||||
? // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
|
||||
message || 'undefined'
|
||||
: typeof error === 'object'
|
||||
? JSON.stringify(error, null, 2)
|
||||
: String(error as unknown)}
|
||||
</div>
|
||||
<div
|
||||
class="bg-night-800 mt-4 block max-h-96 min-h-32 w-full max-w-4xl overflow-auto rounded-lg p-4 text-left text-sm wrap-anywhere whitespace-pre-wrap"
|
||||
set:text={
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: error === undefined
|
||||
? // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
|
||||
message || 'undefined'
|
||||
: typeof error === 'object'
|
||||
? JSON.stringify(error, null, 2)
|
||||
: String(error as unknown)
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -34,9 +34,10 @@ if (reasonType === 'admin-required' && Astro.locals.user?.admin) {
|
||||
<h1 class="font-title mt-8 text-3xl font-semibold tracking-wide text-white sm:mt-12 sm:text-5xl">
|
||||
Access denied
|
||||
</h1>
|
||||
<p class="mt-8 text-lg leading-7 text-balance whitespace-pre-wrap text-red-400">
|
||||
{reason}
|
||||
</p>
|
||||
<p
|
||||
class="mt-8 text-lg leading-7 text-balance wrap-anywhere whitespace-pre-wrap text-red-400"
|
||||
set:text={reason}
|
||||
/>
|
||||
|
||||
<div class="mt-12 flex flex-wrap items-center justify-center">
|
||||
<a href="/" class="focus-visible:outline-primary group flex items-center gap-2 px-3.5 py-2.5 text-white">
|
||||
|
||||
@@ -22,7 +22,7 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
---
|
||||
|
||||
<MiniLayout
|
||||
pageTitle={`Edit Profile - ${user.name}`}
|
||||
pageTitle={`Edit Profile - ${user.displayName ?? user.name}`}
|
||||
description="Edit your user profile"
|
||||
ogImage={{ template: 'generic', title: 'Edit Profile', icon: 'ri:user-settings-line' }}
|
||||
layoutHeader={{
|
||||
@@ -48,7 +48,7 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
name="displayName"
|
||||
error={inputErrors.displayName}
|
||||
inputProps={{
|
||||
value: user.displayName ?? '',
|
||||
value: user.displayName,
|
||||
maxlength: 100,
|
||||
disabled: !user.karmaUnlocks.displayName,
|
||||
}}
|
||||
@@ -62,7 +62,7 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
name="link"
|
||||
error={inputErrors.link}
|
||||
inputProps={{
|
||||
value: user.link ?? '',
|
||||
value: user.link,
|
||||
type: 'url',
|
||||
placeholder: 'https://example.com',
|
||||
disabled: !user.karmaUnlocks.websiteLink,
|
||||
|
||||
@@ -8,6 +8,7 @@ import Button from '../../components/Button.astro'
|
||||
import MyPicture from '../../components/MyPicture.astro'
|
||||
import TimeFormatted from '../../components/TimeFormatted.astro'
|
||||
import Tooltip from '../../components/Tooltip.astro'
|
||||
import UserBadge from '../../components/UserBadge.astro'
|
||||
import { getKarmaTransactionActionInfo } from '../../constants/karmaTransactionActions'
|
||||
import { karmaUnlocks, karmaUnlocksById } from '../../constants/karmaUnlocks'
|
||||
import { SUPPORT_EMAIL } from '../../constants/project'
|
||||
@@ -65,6 +66,7 @@ const user = await Astro.locals.banners.try('user', async () => {
|
||||
select: {
|
||||
name: true,
|
||||
displayName: true,
|
||||
picture: true,
|
||||
},
|
||||
},
|
||||
comment: {
|
||||
@@ -158,11 +160,11 @@ if (!user) return Astro.rewrite('/404')
|
||||
---
|
||||
|
||||
<BaseLayout
|
||||
pageTitle={`${user.name} - Account`}
|
||||
pageTitle={`${user.displayName ?? user.name} - Account`}
|
||||
description="Manage your user profile"
|
||||
ogImage={{
|
||||
template: 'generic',
|
||||
title: `${user.name} | Account`,
|
||||
title: `${user.displayName ?? user.name} | Account`,
|
||||
description: 'Manage your user profile',
|
||||
icon: 'ri:user-3-line',
|
||||
}}
|
||||
@@ -181,50 +183,52 @@ if (!user) return Astro.rewrite('/404')
|
||||
]}
|
||||
>
|
||||
<section class="border-night-400 bg-night-400/5 rounded-lg border p-6 shadow-sm backdrop-blur-xs">
|
||||
<header class="flex items-center gap-4">
|
||||
{
|
||||
user.picture ? (
|
||||
<MyPicture
|
||||
src={user.picture}
|
||||
alt=""
|
||||
class="ring-day-500/30 size-16 rounded-full ring-2"
|
||||
width={64}
|
||||
height={64}
|
||||
/>
|
||||
) : (
|
||||
<div class="bg-day-500/10 ring-day-500/30 text-day-400 flex size-16 items-center justify-center rounded-full ring-2">
|
||||
<Icon name="ri:user-3-line" class="size-8" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
<div>
|
||||
<h1 class="font-title text-lg font-bold tracking-wider text-white">{user.name}</h1>
|
||||
{user.displayName && <p class="text-day-200">{user.displayName}</p>}
|
||||
<div class="mt-1 flex gap-2">
|
||||
<header class="flex flex-wrap items-center justify-center gap-4">
|
||||
<div class="flex grow flex-wrap items-center justify-center gap-4">
|
||||
{
|
||||
user.picture ? (
|
||||
<MyPicture
|
||||
src={user.picture}
|
||||
alt=""
|
||||
class="ring-day-500/30 xs:size-14 size-12 rounded-full ring-2 sm:size-16"
|
||||
width={64}
|
||||
height={64}
|
||||
/>
|
||||
) : (
|
||||
<div class="bg-day-500/10 ring-day-500/30 text-day-400 flex size-16 items-center justify-center rounded-full ring-2">
|
||||
<Icon name="ri:user-3-line" class="size-8" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
<div class="grow">
|
||||
<h1 class="font-title text-lg font-bold tracking-wider text-white">
|
||||
{user.displayName ?? user.name}
|
||||
</h1>
|
||||
{user.displayName && <p class="text-day-200 font-title">{user.name}</p>}
|
||||
{
|
||||
user.admin && (
|
||||
<span class="rounded-full border border-red-500/50 bg-red-500/20 px-2 py-0.5 text-xs text-red-400">
|
||||
admin
|
||||
</span>
|
||||
)
|
||||
}
|
||||
{
|
||||
user.verified && (
|
||||
<span class="rounded-full border border-blue-500/50 bg-blue-500/20 px-2 py-0.5 text-xs text-blue-400">
|
||||
verified
|
||||
</span>
|
||||
)
|
||||
}
|
||||
{
|
||||
user.verifier && (
|
||||
<span class="rounded-full border border-green-500/50 bg-green-500/20 px-2 py-0.5 text-xs text-green-400">
|
||||
verifier
|
||||
</span>
|
||||
(user.admin || user.verified || user.verifier) && (
|
||||
<div class="mt-1 flex gap-2">
|
||||
{user.admin && (
|
||||
<span class="rounded-full border border-red-500/50 bg-red-500/20 px-2 py-0.5 text-xs text-red-400">
|
||||
admin
|
||||
</span>
|
||||
)}
|
||||
{user.verified && (
|
||||
<span class="rounded-full border border-blue-500/50 bg-blue-500/20 px-2 py-0.5 text-xs text-blue-400">
|
||||
verified
|
||||
</span>
|
||||
)}
|
||||
{user.verifier && (
|
||||
<span class="rounded-full border border-green-500/50 bg-green-500/20 px-2 py-0.5 text-xs text-green-400">
|
||||
verifier
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
<nav class="ml-auto flex items-center gap-2">
|
||||
<nav class="flex flex-wrap items-center justify-center gap-2">
|
||||
<Tooltip
|
||||
as="a"
|
||||
href={`/u/${user.name}`}
|
||||
@@ -429,7 +433,7 @@ if (!user) return Astro.rewrite('/404')
|
||||
<li>
|
||||
<Button
|
||||
as="a"
|
||||
href={`mailto:${SUPPORT_EMAIL}?subject=User verification request - ${user.name}&body=I would like to be verified as related to https://www.example.com`}
|
||||
href={`mailto:${SUPPORT_EMAIL}?subject=User verification request - ${user.displayName ?? user.name}&body=I would like to be verified as related to https://www.example.com`}
|
||||
label="Request verification"
|
||||
size="sm"
|
||||
/>
|
||||
@@ -448,7 +452,7 @@ if (!user) return Astro.rewrite('/404')
|
||||
</h2>
|
||||
<Button
|
||||
as="a"
|
||||
href={`mailto:${SUPPORT_EMAIL}?subject=Service Affiliation Verification Request - ${user.name}&body=I would like to be verified as related to the services ACME as Admin and XYZ as Team Member. Here is the proof...`}
|
||||
href={`mailto:${SUPPORT_EMAIL}?subject=Service Affiliation Verification Request - ${user.displayName ?? user.name}&body=I would like to be verified as related to the services ACME as Admin and XYZ as Team Member. Here is the proof...`}
|
||||
label="Request"
|
||||
size="md"
|
||||
/>
|
||||
@@ -534,77 +538,38 @@ if (!user) return Astro.rewrite('/404')
|
||||
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
<div class="space-y-3">
|
||||
<h3 class="font-title border-day-700/20 text-day-200 border-b pb-2 text-sm">Positive unlocks</h3>
|
||||
<input type="checkbox" id="positive-unlocks-toggle" class="peer sr-only md:hidden" checked />
|
||||
<label
|
||||
for="positive-unlocks-toggle"
|
||||
class="flex cursor-pointer items-center justify-between border-b border-green-500/20 pb-2 md:cursor-default peer-checked:[&_[data-expand-arrow]]:rotate-180"
|
||||
>
|
||||
<h3 class="font-title text-day-200 text-sm">Positive unlocks</h3>
|
||||
<Icon name="ri:arrow-down-s-line" class="text-day-400 size-5 md:hidden" data-expand-arrow />
|
||||
</label>
|
||||
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma >= 0),
|
||||
'karma'
|
||||
).map((unlock) => (
|
||||
<div
|
||||
class={cn(
|
||||
'flex items-center justify-between rounded-md border p-3',
|
||||
user.karmaUnlocks[unlock.id]
|
||||
? 'border-green-500/30 bg-green-500/10'
|
||||
: 'border-night-500 bg-night-800'
|
||||
)}
|
||||
>
|
||||
<div class="flex items-center">
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-day-400' : 'text-day-500')}>
|
||||
<Icon name={unlock.icon} class="size-5" />
|
||||
</span>
|
||||
<div>
|
||||
<p
|
||||
class={cn('font-medium', user.karmaUnlocks[unlock.id] ? 'text-day-300' : 'text-day-400')}
|
||||
>
|
||||
{unlock.name}
|
||||
</p>
|
||||
<p class="text-day-500 text-sm">{unlock.karma.toLocaleString()} karma</p>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
{user.karmaUnlocks[unlock.id] ? (
|
||||
<span class="bg-day-500/20 text-day-300 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:check-line" class="mr-1 size-3" /> Unlocked
|
||||
</span>
|
||||
) : (
|
||||
<span class="bg-night-800 text-day-400 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:lock-line" class="mr-1 size-3" /> Locked
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<h3 class="font-title border-b border-red-500/20 pb-2 text-sm text-red-400">Negative unlocks</h3>
|
||||
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma < 0),
|
||||
'karma'
|
||||
)
|
||||
.reverse()
|
||||
.map((unlock) => (
|
||||
<div class="mt-3 hidden space-y-3 peer-checked:block md:block">
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma >= 0),
|
||||
'karma'
|
||||
).map((unlock) => (
|
||||
<div
|
||||
class={cn(
|
||||
'flex items-center justify-between rounded-md border p-3',
|
||||
user.karmaUnlocks[unlock.id]
|
||||
? 'border-red-500/30 bg-red-500/10'
|
||||
? 'border-green-500/30 bg-green-500/10'
|
||||
: 'border-night-500 bg-night-800'
|
||||
)}
|
||||
>
|
||||
<div class="flex items-center">
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-500')}>
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-day-400' : 'text-day-500')}>
|
||||
<Icon name={unlock.icon} class="size-5" />
|
||||
</span>
|
||||
<div>
|
||||
<p
|
||||
class={cn(
|
||||
'font-medium',
|
||||
user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-400'
|
||||
user.karmaUnlocks[unlock.id] ? 'text-day-300' : 'text-day-400'
|
||||
)}
|
||||
>
|
||||
{unlock.name}
|
||||
@@ -614,24 +579,85 @@ if (!user) return Astro.rewrite('/404')
|
||||
</div>
|
||||
<div>
|
||||
{user.karmaUnlocks[unlock.id] ? (
|
||||
<span class="inline-flex items-center rounded-full bg-red-500/20 px-2 py-1 text-xs text-red-400">
|
||||
<Icon name="ri:alert-line" class="mr-1 size-3" /> Active
|
||||
<span class="bg-day-500/20 text-day-300 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:check-line" class="mr-1 size-3" /> Unlocked
|
||||
</span>
|
||||
) : (
|
||||
<span class="bg-night-800 text-day-400 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:shield-check-line" class="mr-1 size-3" /> Avoided
|
||||
<Icon name="ri:lock-line" class="mr-1 size-3" /> Locked
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
}
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="text-day-400 border-night-500/30 bg-night-800/70 mt-4 rounded-md border p-3 text-xs">
|
||||
<Icon name="ri:information-line" class="inline-block size-4" />
|
||||
Negative karma leads to restrictions. <br class="hidden sm:block" />Keep interactions positive to
|
||||
avoid penalties.
|
||||
</p>
|
||||
<div class="space-y-3">
|
||||
<input type="checkbox" id="negative-unlocks-toggle" class="peer sr-only md:hidden" />
|
||||
|
||||
<label
|
||||
for="negative-unlocks-toggle"
|
||||
class="flex cursor-pointer items-center justify-between border-b border-red-500/20 pb-2 md:cursor-default peer-checked:[&_[data-expand-arrow]]:rotate-180"
|
||||
>
|
||||
<h3 class="font-title text-sm text-red-400">Negative unlocks</h3>
|
||||
<Icon name="ri:arrow-down-s-line" class="text-day-400 size-5 md:hidden" data-expand-arrow />
|
||||
</label>
|
||||
|
||||
<div class="mt-3 hidden space-y-3 peer-checked:block md:block">
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma < 0),
|
||||
'karma'
|
||||
)
|
||||
.reverse()
|
||||
.map((unlock) => (
|
||||
<div
|
||||
class={cn(
|
||||
'flex items-center justify-between rounded-md border p-3',
|
||||
user.karmaUnlocks[unlock.id]
|
||||
? 'border-red-500/30 bg-red-500/10'
|
||||
: 'border-night-500 bg-night-800'
|
||||
)}
|
||||
>
|
||||
<div class="flex items-center">
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-500')}>
|
||||
<Icon name={unlock.icon} class="size-5" />
|
||||
</span>
|
||||
<div>
|
||||
<p
|
||||
class={cn(
|
||||
'font-medium',
|
||||
user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-400'
|
||||
)}
|
||||
>
|
||||
{unlock.name}
|
||||
</p>
|
||||
<p class="text-day-500 text-sm">{unlock.karma.toLocaleString()} karma</p>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
{user.karmaUnlocks[unlock.id] ? (
|
||||
<span class="inline-flex items-center rounded-full bg-red-500/20 px-2 py-1 text-xs text-red-400">
|
||||
<Icon name="ri:alert-line" class="mr-1 size-3" /> Active
|
||||
</span>
|
||||
) : (
|
||||
<span class="bg-night-800 text-day-400 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:shield-check-line" class="mr-1 size-3" /> Avoided
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
}
|
||||
|
||||
<p class="text-day-400 border-night-500/30 bg-night-800/70 mt-4 rounded-md border p-3 text-xs">
|
||||
<Icon name="ri:information-line" class="inline-block size-4" />
|
||||
Negative karma leads to restrictions. <br class="hidden sm:block" />Keep interactions positive to
|
||||
avoid penalties.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -858,7 +884,10 @@ if (!user) return Astro.rewrite('/404')
|
||||
}
|
||||
</section>
|
||||
|
||||
<section class="border-night-400 bg-night-400/5 rounded-lg border p-6 shadow-sm backdrop-blur-xs">
|
||||
<section
|
||||
class="border-night-400 bg-night-400/5 rounded-lg border p-6 shadow-sm backdrop-blur-xs"
|
||||
id="karma-transactions"
|
||||
>
|
||||
<header class="flex items-center justify-between">
|
||||
<h2 class="font-title text-day-200 mb-4 text-xl font-bold">
|
||||
<Icon name="ri:exchange-line" class="mr-2 inline-block size-5" />
|
||||
@@ -891,13 +920,10 @@ if (!user) return Astro.rewrite('/404')
|
||||
<Icon name={actionInfo.icon} class="size-4" />
|
||||
{actionInfo.label}
|
||||
{transaction.action === 'MANUAL_ADJUSTMENT' && transaction.grantedBy && (
|
||||
<a
|
||||
href={`/u/${transaction.grantedBy.name}`}
|
||||
class="text-day-500 ml-1 hover:underline"
|
||||
>
|
||||
{/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
|
||||
by {transaction.grantedBy.displayName || transaction.grantedBy.name}
|
||||
</a>
|
||||
<>
|
||||
<span class="text-day-500">from</span>
|
||||
<UserBadge user={transaction.grantedBy} size="sm" class="text-day-500" />
|
||||
</>
|
||||
)}
|
||||
</span>
|
||||
</td>
|
||||
@@ -912,7 +938,12 @@ if (!user) return Astro.rewrite('/404')
|
||||
{transaction.points}
|
||||
</td>
|
||||
<td class="text-day-400 px-4 py-3 text-right text-xs whitespace-nowrap">
|
||||
{new Date(transaction.createdAt).toLocaleDateString()}
|
||||
<TimeFormatted
|
||||
date={transaction.createdAt}
|
||||
prefix={false}
|
||||
hourPrecision
|
||||
caseType="sentence"
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
|
||||
@@ -180,7 +180,8 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
required
|
||||
rows="3"
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 placeholder-zinc-500 focus:border-green-500 focus:ring-green-500 focus:outline-none"
|
||||
></textarea>
|
||||
set:text=""
|
||||
/>
|
||||
{
|
||||
createInputErrors.description && (
|
||||
<p class="mt-1 text-sm text-red-400">{createInputErrors.description.join(', ')}</p>
|
||||
@@ -593,9 +594,8 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
required
|
||||
rows="3"
|
||||
class="mt-1 w-full rounded-md border border-zinc-600 bg-zinc-800 px-3 py-2 text-sm text-zinc-200 placeholder-zinc-500 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
>
|
||||
{attribute.description}
|
||||
</textarea>
|
||||
set:text={attribute.description}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-2 gap-4 sm:grid-cols-4">
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
---
|
||||
import { z } from 'astro/zod'
|
||||
import { Icon } from 'astro-icon/components'
|
||||
|
||||
import BadgeSmall from '../../components/BadgeSmall.astro'
|
||||
import CommentModeration from '../../components/CommentModeration.astro'
|
||||
import MyPicture from '../../components/MyPicture.astro'
|
||||
import TimeFormatted from '../../components/TimeFormatted.astro'
|
||||
import UserBadge from '../../components/UserBadge.astro'
|
||||
import {
|
||||
commentStatusFilters,
|
||||
commentStatusFiltersZodEnum,
|
||||
@@ -36,11 +41,18 @@ const [comments = [], totalComments = 0] = await Astro.locals.banners.try(
|
||||
prisma.comment.findManyAndCount({
|
||||
where: statusFilter.whereClause,
|
||||
include: {
|
||||
author: true,
|
||||
author: {
|
||||
select: {
|
||||
name: true,
|
||||
displayName: true,
|
||||
picture: true,
|
||||
},
|
||||
},
|
||||
service: {
|
||||
select: {
|
||||
name: true,
|
||||
slug: true,
|
||||
imageUrl: true,
|
||||
},
|
||||
},
|
||||
parent: {
|
||||
@@ -70,12 +82,13 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
|
||||
<a
|
||||
href={urlWithParams(Astro.url, { status: filter.value })}
|
||||
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
|
||||
? filter.styles.filter
|
||||
? filter.classNames.filter
|
||||
: 'border-zinc-700 transition-colors hover:border-green-500/50',
|
||||
])}
|
||||
>
|
||||
<Icon name={filter.icon} class="size-4 shrink-0" />
|
||||
{filter.label}
|
||||
</a>
|
||||
))
|
||||
@@ -98,22 +111,7 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
|
||||
>
|
||||
<div class="mb-4 flex flex-wrap items-center gap-2">
|
||||
{/* Author Info */}
|
||||
<span class="font-title text-sm">{comment.author.name}</span>
|
||||
{comment.author.admin && (
|
||||
<span class="rounded-sm bg-yellow-500/20 px-2 py-0.5 text-[12px] font-medium text-yellow-500">
|
||||
admin
|
||||
</span>
|
||||
)}
|
||||
{comment.author.verified && !comment.author.admin && (
|
||||
<span class="rounded-sm bg-blue-500/20 px-2 py-0.5 text-[12px] font-medium text-blue-500">
|
||||
verified
|
||||
</span>
|
||||
)}
|
||||
{comment.author.verifier && !comment.author.admin && (
|
||||
<span class="rounded-sm bg-green-500/20 px-2 py-0.5 text-[12px] font-medium text-green-500">
|
||||
verifier
|
||||
</span>
|
||||
)}
|
||||
<UserBadge user={comment.author} size="md" />
|
||||
|
||||
{/* Service Link */}
|
||||
<span class="text-xs text-zinc-500">•</span>
|
||||
@@ -121,21 +119,55 @@ const totalPages = Math.ceil(totalComments / PAGE_SIZE)
|
||||
href={`/service/${comment.service.slug}#comment-${comment.id.toString()}`}
|
||||
class="text-sm text-blue-400 transition-colors hover:text-blue-300"
|
||||
>
|
||||
{!!comment.service.imageUrl && (
|
||||
<MyPicture
|
||||
src={comment.service.imageUrl}
|
||||
height={16}
|
||||
width={16}
|
||||
class="inline-block size-4 rounded-full align-[-0.2em]"
|
||||
alt=""
|
||||
/>
|
||||
)}
|
||||
{comment.service.name}
|
||||
</a>
|
||||
|
||||
{/* Date */}
|
||||
<span class="text-xs text-zinc-500">•</span>
|
||||
<span class="text-sm text-zinc-400">{new Date(comment.createdAt).toLocaleString()}</span>
|
||||
<TimeFormatted
|
||||
date={comment.createdAt}
|
||||
hourPrecision
|
||||
caseType="sentence"
|
||||
class="text-sm text-zinc-400"
|
||||
/>
|
||||
|
||||
<span class="text-xs text-zinc-500">•</span>
|
||||
|
||||
{/* Status Badges */}
|
||||
<span class={comment.statusFilterInfo.styles.badge}>{comment.statusFilterInfo.label}</span>
|
||||
<BadgeSmall
|
||||
color={comment.statusFilterInfo.color}
|
||||
text={comment.statusFilterInfo.label}
|
||||
icon={comment.statusFilterInfo.icon}
|
||||
inlineIcon
|
||||
/>
|
||||
|
||||
<span class="text-xs text-zinc-500">•</span>
|
||||
|
||||
{/* Link to Comment */}
|
||||
<a
|
||||
href={`/service/${comment.service.slug}?showPending=true#comment-${comment.id.toString()}`}
|
||||
class="text-whit/50 flex items-center gap-1 text-sm transition-colors hover:underline"
|
||||
>
|
||||
<Icon name="ri:link" class="size-4" />
|
||||
Open
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{/* Parent Comment Context */}
|
||||
{comment.parent && (
|
||||
<div class="mb-4 border-l-2 border-zinc-700 pl-4">
|
||||
<div class="mb-1 text-sm text-zinc-500">Replying to {comment.parent.author.name}:</div>
|
||||
<div class="mb-1 text-sm opacity-50">
|
||||
Replying to <UserBadge user={comment.parent.author} size="md" />
|
||||
</div>
|
||||
<div class="text-sm text-zinc-400">{comment.parent.content}</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -4,6 +4,7 @@ import { actions } from 'astro:actions'
|
||||
|
||||
import Chat from '../../../components/Chat.astro'
|
||||
import ServiceCard from '../../../components/ServiceCard.astro'
|
||||
import UserBadge from '../../../components/UserBadge.astro'
|
||||
import { getServiceSuggestionStatusInfo } from '../../../constants/serviceSuggestionStatus'
|
||||
import BaseLayout from '../../../layouts/BaseLayout.astro'
|
||||
import { cn } from '../../../lib/cn'
|
||||
@@ -37,6 +38,8 @@ const serviceSuggestion = await Astro.locals.banners.try('Error fetching service
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
displayName: true,
|
||||
picture: true,
|
||||
},
|
||||
},
|
||||
service: {
|
||||
@@ -66,6 +69,7 @@ const serviceSuggestion = await Astro.locals.banners.try('Error fetching service
|
||||
user: {
|
||||
select: {
|
||||
id: true,
|
||||
displayName: true,
|
||||
name: true,
|
||||
picture: true,
|
||||
},
|
||||
@@ -126,11 +130,7 @@ const statusInfo = getServiceSuggestionStatusInfo(serviceSuggestion.status)
|
||||
</span>
|
||||
|
||||
<span class="font-title text-gray-400">Submitted by:</span>
|
||||
<span class="text-gray-300">
|
||||
<a href={`/admin/users?name=${serviceSuggestion.user.name}`} class="hover:text-green-500">
|
||||
{serviceSuggestion.user.name}
|
||||
</a>
|
||||
</span>
|
||||
<UserBadge class="text-gray-300" user={serviceSuggestion.user} size="md" />
|
||||
|
||||
<span class="font-title text-gray-400">Submitted at:</span>
|
||||
<span class="text-gray-300">{serviceSuggestion.createdAt.toLocaleString()}</span>
|
||||
@@ -148,9 +148,10 @@ const statusInfo = getServiceSuggestionStatusInfo(serviceSuggestion.status)
|
||||
serviceSuggestion.notes && (
|
||||
<div class="mb-4">
|
||||
<h3 class="font-title mb-1 text-sm text-gray-400">Notes from user:</h3>
|
||||
<div class="rounded-md border border-gray-700 bg-black/50 p-3 text-sm whitespace-pre-wrap text-gray-300">
|
||||
{serviceSuggestion.notes}
|
||||
</div>
|
||||
<div
|
||||
class="rounded-md border border-gray-700 bg-black/50 p-3 text-sm wrap-anywhere whitespace-pre-wrap text-gray-300"
|
||||
set:text={serviceSuggestion.notes}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
import { Icon } from 'astro-icon/components'
|
||||
import { actions } from 'astro:actions'
|
||||
import { z } from 'astro:content'
|
||||
import { orderBy as lodashOrderBy } from 'lodash-es'
|
||||
import { orderBy } from 'lodash-es'
|
||||
|
||||
import SortArrowIcon from '../../../components/SortArrowIcon.astro'
|
||||
import TimeFormatted from '../../../components/TimeFormatted.astro'
|
||||
import UserBadge from '../../../components/UserBadge.astro'
|
||||
import {
|
||||
getServiceSuggestionStatusInfo,
|
||||
serviceSuggestionStatuses,
|
||||
@@ -67,8 +68,9 @@ let suggestions = await prisma.serviceSuggestion.findMany({
|
||||
createdAt: true,
|
||||
user: {
|
||||
select: {
|
||||
id: true,
|
||||
displayName: true,
|
||||
name: true,
|
||||
picture: true,
|
||||
},
|
||||
},
|
||||
service: {
|
||||
@@ -120,21 +122,13 @@ let suggestionsWithDetails = suggestions.map((s) => ({
|
||||
}))
|
||||
|
||||
if (sortBy === 'service') {
|
||||
suggestionsWithDetails = lodashOrderBy(
|
||||
suggestionsWithDetails,
|
||||
[(s) => s.service.name.toLowerCase()],
|
||||
[sortOrder]
|
||||
)
|
||||
suggestionsWithDetails = orderBy(suggestionsWithDetails, [(s) => s.service.name.toLowerCase()], [sortOrder])
|
||||
} else if (sortBy === 'status') {
|
||||
suggestionsWithDetails = lodashOrderBy(suggestionsWithDetails, [(s) => s.statusInfo.label], [sortOrder])
|
||||
suggestionsWithDetails = orderBy(suggestionsWithDetails, [(s) => s.statusInfo.label], [sortOrder])
|
||||
} else if (sortBy === 'user') {
|
||||
suggestionsWithDetails = lodashOrderBy(
|
||||
suggestionsWithDetails,
|
||||
[(s) => s.user.name.toLowerCase()],
|
||||
[sortOrder]
|
||||
)
|
||||
suggestionsWithDetails = orderBy(suggestionsWithDetails, [(s) => s.user.name.toLowerCase()], [sortOrder])
|
||||
} else if (sortBy === 'messageCount') {
|
||||
suggestionsWithDetails = lodashOrderBy(suggestionsWithDetails, ['messageCount'], [sortOrder])
|
||||
suggestionsWithDetails = orderBy(suggestionsWithDetails, ['messageCount'], [sortOrder])
|
||||
}
|
||||
|
||||
const suggestionCount = suggestionsWithDetails.length
|
||||
@@ -293,9 +287,7 @@ const makeSortUrl = (slug: string) => {
|
||||
</div>
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
<a href={`/admin/users?name=${suggestion.user.name}`} class="hover:text-green-500">
|
||||
{suggestion.user.name}
|
||||
</a>
|
||||
<UserBadge user={suggestion.user} size="md" />
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
<form method="POST" action={actions.admin.serviceSuggestions.update}>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -64,7 +64,8 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
id="description"
|
||||
required
|
||||
class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
|
||||
></textarea>
|
||||
set:text=""
|
||||
/>
|
||||
{
|
||||
inputErrors.description && (
|
||||
<p class="font-title mt-1 text-sm text-red-500">{inputErrors.description.join(', ')}</p>
|
||||
@@ -80,7 +81,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
name="serviceUrls"
|
||||
id="serviceUrls"
|
||||
rows={3}
|
||||
placeholder="https://example1.com https://example2.com"></textarea>
|
||||
placeholder="https://example1.com https://example2.com"
|
||||
set:text=""
|
||||
/>
|
||||
{
|
||||
inputErrors.serviceUrls && (
|
||||
<p class="font-title mt-1 text-sm text-red-500">{inputErrors.serviceUrls.join(', ')}</p>
|
||||
@@ -96,7 +99,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
name="tosUrls"
|
||||
id="tosUrls"
|
||||
rows={3}
|
||||
placeholder="https://example1.com/tos https://example2.com/tos"></textarea>
|
||||
placeholder="https://example1.com/tos https://example2.com/tos"
|
||||
set:text=""
|
||||
/>
|
||||
{
|
||||
inputErrors.tosUrls && (
|
||||
<p class="font-title mt-1 text-sm text-red-500">{inputErrors.tosUrls.join(', ')}</p>
|
||||
@@ -112,7 +117,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
name="onionUrls"
|
||||
id="onionUrls"
|
||||
rows={3}
|
||||
placeholder="http://example.onion"></textarea>
|
||||
placeholder="http://example.onion"
|
||||
set:text=""
|
||||
/>
|
||||
{
|
||||
inputErrors.onionUrls && (
|
||||
<p class="font-title mt-1 text-sm text-red-500">{inputErrors.onionUrls.join(', ')}</p>
|
||||
@@ -266,7 +273,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
|
||||
name="verificationSummary"
|
||||
id="verificationSummary"
|
||||
rows={3}></textarea>
|
||||
rows={3}
|
||||
set:text=""
|
||||
/>
|
||||
{
|
||||
inputErrors.verificationSummary && (
|
||||
<p class="font-title mt-1 text-sm text-red-500">{inputErrors.verificationSummary.join(', ')}</p>
|
||||
@@ -283,7 +292,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
|
||||
class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
|
||||
name="verificationProofMd"
|
||||
id="verificationProofMd"
|
||||
rows={10}></textarea>
|
||||
rows={10}
|
||||
set:text=""
|
||||
/>
|
||||
{
|
||||
inputErrors.verificationProofMd && (
|
||||
<p class="font-title mt-1 text-sm text-red-500">{inputErrors.verificationProofMd.join(', ')}</p>
|
||||
|
||||
@@ -116,7 +116,7 @@ if (!user) return Astro.rewrite('/404')
|
||||
---
|
||||
|
||||
<BaseLayout
|
||||
pageTitle={`User: ${user.name}`}
|
||||
pageTitle={`${user.displayName ?? user.name} - User`}
|
||||
widthClassName="max-w-screen-lg"
|
||||
className={{ main: 'space-y-24' }}
|
||||
>
|
||||
@@ -306,7 +306,7 @@ if (!user) return Astro.rewrite('/404')
|
||||
</div>
|
||||
|
||||
<div data-note-content>
|
||||
<p class="text-day-200 whitespace-pre-wrap">{note.content}</p>
|
||||
<p class="text-day-200 wrap-anywhere whitespace-pre-wrap" set:text={note.content} />
|
||||
</div>
|
||||
|
||||
<form
|
||||
|
||||
@@ -6,11 +6,13 @@ import { orderBy as lodashOrderBy } from 'lodash-es'
|
||||
import SortArrowIcon from '../../../components/SortArrowIcon.astro'
|
||||
import TimeFormatted from '../../../components/TimeFormatted.astro'
|
||||
import Tooltip from '../../../components/Tooltip.astro'
|
||||
import UserBadge from '../../../components/UserBadge.astro'
|
||||
import BaseLayout from '../../../layouts/BaseLayout.astro'
|
||||
import { zodParseQueryParamsStoringErrors } from '../../../lib/parseUrlFilters'
|
||||
import { pluralize } from '../../../lib/pluralize'
|
||||
import { prisma } from '../../../lib/prisma'
|
||||
import { formatDateShort } from '../../../lib/timeAgo'
|
||||
import { urlWithParams } from '../../../lib/urls'
|
||||
|
||||
import type { Prisma } from '@prisma/client'
|
||||
|
||||
@@ -74,6 +76,8 @@ const dbUsers = await prisma.user.findMany({
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
displayName: true,
|
||||
picture: true,
|
||||
verified: true,
|
||||
admin: true,
|
||||
verifier: true,
|
||||
@@ -103,14 +107,11 @@ const users =
|
||||
? lodashOrderBy(dbUsers, [(u) => (u.admin ? 'admin' : 'user')], [filters['sort-order']])
|
||||
: dbUsers
|
||||
|
||||
const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
const currentSortBy = filters['sort-by']
|
||||
const currentSortOrder = filters['sort-order']
|
||||
const newSortOrder = currentSortBy === slug && currentSortOrder === 'asc' ? 'desc' : 'asc'
|
||||
const searchParams = new URLSearchParams(Astro.url.search)
|
||||
searchParams.set('sort-by', slug)
|
||||
searchParams.set('sort-order', newSortOrder)
|
||||
return `/admin/users?${searchParams.toString()}`
|
||||
const makeSortUrl = (sortBy: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
return urlWithParams(Astro.url, {
|
||||
'sort-by': sortBy,
|
||||
'sort-order': filters['sort-by'] === sortBy && filters['sort-order'] === 'asc' ? 'desc' : 'asc',
|
||||
})
|
||||
}
|
||||
---
|
||||
|
||||
@@ -241,10 +242,10 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
class={`group hover:bg-zinc-700/30 ${user.spammer ? 'bg-red-900/10' : ''}`}
|
||||
>
|
||||
<td class="px-4 py-3 text-sm font-medium text-zinc-200">
|
||||
<div>{user.name}</div>
|
||||
<UserBadge user={user} size="md" class="flex text-white" />
|
||||
{user.internalNotes.length > 0 && (
|
||||
<Tooltip
|
||||
class="text-2xs mt-1 text-yellow-400"
|
||||
class="text-2xs font-light text-yellow-200/40"
|
||||
position="right"
|
||||
text={user.internalNotes
|
||||
.map(
|
||||
@@ -257,7 +258,7 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
)
|
||||
.join('\n\n')}
|
||||
>
|
||||
<Icon name="ri:sticky-note-line" class="mr-1 inline-block size-3" />
|
||||
<Icon name="ri:sticky-note-line" class="mr-0.5 inline-block size-3" />
|
||||
{user.internalNotes.length} internal {pluralize('note', user.internalNotes.length)}
|
||||
</Tooltip>
|
||||
)}
|
||||
|
||||
@@ -169,7 +169,7 @@ const createUrlWithoutFilter = (paramName: keyof typeof params) => {
|
||||
'[&:has(~[data-has-default-filters="true"])_[data-clear-filters-button]]:hidden'
|
||||
)}
|
||||
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-select="#events-list-container"
|
||||
hx-swap="outerHTML"
|
||||
|
||||
16
web/src/pages/health.ts
Normal file
16
web/src/pages/health.ts
Normal 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',
|
||||
},
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -1,14 +1,16 @@
|
||||
---
|
||||
import { ServiceVisibility } from '@prisma/client'
|
||||
import { z } from 'astro:schema'
|
||||
import { groupBy, orderBy } from 'lodash-es'
|
||||
import { groupBy, omit, orderBy, uniq } from 'lodash-es'
|
||||
import seedrandom from 'seedrandom'
|
||||
|
||||
import Button from '../components/Button.astro'
|
||||
import InputText from '../components/InputText.astro'
|
||||
import Pagination from '../components/Pagination.astro'
|
||||
import ServiceFiltersPill from '../components/ServiceFiltersPill.astro'
|
||||
import ServicesFilters from '../components/ServicesFilters.astro'
|
||||
import ServicesSearchResults from '../components/ServicesSearchResults.astro'
|
||||
import { getAttributeCategoryInfo } from '../constants/attributeCategories'
|
||||
import { getAttributeTypeInfo } from '../constants/attributeTypes'
|
||||
import {
|
||||
currencies,
|
||||
@@ -26,6 +28,7 @@ import {
|
||||
import BaseLayout from '../layouts/BaseLayout.astro'
|
||||
import { areEqualArraysWithoutOrder, zodEnumFromConstant } from '../lib/arrays'
|
||||
import { parseIntWithFallback } from '../lib/numbers'
|
||||
import { areEqualObjectsWithoutOrder } from '../lib/objects'
|
||||
import { zodParseQueryParamsStoringErrors } from '../lib/parseUrlFilters'
|
||||
import { prisma } from '../lib/prisma'
|
||||
import { makeSortSeed } from '../lib/sortSeed'
|
||||
@@ -130,9 +133,12 @@ const attributeOptions = [
|
||||
prefix: string
|
||||
}[]
|
||||
|
||||
const ignoredKeysForDefaultData = ['sort-seed']
|
||||
|
||||
const {
|
||||
data: filters,
|
||||
hasDefaultData: hasDefaultFilters,
|
||||
defaultData: defaultFilters,
|
||||
redirectUrl,
|
||||
} = zodParseQueryParamsStoringErrors(
|
||||
{
|
||||
@@ -164,7 +170,7 @@ const {
|
||||
},
|
||||
Astro,
|
||||
{
|
||||
ignoredKeysForDefaultData: ['sort-seed'],
|
||||
ignoredKeysForDefaultData,
|
||||
cleanUrl: {
|
||||
removeUneededObjectParams: true,
|
||||
removeParams: {
|
||||
@@ -181,11 +187,130 @@ const {
|
||||
}
|
||||
)
|
||||
|
||||
const hasDefaultFiltersIgnoringQ = areEqualObjectsWithoutOrder(
|
||||
omit(filters, [...ignoredKeysForDefaultData, 'q']),
|
||||
omit(defaultFilters, [...ignoredKeysForDefaultData, 'q'])
|
||||
)
|
||||
|
||||
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
|
||||
|
||||
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([
|
||||
[
|
||||
'Unable to load category filters.',
|
||||
@@ -206,146 +331,16 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
|
||||
[
|
||||
'Unable to load services.',
|
||||
async () => {
|
||||
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: 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({
|
||||
const [unsortedServices, totalServices] = await prisma.service.findManyAndCount({
|
||||
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 selectedSort = sortOptions.find((sort) => sort.value === filters.sort) ?? defaultSortOption
|
||||
@@ -405,39 +400,56 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
|
||||
[selectedSort.orderBy.direction, 'asc']
|
||||
)
|
||||
|
||||
return [sortedServicesWithInfo, totalServices, hadToIncludeCommunityContributed] as const
|
||||
return [sortedServicesWithInfo, totalServices] as const
|
||||
},
|
||||
[[] as [], 0, false] as const,
|
||||
],
|
||||
])
|
||||
|
||||
const attributes = await Astro.locals.banners.try(
|
||||
'Unable to load attribute filters.',
|
||||
() =>
|
||||
prisma.attribute.findMany({
|
||||
select: {
|
||||
id: true,
|
||||
slug: true,
|
||||
title: true,
|
||||
category: true,
|
||||
type: true,
|
||||
_count: {
|
||||
[
|
||||
'Unable to load count if including community.',
|
||||
() =>
|
||||
areEqualArraysWithoutOrder(filters.verification, ['VERIFICATION_SUCCESS', 'APPROVED']) ||
|
||||
areEqualArraysWithoutOrder(filters.verification, [
|
||||
'VERIFICATION_SUCCESS',
|
||||
'APPROVED',
|
||||
'VERIFICATION_FAILED',
|
||||
])
|
||||
? prisma.service.count({
|
||||
where: {
|
||||
...where,
|
||||
verificationStatus: 'COMMUNITY_CONTRIBUTED',
|
||||
},
|
||||
})
|
||||
: null,
|
||||
null,
|
||||
],
|
||||
[
|
||||
'Unable to load attribute filters.',
|
||||
() =>
|
||||
prisma.attribute.findMany({
|
||||
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(
|
||||
Object.entries(
|
||||
groupBy(
|
||||
attributes.map((attr) => {
|
||||
return {
|
||||
info: getAttributeTypeInfo(attr.type),
|
||||
typeInfo: getAttributeTypeInfo(attr.type),
|
||||
...attr,
|
||||
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
|
||||
value: filters.attr?.[attr.id] || undefined,
|
||||
@@ -447,6 +459,7 @@ const attributesByCategory = orderBy(
|
||||
)
|
||||
).map(([category, attributes]) => ({
|
||||
category,
|
||||
categoryInfo: getAttributeCategoryInfo(category),
|
||||
attributes: orderBy(
|
||||
attributes,
|
||||
['value', 'type', '_count.services', 'title'],
|
||||
@@ -488,7 +501,8 @@ const filtersOptions = {
|
||||
|
||||
export type ServicesFiltersOptions = typeof filtersOptions
|
||||
|
||||
//
|
||||
const searchResultsId = 'search-results'
|
||||
const showFiltersId = 'show-filters'
|
||||
---
|
||||
|
||||
<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'
|
||||
>
|
||||
{
|
||||
!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">
|
||||
{filters.q && (
|
||||
<ServiceFiltersPill text={`"${filters.q}"`} searchParamName="q" searchParamValue={filters.q} />
|
||||
@@ -618,12 +658,19 @@ export type ServicesFiltersOptions = typeof filtersOptions
|
||||
)
|
||||
})}
|
||||
</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>
|
||||
|
||||
<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"
|
||||
>
|
||||
<ServicesFilters
|
||||
searchResultsId="search-results"
|
||||
showFiltersId="show-filters"
|
||||
searchResultsId={searchResultsId}
|
||||
showFiltersId={showFiltersId}
|
||||
filters={{
|
||||
...filters,
|
||||
'sort-seed': makeSortSeed(),
|
||||
@@ -656,7 +703,9 @@ export type ServicesFiltersOptions = typeof filtersOptions
|
||||
pageSize={PAGE_SIZE}
|
||||
sortSeed={filters['sort-seed']}
|
||||
filters={filters}
|
||||
hadToIncludeCommunityContributed={hadToIncludeCommunityContributed}
|
||||
includeScams={includeScams}
|
||||
countCommunityOnly={countCommunityOnly}
|
||||
inlineIcons
|
||||
/>
|
||||
</div>
|
||||
{
|
||||
|
||||
@@ -124,6 +124,13 @@ const [dbNotifications, notificationPreferences, totalNotifications] = await Ast
|
||||
verificationStatus: true,
|
||||
},
|
||||
},
|
||||
aboutKarmaTransaction: {
|
||||
select: {
|
||||
points: true,
|
||||
action: true,
|
||||
description: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
}),
|
||||
[],
|
||||
@@ -136,6 +143,7 @@ const [dbNotifications, notificationPreferences, totalNotifications] = await Ast
|
||||
enableOnMyCommentStatusChange: true,
|
||||
enableAutowatchMyComments: true,
|
||||
enableNotifyPendingRepliesOnWatch: true,
|
||||
karmaNotificationThreshold: true,
|
||||
}),
|
||||
null,
|
||||
],
|
||||
@@ -232,7 +240,7 @@ const notifications = dbNotifications.map((notification) => ({
|
||||
|
||||
<div>
|
||||
<div class="font-medium text-zinc-200">{notification.title}</div>
|
||||
<p class="text-sm text-zinc-400">{notification.content}</p>
|
||||
<p class="text-sm wrap-anywhere text-zinc-400">{notification.content}</p>
|
||||
<div class="mt-1 text-xs text-zinc-500">
|
||||
<TimeFormatted date={notification.createdAt} prefix={false} caseType="sentence" />
|
||||
</div>
|
||||
@@ -326,6 +334,23 @@ const notifications = dbNotifications.map((notification) => ({
|
||||
</label>
|
||||
))}
|
||||
|
||||
<div class="mt-4 flex items-center justify-between rounded-md p-2 transition-colors duration-200 hover:bg-zinc-800">
|
||||
<span class="flex items-center text-zinc-300">
|
||||
<Icon name="ri:award-line" class="mr-2 size-5 text-zinc-400" />
|
||||
Notify me when my karma changes by at least
|
||||
</span>
|
||||
<div class="flex items-center gap-2">
|
||||
<input
|
||||
type="number"
|
||||
name="karmaNotificationThreshold"
|
||||
value={notificationPreferences.karmaNotificationThreshold}
|
||||
min="1"
|
||||
class="w-20 rounded border border-zinc-700 bg-zinc-800 px-2 py-1 text-zinc-200 focus:border-blue-600 focus:ring-1 focus:ring-blue-600 focus:outline-none"
|
||||
/>
|
||||
<span class="text-zinc-400">points</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mt-4 flex justify-end">
|
||||
<Button type="submit" label="Save" icon="ri:save-line" color="success" />
|
||||
</div>
|
||||
|
||||
@@ -149,9 +149,13 @@ const statusInfo = getServiceSuggestionStatusInfo(serviceSuggestion.status)
|
||||
|
||||
<div class="mt-6">
|
||||
<div class="text-day-200 mb-2 text-sm">Notes for moderators:</div>
|
||||
<div class="text-sm whitespace-pre-wrap">
|
||||
{serviceSuggestion.notes ?? <span class="italic">Empty</span>}
|
||||
</div>
|
||||
{
|
||||
serviceSuggestion.notes ? (
|
||||
<div class="text-sm wrap-anywhere whitespace-pre-wrap" set:text={serviceSuggestion.notes} />
|
||||
) : (
|
||||
<span class="text-sm italic">Empty</span>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ import Tooltip from '../../components/Tooltip.astro'
|
||||
import VerificationWarningBanner from '../../components/VerificationWarningBanner.astro'
|
||||
import { getAttributeCategoryInfo } from '../../constants/attributeCategories'
|
||||
import { getAttributeTypeInfo } from '../../constants/attributeTypes'
|
||||
import { formatContactMethod } from '../../constants/contactMethods'
|
||||
import { currencies, getCurrencyInfo } from '../../constants/currencies'
|
||||
import { getEventTypeInfo } from '../../constants/eventTypes'
|
||||
import { getKycLevelInfo, kycLevels } from '../../constants/kycLevels'
|
||||
@@ -37,7 +38,6 @@ import BaseLayout from '../../layouts/BaseLayout.astro'
|
||||
import { someButNotAll, undefinedIfEmpty } from '../../lib/arrays'
|
||||
import { makeNonDbAttributes, sortAttributes } from '../../lib/attributes'
|
||||
import { cn } from '../../lib/cn'
|
||||
import { formatContactMethod } from '../../lib/contactMethods'
|
||||
import { getOrCreateNotificationPreferences } from '../../lib/notificationPreferences'
|
||||
import { formatNumber, type FormatNumberOptions } from '../../lib/numbers'
|
||||
import { pluralize } from '../../lib/pluralize'
|
||||
@@ -95,8 +95,8 @@ const [service, dbNotificationPreferences] = await Astro.locals.banners.tryMany(
|
||||
isRecentlyListed: true,
|
||||
contactMethods: {
|
||||
select: {
|
||||
iconId: true,
|
||||
value: true,
|
||||
label: true,
|
||||
},
|
||||
},
|
||||
attributes: {
|
||||
@@ -379,20 +379,22 @@ const ogImageTemplateData = {
|
||||
service.contactMethods
|
||||
.map((method) => ({
|
||||
...method,
|
||||
...(formatContactMethod(method.value) ?? { type: 'unknown', formattedValue: method.value }),
|
||||
info: formatContactMethod(method.value),
|
||||
}))
|
||||
.map<ContactPoint | null>(({ type, formattedValue }) => {
|
||||
switch (type) {
|
||||
.map<ContactPoint | null>(({ info, label }) => {
|
||||
switch (info.type) {
|
||||
case 'telephone': {
|
||||
return {
|
||||
'@type': 'ContactPoint',
|
||||
telephone: formattedValue,
|
||||
telephone: info.formattedValue,
|
||||
name: label ?? info.label,
|
||||
}
|
||||
}
|
||||
case 'email': {
|
||||
return {
|
||||
'@type': 'ContactPoint',
|
||||
email: formattedValue,
|
||||
email: info.formattedValue,
|
||||
name: label ?? info.label,
|
||||
}
|
||||
}
|
||||
default: {
|
||||
@@ -467,17 +469,6 @@ const ogImageTemplateData = {
|
||||
}
|
||||
<VerificationWarningBanner service={service} />
|
||||
|
||||
{
|
||||
service.verificationSteps.some((step) => step.status === VerificationStepStatus.FAILED) && (
|
||||
<div class="mb-4 flex items-center gap-2 rounded-md bg-red-900/50 p-2 text-sm text-red-300">
|
||||
<Icon name="ri:error-warning-line" class="inline-block size-4 shrink-0" />
|
||||
<span>
|
||||
This service has failed one or more verification steps. Review the verification details carefully.
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
<div class="flex items-center gap-4">
|
||||
{
|
||||
!!service.imageUrl && (
|
||||
@@ -741,8 +732,8 @@ const ogImageTemplateData = {
|
||||
rel="noopener noreferrer"
|
||||
class="text-day-300 hover:text-day-200 flex items-center gap-1 px-2 py-1 hover:underline"
|
||||
>
|
||||
<Icon name={method.iconId} class="text-day-200 h-5 w-5" />
|
||||
<span>{methodInfo?.formattedValue ?? method.value}</span>
|
||||
<Icon name={methodInfo.icon} class="text-day-200 h-5 w-5" />
|
||||
<span>{method.label ?? methodInfo.formattedValue}</span>
|
||||
</a>
|
||||
</li>
|
||||
)
|
||||
|
||||
@@ -10,6 +10,7 @@ import InputTextArea from '../../components/InputTextArea.astro'
|
||||
import MyPicture from '../../components/MyPicture.astro'
|
||||
import TimeFormatted from '../../components/TimeFormatted.astro'
|
||||
import Tooltip from '../../components/Tooltip.astro'
|
||||
import UserBadge from '../../components/UserBadge.astro'
|
||||
import { getKarmaTransactionActionInfo } from '../../constants/karmaTransactionActions'
|
||||
import { karmaUnlocks } from '../../constants/karmaUnlocks'
|
||||
import { SUPPORT_EMAIL } from '../../constants/project'
|
||||
@@ -64,6 +65,7 @@ const user = await Astro.locals.banners.try('user', async () => {
|
||||
select: {
|
||||
name: true,
|
||||
displayName: true,
|
||||
picture: true,
|
||||
},
|
||||
},
|
||||
comment: {
|
||||
@@ -175,8 +177,8 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
---
|
||||
|
||||
<BaseLayout
|
||||
pageTitle={`${user.name} - Account`}
|
||||
description="Manage your user profile"
|
||||
pageTitle={`${user.displayName ?? user.name} - User Profile`}
|
||||
description={`User profile page of ${user.displayName ?? user.name} in KYCnot.me`}
|
||||
ogImage={{
|
||||
template: 'generic',
|
||||
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
|
||||
@@ -204,7 +206,7 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
image: user.picture ?? undefined,
|
||||
url: new URL(`/u/${user.name}`, Astro.url).href,
|
||||
sameAs: user.link ? [user.link] : undefined,
|
||||
description: `User account for ${user.displayName ?? user.name} on KYCnot.me`,
|
||||
description: `User profile page for ${user.displayName ?? user.name} on KYCnot.me`,
|
||||
identifier: [user.name, user.id.toString()],
|
||||
jobTitle: user.admin ? 'Administrator' : user.verifier ? 'Moderator' : undefined,
|
||||
memberOf: KYCNOTME_SCHEMA_MINI,
|
||||
@@ -240,53 +242,55 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
]}
|
||||
>
|
||||
<section class="border-night-400 bg-night-400/5 rounded-lg border p-6 shadow-sm backdrop-blur-xs">
|
||||
<header class="flex items-center gap-4">
|
||||
{
|
||||
user.picture ? (
|
||||
<MyPicture
|
||||
src={user.picture}
|
||||
alt=""
|
||||
class="ring-day-500/30 size-16 rounded-full ring-2"
|
||||
width={64}
|
||||
height={64}
|
||||
/>
|
||||
) : (
|
||||
<div class="bg-day-500/10 ring-day-500/30 text-day-400 flex size-16 items-center justify-center rounded-full ring-2">
|
||||
<Icon name="ri:user-3-line" class="size-8" />
|
||||
<header class="flex flex-wrap items-center justify-center gap-4">
|
||||
<div class="flex grow flex-wrap items-center justify-center gap-4">
|
||||
{
|
||||
user.picture ? (
|
||||
<MyPicture
|
||||
src={user.picture}
|
||||
alt=""
|
||||
class="ring-day-500/30 xs:size-14 size-12 rounded-full ring-2 sm:size-16"
|
||||
width={64}
|
||||
height={64}
|
||||
/>
|
||||
) : (
|
||||
<div class="bg-day-500/10 ring-day-500/30 text-day-400 flex size-16 items-center justify-center rounded-full ring-2">
|
||||
<Icon name="ri:user-3-line" class="size-8" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
<div class="grow">
|
||||
<h1 class="font-title text-lg font-bold tracking-wider text-white">
|
||||
{user.displayName ?? user.name}
|
||||
{isCurrentUser && <span class="text-day-500 font-normal">(You)</span>}
|
||||
</h1>
|
||||
{user.displayName && <p class="text-day-200 font-title">{user.name}</p>}
|
||||
<div class="mt-1 flex gap-2">
|
||||
{
|
||||
user.admin && (
|
||||
<span class="rounded-full border border-red-500/50 bg-red-500/20 px-2 py-0.5 text-xs text-red-400">
|
||||
admin
|
||||
</span>
|
||||
)
|
||||
}
|
||||
{
|
||||
user.verified && (
|
||||
<span class="rounded-full border border-blue-500/50 bg-blue-500/20 px-2 py-0.5 text-xs text-blue-400">
|
||||
verified
|
||||
</span>
|
||||
)
|
||||
}
|
||||
{
|
||||
user.verifier && (
|
||||
<span class="rounded-full border border-green-500/50 bg-green-500/20 px-2 py-0.5 text-xs text-green-400">
|
||||
verifier
|
||||
</span>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
<div>
|
||||
<h1 class="font-title text-lg font-bold tracking-wider text-white">
|
||||
{user.name}
|
||||
{isCurrentUser && <span class="text-day-500 font-normal">(You)</span>}
|
||||
</h1>
|
||||
{user.displayName && <p class="text-day-200">{user.displayName}</p>}
|
||||
<div class="mt-1 flex gap-2">
|
||||
{
|
||||
user.admin && (
|
||||
<span class="rounded-full border border-red-500/50 bg-red-500/20 px-2 py-0.5 text-xs text-red-400">
|
||||
admin
|
||||
</span>
|
||||
)
|
||||
}
|
||||
{
|
||||
user.verified && (
|
||||
<span class="rounded-full border border-blue-500/50 bg-blue-500/20 px-2 py-0.5 text-xs text-blue-400">
|
||||
verified
|
||||
</span>
|
||||
)
|
||||
}
|
||||
{
|
||||
user.verifier && (
|
||||
<span class="rounded-full border border-green-500/50 bg-green-500/20 px-2 py-0.5 text-xs text-green-400">
|
||||
verifier
|
||||
</span>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
<nav class="ml-auto flex items-center gap-2">
|
||||
<nav class="flex items-center gap-2">
|
||||
<AdminOnly>
|
||||
<Tooltip
|
||||
as="a"
|
||||
@@ -321,7 +325,7 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
)
|
||||
}
|
||||
<a
|
||||
href={`mailto:${SUPPORT_EMAIL}`}
|
||||
href={`mailto:${SUPPORT_EMAIL}?subject=User report - ${user.displayName ?? user.name}&body=${Astro.locals.user ? `I'm ${Astro.locals.user.displayName ? `${Astro.locals.user.displayName} (${Astro.locals.user.name})` : user.name}. ` : ''}I'm reporting the user ${user.displayName ? `"${user.displayName}" (${user.name})` : `"${user.name}"`} because...`}
|
||||
class="inline-flex items-center gap-1 rounded-md border border-red-500/30 bg-red-500/10 px-3 py-1.5 text-sm text-red-400 shadow-xs transition-colors duration-200 hover:bg-red-500/20 focus:ring-2 focus:ring-red-500 focus:ring-offset-2 focus:ring-offset-black focus:outline-hidden"
|
||||
>
|
||||
<Icon name="ri:alert-line" class="size-4" /> Report
|
||||
@@ -521,7 +525,7 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
<TimeFormatted date={note.createdAt} hourPrecision />
|
||||
</span>
|
||||
</div>
|
||||
<div class="text-day-200 whitespace-pre-wrap">{note.content}</div>
|
||||
<div class="text-day-200 wrap-anywhere whitespace-pre-wrap" set:text={note.content} />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
@@ -630,77 +634,38 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
<div class="space-y-3">
|
||||
<h3 class="font-title border-day-700/20 text-day-200 border-b pb-2 text-sm">Positive unlocks</h3>
|
||||
<input type="checkbox" id="positive-unlocks-toggle" class="peer sr-only md:hidden" checked />
|
||||
<label
|
||||
for="positive-unlocks-toggle"
|
||||
class="flex cursor-pointer items-center justify-between border-b border-green-500/20 pb-2 md:cursor-default peer-checked:[&_[data-expand-arrow]]:rotate-180"
|
||||
>
|
||||
<h3 class="font-title text-day-200 text-sm">Positive unlocks</h3>
|
||||
<Icon name="ri:arrow-down-s-line" class="text-day-400 size-5 md:hidden" data-expand-arrow />
|
||||
</label>
|
||||
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma >= 0),
|
||||
'karma'
|
||||
).map((unlock) => (
|
||||
<div
|
||||
class={cn(
|
||||
'flex items-center justify-between rounded-md border p-3',
|
||||
user.karmaUnlocks[unlock.id]
|
||||
? 'border-green-500/30 bg-green-500/10'
|
||||
: 'border-night-500 bg-night-800'
|
||||
)}
|
||||
>
|
||||
<div class="flex items-center">
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-day-400' : 'text-day-500')}>
|
||||
<Icon name={unlock.icon} class="size-5" />
|
||||
</span>
|
||||
<div>
|
||||
<p
|
||||
class={cn('font-medium', user.karmaUnlocks[unlock.id] ? 'text-day-300' : 'text-day-400')}
|
||||
>
|
||||
{unlock.name}
|
||||
</p>
|
||||
<p class="text-day-500 text-sm">{unlock.karma.toLocaleString()} karma</p>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
{user.karmaUnlocks[unlock.id] ? (
|
||||
<span class="bg-day-500/20 text-day-300 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:check-line" class="mr-1 size-3" /> Unlocked
|
||||
</span>
|
||||
) : (
|
||||
<span class="bg-night-800 text-day-400 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:lock-line" class="mr-1 size-3" /> Locked
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<h3 class="font-title border-b border-red-500/20 pb-2 text-sm text-red-400">Negative unlocks</h3>
|
||||
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma < 0),
|
||||
'karma'
|
||||
)
|
||||
.reverse()
|
||||
.map((unlock) => (
|
||||
<div class="mt-3 hidden space-y-3 peer-checked:block md:block">
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma >= 0),
|
||||
'karma'
|
||||
).map((unlock) => (
|
||||
<div
|
||||
class={cn(
|
||||
'flex items-center justify-between rounded-md border p-3',
|
||||
user.karmaUnlocks[unlock.id]
|
||||
? 'border-red-500/30 bg-red-500/10'
|
||||
? 'border-green-500/30 bg-green-500/10'
|
||||
: 'border-night-500 bg-night-800'
|
||||
)}
|
||||
>
|
||||
<div class="flex items-center">
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-500')}>
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-day-400' : 'text-day-500')}>
|
||||
<Icon name={unlock.icon} class="size-5" />
|
||||
</span>
|
||||
<div>
|
||||
<p
|
||||
class={cn(
|
||||
'font-medium',
|
||||
user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-400'
|
||||
user.karmaUnlocks[unlock.id] ? 'text-day-300' : 'text-day-400'
|
||||
)}
|
||||
>
|
||||
{unlock.name}
|
||||
@@ -710,24 +675,85 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
</div>
|
||||
<div>
|
||||
{user.karmaUnlocks[unlock.id] ? (
|
||||
<span class="inline-flex items-center rounded-full bg-red-500/20 px-2 py-1 text-xs text-red-400">
|
||||
<Icon name="ri:alert-line" class="mr-1 size-3" /> Active
|
||||
<span class="bg-day-500/20 text-day-300 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:check-line" class="mr-1 size-3" /> Unlocked
|
||||
</span>
|
||||
) : (
|
||||
<span class="bg-night-800 text-day-400 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:shield-check-line" class="mr-1 size-3" /> Avoided
|
||||
<Icon name="ri:lock-line" class="mr-1 size-3" /> Locked
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
}
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="text-day-400 border-night-500/30 bg-night-800/70 mt-4 rounded-md border p-3 text-xs">
|
||||
<Icon name="ri:information-line" class="inline-block size-4" />
|
||||
Negative karma leads to restrictions. <br class="hidden sm:block" />Keep interactions positive to
|
||||
avoid penalties.
|
||||
</p>
|
||||
<div class="space-y-3">
|
||||
<input type="checkbox" id="negative-unlocks-toggle" class="peer sr-only md:hidden" />
|
||||
|
||||
<label
|
||||
for="negative-unlocks-toggle"
|
||||
class="flex cursor-pointer items-center justify-between border-b border-red-500/20 pb-2 md:cursor-default peer-checked:[&_[data-expand-arrow]]:rotate-180"
|
||||
>
|
||||
<h3 class="font-title text-sm text-red-400">Negative unlocks</h3>
|
||||
<Icon name="ri:arrow-down-s-line" class="text-day-400 size-5 md:hidden" data-expand-arrow />
|
||||
</label>
|
||||
|
||||
<div class="mt-3 hidden space-y-3 peer-checked:block md:block">
|
||||
{
|
||||
sortBy(
|
||||
karmaUnlocks.filter((unlock) => unlock.karma < 0),
|
||||
'karma'
|
||||
)
|
||||
.reverse()
|
||||
.map((unlock) => (
|
||||
<div
|
||||
class={cn(
|
||||
'flex items-center justify-between rounded-md border p-3',
|
||||
user.karmaUnlocks[unlock.id]
|
||||
? 'border-red-500/30 bg-red-500/10'
|
||||
: 'border-night-500 bg-night-800'
|
||||
)}
|
||||
>
|
||||
<div class="flex items-center">
|
||||
<span class={cn('mr-3', user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-500')}>
|
||||
<Icon name={unlock.icon} class="size-5" />
|
||||
</span>
|
||||
<div>
|
||||
<p
|
||||
class={cn(
|
||||
'font-medium',
|
||||
user.karmaUnlocks[unlock.id] ? 'text-red-400' : 'text-day-400'
|
||||
)}
|
||||
>
|
||||
{unlock.name}
|
||||
</p>
|
||||
<p class="text-day-500 text-sm">{unlock.karma.toLocaleString()} karma</p>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
{user.karmaUnlocks[unlock.id] ? (
|
||||
<span class="inline-flex items-center rounded-full bg-red-500/20 px-2 py-1 text-xs text-red-400">
|
||||
<Icon name="ri:alert-line" class="mr-1 size-3" /> Active
|
||||
</span>
|
||||
) : (
|
||||
<span class="bg-night-800 text-day-400 inline-flex items-center rounded-full px-2 py-1 text-xs">
|
||||
<Icon name="ri:shield-check-line" class="mr-1 size-3" /> Avoided
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
}
|
||||
|
||||
<p class="text-day-400 border-night-500/30 bg-night-800/70 mt-4 rounded-md border p-3 text-xs">
|
||||
<Icon name="ri:information-line" class="inline-block size-4" />
|
||||
Negative karma leads to restrictions. <br class="hidden sm:block" />Keep interactions positive to
|
||||
avoid penalties.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -978,13 +1004,10 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
|
||||
<Icon name={actionInfo.icon} class="size-4" />
|
||||
{actionInfo.label}
|
||||
{transaction.action === 'MANUAL_ADJUSTMENT' && transaction.grantedBy && (
|
||||
<a
|
||||
href={`/u/${transaction.grantedBy.name}`}
|
||||
class="text-day-500 ml-1 hover:underline"
|
||||
>
|
||||
{/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
|
||||
by {transaction.grantedBy.displayName || transaction.grantedBy.name}
|
||||
</a>
|
||||
<>
|
||||
<span class="text-day-500">from</span>
|
||||
<UserBadge user={transaction.grantedBy} size="sm" class="text-day-500" />
|
||||
</>
|
||||
)}
|
||||
</span>
|
||||
</td>
|
||||
|
||||
@@ -93,15 +93,30 @@
|
||||
--color-night-950: oklch(11.97% 0.004 145.32);
|
||||
}
|
||||
|
||||
@layer utilities {
|
||||
.text-shadow-glow {
|
||||
text-shadow:
|
||||
0 0 16px color-mix(in oklab, currentColor 30%, transparent),
|
||||
0 0 4px color-mix(in oklab, currentColor 60%, transparent);
|
||||
@utility text-shadow-glow {
|
||||
text-shadow:
|
||||
0 0 16px color-mix(in oklab, currentColor 30%, transparent),
|
||||
0 0 4px color-mix(in oklab, currentColor 60%, transparent);
|
||||
}
|
||||
@utility drop-shadow-glow {
|
||||
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));
|
||||
}
|
||||
|
||||
@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;
|
||||
}
|
||||
.drop-shadow-glow {
|
||||
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));
|
||||
}
|
||||
|
||||
@theme {
|
||||
--animate-text-gradient: text-gradient 4s linear 0s infinite normal forwards running;
|
||||
|
||||
@keyframes text-gradient {
|
||||
to {
|
||||
background-position: -200%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user