donation component

.cursorrules

@@ -143,7 +143,12 @@
   <BaseLayout
     pageTitle="Edit service"
     description="Suggest an edit to service"
-    ogImage={{ template: 'generic', title: 'Edit service' }}
+    ogImage={{
+      template: 'generic',
+      title: 'Edit service',
+      description: 'Suggest an edit to service',
+      icon: 'ri:edit-line',
+    }}
     widthClassName="max-w-screen-md"
   >
     <h1 class="font-title mt-12 mb-6 text-center text-3xl font-bold">Edit service</h1>

pyworker/pyworker/scheduler.py

@@ -126,9 +126,9 @@ class TaskScheduler:
                     self.logger.info(f"Running task '{task_name}'")
                     # Use task instance as a context manager to ensure
                     # a single database connection is used for the entire task
-                    with task_info["instance"] as task_instance:
+                    with task_info["instance"]:
-                        # Execute the task instance's run method directly
+                        # Execute the registered task function with its arguments
-                        task_instance.run()
+                        task_info["func"](*task_info["args"], **task_info["kwargs"])
                     self.logger.info(f"Task '{task_name}' completed")
                 except Exception as e:
                     self.logger.exception(f"Error running task '{task_name}': {e}")

web/astro.config.mjs

@@ -42,6 +42,10 @@ export default defineConfig({
     open: false,
     allowedHosts: [new URL(SITE_URL).hostname],
   },
+  image: {
+    domains: [new URL(SITE_URL).hostname],
+    remotePatterns: [{ protocol: 'https' }],
+  },
   redirects: {
     // #region Redirects from old website
     '/pending': '/?verification=verified&verification=approved&verification=community',

web/package.json

@@ -27,6 +27,7 @@
     "@astrojs/sitemap": "3.4.0",
     "@fontsource-variable/space-grotesk": "5.2.7",
     "@fontsource/inter": "5.2.5",
+    "@fontsource/space-grotesk": "5.2.7",
     "@prisma/client": "6.8.2",
     "@tailwindcss/vite": "4.1.7",
     "@types/mime-types": "2.1.4",
@@ -43,10 +44,12 @@
     "lodash-es": "4.17.21",
     "mime-types": "3.0.1",
     "object-to-formdata": "4.5.1",
+    "qrcode": "1.5.4",
     "react": "19.1.0",
     "redis": "5.0.1",
     "schema-dts": "1.1.5",
     "seedrandom": "3.0.5",
+    "sharp": "0.34.1",
     "slugify": "1.6.6",
     "tailwind-merge": "3.3.0",
     "tailwind-variants": "1.0.0",
@@ -66,6 +69,7 @@
     "@tailwindcss/typography": "0.5.16",
     "@types/eslint__js": "9.14.0",
     "@types/lodash-es": "4.17.12",
+    "@types/qrcode": "1.5.5",
     "@types/react": "19.1.4",
     "@types/seedrandom": "3.0.8",
     "@typescript-eslint/parser": "8.32.1",

web/prisma/triggers/01_karma_tx.sql

@@ -8,6 +8,7 @@ DROP TRIGGER IF EXISTS comment_suspicious_change_trigger ON "Comment";
 DROP TRIGGER IF EXISTS comment_upvote_change_trigger ON "Comment";
 DROP TRIGGER IF EXISTS comment_vote_change_trigger ON "CommentVote";
 DROP TRIGGER IF EXISTS suggestion_status_change_trigger ON "ServiceSuggestion";
+DROP TRIGGER IF EXISTS manual_karma_adjustment_trigger ON "KarmaTransaction";
 
 -- Drop existing functions
 DROP FUNCTION IF EXISTS handle_comment_upvote_change();
@@ -19,26 +20,30 @@ DROP FUNCTION IF EXISTS handle_comment_vote_change();
 DROP FUNCTION IF EXISTS insert_karma_transaction();
 DROP FUNCTION IF EXISTS update_user_karma();
 DROP FUNCTION IF EXISTS handle_suggestion_status_change();
+DROP FUNCTION IF EXISTS handle_manual_karma_adjustment();
 
 -- Helper function to insert karma transaction
 CREATE OR REPLACE FUNCTION insert_karma_transaction(
     p_user_id INT,
     p_points INT,
-    p_action "KarmaTransactionAction",
+    p_action TEXT,
     p_comment_id INT,
     p_description TEXT,
     p_suggestion_id INT DEFAULT NULL
 ) RETURNS VOID AS $$
 BEGIN
     INSERT INTO "KarmaTransaction" (
-        "userId", "points", "action", "commentId", 
+        "userId", "points", "action", "commentId", "suggestionId", "description", "processed", "createdAt"
-        "suggestionId",
+    )
-        "description", "processed", "createdAt"
-    ) 
     VALUES (
-        p_user_id, p_points, p_action, p_comment_id, 
+        p_user_id,
+        p_points,
+        p_action::"KarmaTransactionAction",
+        p_comment_id,
         p_suggestion_id,
-        p_description, true, NOW()
+        p_description,
+        true,
+        NOW()
     );
 END;
 $$ LANGUAGE plpgsql;

web/src/actions/admin/user.ts

@@ -55,7 +55,7 @@ export const adminUserActions = {
         .default(null) // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         .transform((val) => val || null),
       pictureFile: z.instanceof(File).optional(),
-      role: z.enum(['admin', 'verifier', 'spammer']),
+      type: z.array(z.enum(['admin', 'verifier', 'spammer'])),
       verifiedLink: z
         .string()
         .url('Invalid URL')
@@ -69,7 +69,7 @@ export const adminUserActions = {
         .default(null) // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         .transform((val) => val || null),
     }),
-    handler: async ({ id, pictureFile, ...valuesToUpdate }) => {
+    handler: async ({ id, pictureFile, type, ...valuesToUpdate }) => {
       const user = await prisma.user.findUnique({
         where: {
           id,
@@ -94,9 +94,15 @@ export const adminUserActions = {
       const updatedUser = await prisma.user.update({
         where: { id: user.id },
         data: {
-          ...valuesToUpdate,
+          name: valuesToUpdate.name,
+          link: valuesToUpdate.link,
+          verifiedLink: valuesToUpdate.verifiedLink,
+          displayName: valuesToUpdate.displayName,
           verified: !!valuesToUpdate.verifiedLink,
           picture: pictureUrl,
+          admin: type.includes('admin'),
+          verifier: type.includes('verifier'),
+          spammer: type.includes('spammer'),
         },
         select: selectUserReturnFields,
       })

web/src/components/AnnouncementBanner.astro

@@ -2,75 +2,50 @@
 import { Icon } from 'astro-icon/components'
 import { Markdown } from 'astro-remote'
 
-import type { AnnouncementType } from '@prisma/client'
+import { getAnnouncementTypeInfo } from '../constants/announcementTypes'
+import { cn } from '../lib/cn'
 
-export type Announcement = {
+import type { Prisma } from '@prisma/client'
-  id: number
-  title: string
-  content: string
-  type: AnnouncementType
-  startDate: Date
-  endDate: Date | null
-  isActive: boolean
-}
 
-export type Props = {
+type Props = {
-  announcements: Announcement[]
+  announcements:
+    | Prisma.AnnouncementGetPayload<{
+        select: {
+          id: true
+          title: true
+          content: true
+          type: true
+          startDate: true
+          endDate: true
+          isActive: true
+        }
+      }>[]
+    | null
+    | undefined
 }
 
 const { announcements } = Astro.props
-
-// Get icon and class based on announcement type
-const getTypeInfo = (type: AnnouncementType) => {
-  switch (type) {
-    case 'INFO':
-      return {
-        icon: 'ri:information-line',
-        containerClass: 'bg-blue-900/40 border-blue-500/30',
-        titleClass: 'text-blue-400',
-        contentClass: 'text-blue-300',
-      }
-    case 'WARNING':
-      return {
-        icon: 'ri:alert-line',
-        containerClass: 'bg-yellow-900/40 border-yellow-500/30',
-        titleClass: 'text-yellow-400',
-        contentClass: 'text-yellow-300',
-      }
-    case 'ALERT':
-      return {
-        icon: 'ri:error-warning-line',
-        containerClass: 'bg-red-900/40 border-red-500/30',
-        titleClass: 'text-red-400',
-        contentClass: 'text-red-300',
-      }
-    default:
-      return {
-        icon: 'ri:information-line',
-        containerClass: 'bg-blue-900/40 border-blue-500/30',
-        titleClass: 'text-blue-400',
-        contentClass: 'text-blue-300',
-      }
-  }
-}
 ---
 
 {
-  announcements.length > 0 && (
+  !!announcements && announcements.length > 0 && (
     <div class="mb-4 flex flex-col items-center space-y-1">
       {announcements.map((announcement) => {
-        const typeInfo = getTypeInfo(announcement.type)
+        const typeInfo = getAnnouncementTypeInfo(announcement.type)
 
         return (
           <div
-            class={`flex flex-row items-center rounded border ${typeInfo.containerClass} mx-auto w-auto max-w-full px-3 py-2`}
+            class={cn(
+              'mx-auto flex w-auto max-w-full flex-row items-center rounded border px-3 py-2',
+              typeInfo.classNames.container
+            )}
           >
-            <Icon name={typeInfo.icon} class={`size-4 flex-shrink-0 ${typeInfo.titleClass} mr-2`} />
+            <Icon name={typeInfo.icon} class={cn('mr-2 size-4 flex-shrink-0', typeInfo.classNames.title)} />
             <div class="flex min-w-0 flex-col">
-              <span class={`text-sm leading-tight font-bold ${typeInfo.titleClass} truncate`}>
+              <span class={cn('truncate text-sm leading-tight font-bold', typeInfo.classNames.title)}>
                 {announcement.title}
               </span>
-              <span class={`text-xs ${typeInfo.contentClass} truncate leading-snug [&_a]:underline`}>
+              <span class={cn('truncate text-xs leading-snug [&_a]:underline', typeInfo.classNames.content)}>
                 <Markdown content={announcement.content} />
               </span>
             </div>

web/src/components/Captcha.astro

@@ -1,7 +1,6 @@
 ---
 import { Icon } from 'astro-icon/components'
 import { isInputError, type ActionAccept, type ActionClient } from 'astro:actions'
-import { Image } from 'astro:assets'
 
 import { CAPTCHA_LENGTH, generateCaptcha } from '../lib/captcha'
 import { cn } from '../lib/cn'

web/src/components/ChatMessages.astro

@@ -1,9 +1,9 @@
 ---
-import { Picture } from 'astro:assets'
-
 import { cn } from '../lib/cn'
 import { formatDateShort } from '../lib/timeAgo'
 
+import MyPicture from './MyPicture.astro'
+
 import type { Prisma } from '@prisma/client'
 import type { HTMLAttributes } from 'astro/types'
 
@@ -73,13 +73,12 @@ const { messages, userId, class: className, ...htmlProps } = Astro.props
               {!isCurrentUser && !isNextFromSameUser && (
                 <p class="text-day-500 mb-0.5 text-xs">
                   {!!message.user.picture && (
-                    <Picture
+                    <MyPicture
                       src={message.user.picture}
                       height={16}
                       width={16}
                       class="inline-block rounded-full align-[-0.33em]"
                       alt=""
-                      formats={['jxl', 'avif', 'webp']}
                     />
                   )}
                   {message.user.name}

web/src/components/CommentItem.astro

@@ -1,5 +1,4 @@
 ---
-import Image from 'astro/components/Image.astro'
 import { Icon } from 'astro-icon/components'
 import { Markdown } from 'astro-remote'
 import { Schema } from 'astro-seo-schema'
@@ -19,6 +18,7 @@ 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'
 
@@ -158,11 +158,10 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
     <span class="flex items-center gap-1">
       {
         comment.author.picture && (
-          <Image
+          <MyPicture
             src={comment.author.picture}
             alt={`Profile for ${comment.author.displayName ?? comment.author.name}`}
             class="size-6 rounded-full bg-zinc-700 object-cover"
-            loading="lazy"
             height={24}
             width={24}
           />
@@ -203,7 +202,13 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
       }
       {
         comment.author.verifier && !comment.author.admin && (
-          <BadgeSmall icon="ri:shield-check-fill" color="teal" text="Moderator" variant="faded" inlineIcon />
+          <BadgeSmall
+            icon="ri:graduation-cap-fill"
+            color="teal"
+            text="Moderator"
+            variant="faded"
+            inlineIcon
+          />
         )
       }
 

web/src/components/CommentModeration.astro

@@ -33,10 +33,10 @@ if (!user || !user.admin || !user.verifier) return null
 ---
 
 <div {...divProps} class={cn('text-xs', className)}>
-  <input type="checkbox" id={`mod-toggle-${String(comment.id)}`} class="peer hidden" />
+  <input type="checkbox" id={`mod-toggle-${String(comment.id)}`} class="peer sr-only" />
   <label
     for={`mod-toggle-${String(comment.id)}`}
-    class="text-day-500 hover:text-day-300 flex cursor-pointer items-center gap-1"
+    class="text-day-500 hover:text-day-300 peer-focus-visible:ring-offset-night-700 inline-flex cursor-pointer items-center gap-1 rounded-sm peer-focus-visible:ring-2 peer-focus-visible:ring-blue-500 peer-focus-visible:ring-offset-2"
   >
     <Icon name="ri:shield-keyhole-line" class="h-3.5 w-3.5" />
     <span class="text-xs">Moderation</span>
@@ -44,7 +44,7 @@ if (!user || !user.admin || !user.verifier) return null
   </label>
 
   <div
-    class="bg-night-600 border-night-500 mt-2 max-h-0 overflow-hidden rounded-md border opacity-0 transition-all duration-200 ease-in-out peer-checked:max-h-[500px] peer-checked:p-2 peer-checked:opacity-100"
+    class="bg-night-600 border-night-500 mt-2 hidden overflow-hidden rounded-md border peer-checked:block peer-checked:p-2"
   >
     <div class="border-night-500 flex flex-wrap gap-1 border-b pb-2">
       <button

web/src/components/DonationAddress.astro

@@ -0,0 +1,60 @@
+---
+import { Icon } from 'astro-icon/components'
+import QRCode from 'qrcode'
+
+import { cn } from '../lib/cn'
+
+type Props = {
+  cryptoName: string
+  cryptoIcon: string
+  address: string
+  className?: string
+}
+
+const { cryptoName, cryptoIcon, address, className } = Astro.props
+
+function getAddressURI(address: string, cryptoName: string) {
+  if (cryptoName.toLowerCase() === 'monero') {
+    return `monero:${address}?tx_description=KYCnot.me%20Donation`
+  }
+
+  if (cryptoName.toLowerCase() === 'bitcoin') {
+    return `bitcoin:${address}?label=KYCnot.me%20Donation`
+  }
+
+  return address
+}
+
+const qrCodeDataURL = await QRCode.toDataURL(getAddressURI(address, cryptoName), {
+  width: 128,
+  margin: 1,
+  color: {
+    dark: '#ffffff',
+    light: '#171721',
+  },
+})
+---
+
+<div class={cn('bg-night-800 border-night-600 flex items-center gap-2 rounded-lg border px-3', className)}>
+  <div class="flex flex-1 flex-col gap-1 py-3">
+    <div class="flex items-center gap-2 px-4 pt-3">
+      <Icon name={cryptoIcon} class="size-6 text-white" />
+      <span class="font-title text-base font-semibold text-white">{cryptoName}</span>
+    </div>
+    <p class="px-7 font-mono text-base leading-snug tracking-wide break-all text-white">
+      <span
+        class="cursor-pointer select-all"
+        set:html={address.length > 12
+          ? `<span class="font-bold mr-0.5 text-green-500">${address.substring(0, 6)}</span>${address.substring(6, address.length - 6)}<span class="font-bold ml-0.5 text-green-500">${address.substring(address.length - 6)}</span>`
+          : `<span class="font-bold">${address}</span>`}
+      />
+    </p>
+  </div>
+  <img
+    src={qrCodeDataURL}
+    alt={`${cryptoName} QR code`}
+    width="128"
+    height="128"
+    class="mr-4 hidden size-36 rounded sm:block"
+  />
+</div>

web/src/components/InputCardGroup.astro

@@ -20,6 +20,7 @@ type Props<Multiple extends boolean = false> = Omit<
     iconClass?: string
     description?: MarkdownString
     disabled?: boolean
+    noTransitionPersist?: boolean
   }[]
   disabled?: boolean
   selectedValue?: Multiple extends true ? string[] : string
@@ -39,13 +40,11 @@ const {
   ...wrapperProps
 } = Astro.props
 
-const inputId = Astro.locals.makeId(`input-${wrapperProps.name}`)
-
 const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
 ---
 
 {/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */}
-<InputWrapper inputId={inputId} class={cn('@container', className)} {...wrapperProps}>
+<InputWrapper class={cn('@container', className)} {...wrapperProps}>
   <div
     class={cn(
       'grid grid-cols-[repeat(auto-fill,minmax(var(--card-min-size),1fr))] gap-2 rounded-lg',
@@ -71,7 +70,7 @@ const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
           )}
         >
           <input
-            transition:persist
+            transition:persist={option.noTransitionPersist ? undefined : true}
             type={multiple ? 'checkbox' : 'radio'}
             name={wrapperProps.name}
             value={option.value}

web/src/components/InputRating.astro

@@ -42,7 +42,7 @@ const inputId = id ?? Astro.locals.makeId(`input-${wrapperProps.name}`)
 
     {
       ratings.toSorted().map((rating) => (
-        <label class="relative cursor-pointer [&:has(~_*:hover),&:hover]:[&>[data-star]]:opacity-100!">
+        <label class="relative cursor-pointer [&:has(~_*_*:checked)]:[&>[data-star]]:opacity-100 [&:has(~_*:hover),&:hover]:[&>[data-star]]:opacity-100!">
           <input
             type="radio"
             name={wrapperProps.name}
@@ -54,7 +54,7 @@ const inputId = id ?? Astro.locals.makeId(`input-${wrapperProps.name}`)
           <Icon name="ri:star-line" class="size-6 p-0.5 text-zinc-500" />
           <Icon
             name="ri:star-fill"
-            class="absolute top-0 left-0 size-6 p-0.5 text-yellow-400 not-peer-checked:opacity-0 group-hover/fieldset:opacity-0"
+            class="absolute top-0 left-0 size-6 p-0.5 text-yellow-400 not-peer-checked:opacity-0 group-hover/fieldset:opacity-0!"
             data-star
           />
         </label>

web/src/components/MyPicture.astro

@@ -0,0 +1,42 @@
+---
+import type { ComponentProps } from 'react'
+
+import { Picture } from 'astro:assets'
+
+import defaultServiceImage from '../assets/fallback-service-image.jpg'
+
+const fallbackImages = {
+  service: defaultServiceImage,
+} as const satisfies Record<string, typeof defaultServiceImage>
+
+type Props = Omit<ComponentProps<typeof Picture>, 'src'> & {
+  src: ComponentProps<typeof Picture>['src'] | null | undefined
+  fallback?: keyof typeof fallbackImages
+}
+
+const {
+  src,
+  formats = ['avif', 'webp'],
+  fallback = undefined as keyof typeof fallbackImages | undefined,
+  height,
+  width,
+  ...props
+} = Astro.props
+
+const fallbackImage = fallback ? fallbackImages[fallback] : undefined
+---
+
+{/* eslint-disable @typescript-eslint/no-explicit-any */}
+{
+  !!(src ?? fallbackImage) && (
+    <Picture
+      src={
+        typeof src === 'string' ? new URL(src, Astro.url).href : ((src ?? fallbackImage) as unknown as string)
+      }
+      formats={formats}
+      height={height ? Number(height) * 2 : undefined}
+      width={width ? Number(width) * 2 : undefined}
+      {...(props as any)}
+    />
+  )
+}

web/src/components/PillsRadioGroup.astro

@@ -17,7 +17,7 @@ const { name, options, selectedValue, class: className, ...rest } = Astro.props
 
 <div
   class={cn(
-    'bg-night-500 divide-night-700 flex divide-x-2 overflow-hidden rounded-md text-[0.6875rem]',
+    'bg-night-500 divide-night-700 has-focus-visible:ring-offset-night-700 flex divide-x-2 overflow-hidden rounded-md text-[0.6875rem] has-focus-visible:ring-2 has-focus-visible:ring-blue-500 has-focus-visible:ring-offset-2',
     className
   )}
   {...rest}
@@ -30,7 +30,7 @@ const { name, options, selectedValue, class: className, ...rest } = Astro.props
           name={name}
           value={option.value}
           checked={selectedValue === option.value}
-          class="peer hidden"
+          class="peer sr-only"
         />
         <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}

web/src/components/ScoreSquare.astro

@@ -2,6 +2,7 @@
 import { Schema } from 'astro-seo-schema'
 
 import { cn } from '../lib/cn'
+import { makeOverallScoreInfo } from '../lib/overallScore'
 import { KYCNOTME_SCHEMA_MINI } from '../lib/schema'
 import { transformCase } from '../lib/strings'
 
@@ -16,33 +17,6 @@ export type Props = HTMLAttributes<'div'> & {
 
 const { score, label, total = 10, class: className, itemReviewedId, ...htmlProps } = Astro.props
 
-export function makeOverallScoreInfo(score: number, total = 10) {
-  const classNamesByColor = {
-    red: 'bg-score-1 text-black',
-    orange: 'bg-score-2 text-black',
-    yellow: 'bg-score-3 text-black',
-    blue: 'bg-score-4 text-black',
-    green: 'bg-score-5 text-black',
-  } as const satisfies Record<string, string>
-
-  const formattedScore = Math.round(score).toLocaleString()
-  const n = score / total
-
-  if (n > 1) return { text: '', classNameBg: classNamesByColor.green, formattedScore }
-  if (n >= 0.9 && n <= 1) return { text: 'Excellent', classNameBg: classNamesByColor.green, formattedScore }
-  if (n >= 0.8 && n < 0.9) return { text: 'Very Good', classNameBg: classNamesByColor.blue, formattedScore }
-  if (n >= 0.7 && n < 0.8) return { text: 'Good', classNameBg: classNamesByColor.blue, formattedScore }
-  if (n >= 0.6 && n < 0.7) return { text: 'Okay', classNameBg: classNamesByColor.yellow, formattedScore }
-  if (n >= 0.5 && n < 0.6) {
-    return { text: 'Acceptable', classNameBg: classNamesByColor.yellow, formattedScore }
-  }
-  if (n >= 0.4 && n < 0.5) return { text: 'Bad', classNameBg: classNamesByColor.orange, formattedScore }
-  if (n >= 0.3 && n < 0.4) return { text: 'Very Bad', classNameBg: classNamesByColor.orange, formattedScore }
-  if (n >= 0.2 && n < 0.3) return { text: 'Really Bad', classNameBg: classNamesByColor.red, formattedScore }
-  if (n >= 0 && n < 0.2) return { text: 'Terrible', classNameBg: classNamesByColor.red, formattedScore }
-  return { text: '', classNameBg: undefined, formattedScore }
-}
-
 const { text, classNameBg, formattedScore } = makeOverallScoreInfo(score, total)
 ---
 

web/src/components/ServiceCard.astro

@@ -1,14 +1,13 @@
 ---
 import { Icon } from 'astro-icon/components'
-import { Image } from 'astro:assets'
 
-import defaultImage from '../assets/fallback-service-image.jpg'
 import { currencies } from '../constants/currencies'
 import { verificationStatusesByValue } from '../constants/verificationStatus'
 import { cn } from '../lib/cn'
+import { makeOverallScoreInfo } from '../lib/overallScore'
 import { transformCase } from '../lib/strings'
 
-import { makeOverallScoreInfo } from './ScoreSquare.astro'
+import MyPicture from './MyPicture.astro'
 import Tooltip from './Tooltip.astro'
 
 import type { Prisma } from '@prisma/client'
@@ -76,9 +75,9 @@ const overallScoreInfo = makeOverallScoreInfo(overallScore)
 >
   <!-- Header with Icon and Title -->
   <div class="flex items-center gap-(--gap)">
-    <Image
+    <MyPicture
-      src={// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+      src={imageUrl}
-      imageUrl || (defaultImage as unknown as string)}
+      fallback="service"
       alt={name || 'Service logo'}
       class="size-12 shrink-0 rounded-sm object-contain text-white"
       width={48}

web/src/components/ServiceLinkButton.astro

@@ -112,7 +112,7 @@ if (!z.string().url().safeParse(link.url).success) {
   target="_blank"
   rel="noopener noreferrer"
   class={cn(
-    '2xs:text-sm 2xs:h-8 2xs:gap-2 inline-flex h-6 items-center gap-1 rounded-full bg-white text-xs whitespace-nowrap text-black',
+    '2xs:text-sm 2xs:h-8 2xs:gap-2 focus-visible:ring-offset-night-700 inline-flex h-6 items-center gap-1 rounded-full bg-white text-xs whitespace-nowrap text-black focus-visible:ring-4 focus-visible:ring-orange-500 focus-visible:ring-offset-2 focus-visible:outline-none',
     className
   )}
   {...htmlProps}

web/src/components/ServicesFilters.astro

@@ -3,11 +3,11 @@ import { Icon } from 'astro-icon/components'
 
 import { kycLevels } from '../constants/kycLevels'
 import { cn } from '../lib/cn'
+import { makeOverallScoreInfo } from '../lib/overallScore'
 import { type ServicesFiltersObject, type ServicesFiltersOptions } from '../pages/index.astro'
 
 import Button from './Button.astro'
 import PillsRadioGroup from './PillsRadioGroup.astro'
-import { makeOverallScoreInfo } from './ScoreSquare.astro'
 import Tooltip from './Tooltip.astro'
 
 import type { HTMLAttributes } from 'astro/types'
@@ -97,8 +97,7 @@ const {
   <!-- Type Filter -->
   <fieldset class="mb-6">
     <legend class="font-title mb-3 leading-none text-green-500">Type</legend>
-    <input type="checkbox" id="show-more-categories" class="peer hidden" hx-preserve data-show-more-input />
+    <ul class="[&:not(:has(~_.peer:checked))]:[&>li:not([data-show-always])]:hidden">
-    <ul class="not-peer-checked:[&>li:not([data-show-always])]:hidden">
       {
         options.categories?.map((category) => (
           <li data-show-always={category.showAlways ? '' : undefined}>
@@ -122,15 +121,22 @@ 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
+          />
           <label
             for="show-more-categories"
-            class="mt-2 block cursor-pointer text-sm text-green-500 peer-checked:hidden"
+            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-categories"
-            class="mt-2 hidden cursor-pointer text-sm text-green-500 peer-checked:block"
+            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
           </label>
@@ -289,14 +295,8 @@ const {
       options.attributesByCategory.map(({ category, attributes }) => (
         <fieldset class="min-w-0">
           <legend class="font-title mb-0.5 text-xs tracking-wide text-white">{category}</legend>
-          <input
+
-            type="checkbox"
+          <ul class="[:not(:has(~_.peer:checked))]:[&>li:not([data-show-always])]:hidden">
-            id={`show-more-attributes-${category}`}
-            class="peer hidden"
-            hx-preserve
-            data-show-more-input
-          />
-          <ul class="not-peer-checked:[&>li:not([data-show-always])]:hidden">
             {attributes.map((attribute) => {
               const inputName = `attr-${attribute.id}` as const
               const yesId = `attr-${attribute.id}=yes` as const
@@ -306,13 +306,13 @@ const {
 
               return (
                 <li data-show-always={attribute.showAlways ? '' : undefined} class="cursor-pointer">
-                  <fieldset class="flex max-w-full min-w-0 cursor-pointer items-center text-sm text-white">
+                  <fieldset class="relative flex max-w-full min-w-0 cursor-pointer items-center text-sm text-white">
                     <legend class="sr-only">
                       {attribute.title} ({attribute._count?.services})
                     </legend>
                     <input
                       type="radio"
-                      class="peer/empty hidden"
+                      class="peer/empty sr-only"
                       id={emptyId}
                       name={inputName}
                       value=""
@@ -324,7 +324,7 @@ const {
                       name={inputName}
                       value="yes"
                       id={yesId}
-                      class="peer/yes hidden"
+                      class="peer/yes sr-only"
                       checked={attribute.value === 'yes'}
                       aria-label="Include"
                     />
@@ -333,38 +333,45 @@ const {
                       name={inputName}
                       value="no"
                       id={noId}
-                      class="peer/no hidden"
+                      class="peer/no sr-only"
                       checked={attribute.value === 'no'}
                       aria-label="Exclude"
                     />
 
+                    <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" />
+
                     <label
                       for={yesId}
-                      class="flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-l-sm bg-zinc-950 peer-checked/yes:hidden"
+                      class="border-night-500 bg-night-600 relative flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-l-sm border border-r-0 peer-checked/yes:hidden before:absolute before:-inset-[3px] before:-right-[0.5px]"
                       aria-hidden="true"
                     >
                       <Icon name="ri:check-line" class="size-3" />
                     </label>
                     <label
                       for={emptyId}
-                      class="hidden size-4 shrink-0 cursor-pointer items-center justify-center rounded-l-sm bg-green-600 peer-checked/yes:flex"
+                      class="relative hidden h-4 w-[calc(var(--spacing)*4+0.5px)] shrink-0 cursor-pointer items-center justify-center rounded-l-sm bg-green-600 peer-checked/yes:flex before:absolute before:-inset-[2px] before:-right-[0.5px]"
                       aria-hidden="true"
                     >
                       <Icon name="ri:check-line" class="size-3" />
                     </label>
 
-                    <span class="block h-4 w-px border-y-2 border-zinc-950 bg-zinc-800" aria-hidden="true" />
+                    <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]"
+                      aria-hidden="true"
+                    >
+                      <span class="bg-night-400 border-night-600 block h-full w-px border-y-2" />
+                    </span>
 
                     <label
                       for={noId}
-                      class="flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-r-sm bg-zinc-950 peer-checked/no:hidden"
+                      class="border-night-500 bg-night-600 relative flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-r-sm border border-l-0 peer-checked/no:hidden before:absolute before:-inset-[3px] before:-left-[0.5px]"
                       aria-hidden="true"
                     >
                       <Icon name="ri:close-line" class="size-3" />
                     </label>
                     <label
                       for={emptyId}
-                      class="hidden size-4 shrink-0 cursor-pointer items-center justify-center rounded-r-sm bg-red-600 peer-checked/no:flex"
+                      class="relative hidden size-4 w-[calc(var(--spacing)*4+0.5px)] shrink-0 cursor-pointer items-center justify-center rounded-r-sm bg-red-600 peer-checked/no:flex before:absolute before:-inset-[2px] before:-left-[0.5px]"
                       aria-hidden="true"
                     >
                       <Icon name="ri:close-line" class="size-3" />
@@ -376,8 +383,8 @@ const {
                       aria-hidden="true"
                     >
                       <Icon
-                        name={attribute.icon}
+                        name={attribute.info.icon}
-                        class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.iconClass)}
+                        class={cn('mr-2 size-3 shrink-0 opacity-80', attribute.info.classNames.icon)}
                         aria-hidden="true"
                       />
                       <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
@@ -391,8 +398,8 @@ const {
                       aria-hidden="true"
                     >
                       <Icon
-                        name={attribute.icon}
+                        name={attribute.info.icon}
-                        class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.iconClass)}
+                        class={cn('mr-2 size-3 shrink-0 opacity-100', attribute.info.classNames.icon)}
                         aria-hidden="true"
                       />
                       <span class="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">
@@ -405,17 +412,25 @@ const {
               )
             })}
           </ul>
+
           {attributes.filter((attribute) => attribute.showAlways).length < attributes.length && (
             <>
+              <input
+                type="checkbox"
+                id={`show-more-attributes-${category}`}
+                class="peer sr-only"
+                hx-preserve
+                data-show-more-input
+              />
               <label
                 for={`show-more-attributes-${category}`}
-                class="mt-2 block cursor-pointer text-sm text-green-500 peer-checked:hidden"
+                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}`}
-                class="mt-2 hidden cursor-pointer text-sm text-green-500 peer-checked:block"
+                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
               </label>

web/src/constants/announcementTypes.ts

@@ -0,0 +1,65 @@
+import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
+import { transformCase } from '../lib/strings'
+
+import type { AnnouncementType } from '@prisma/client'
+
+type AnnouncementTypeInfo<T extends string | null | undefined = string> = {
+  value: T
+  label: string
+  icon: string
+  classNames: {
+    container: string
+    title: string
+    content: string
+  }
+}
+
+export const {
+  dataArray: announcementTypes,
+  dataObject: announcementTypesById,
+  getFn: getAnnouncementTypeInfo,
+} = makeHelpersForOptions(
+  'value',
+  (value): AnnouncementTypeInfo<typeof value> => ({
+    value,
+    label: value ? transformCase(value.replaceAll('_', ' '), 'title') : String(value),
+    icon: 'ri:information-line',
+    classNames: {
+      container: 'bg-blue-900/40 border-blue-500/30',
+      title: 'text-blue-400',
+      content: 'text-blue-300',
+    },
+  }),
+  [
+    {
+      value: 'INFO',
+      label: 'Info',
+      icon: 'ri:information-line',
+      classNames: {
+        container: 'bg-blue-900/40 border-blue-500/30',
+        title: 'text-blue-400',
+        content: 'text-blue-300',
+      },
+    },
+    {
+      value: 'WARNING',
+      label: 'Warning',
+      icon: 'ri:alert-line',
+      classNames: {
+        container: 'bg-yellow-900/40 border-yellow-500/30',
+        title: 'text-yellow-400',
+        content: 'text-yellow-300',
+      },
+    },
+    {
+      value: 'ALERT',
+      label: 'Alert',
+      icon: 'ri:error-warning-line',
+      classNames: {
+        container: 'bg-red-900/40 border-red-500/30',
+        title: 'text-red-400',
+        content: 'text-red-300',
+      },
+    },
+  ] as const satisfies AnnouncementTypeInfo<AnnouncementType>[]
+)

web/src/constants/attributeTypes.ts

@@ -34,7 +34,7 @@ export const {
     value,
     slug: value ? value.toLowerCase() : '',
     label: value ? transformCase(value, 'title') : String(value),
-    icon: 'ri:question-line',
+    icon: 'ri:question-fill',
     order: Infinity,
     classNames: {
       container: 'bg-current/30',
@@ -50,7 +50,7 @@ export const {
       value: 'BAD',
       slug: 'bad',
       label: 'Bad',
-      icon: 'ri:close-line',
+      icon: 'ri:close-circle-fill',
       order: 1,
       classNames: {
         container: 'bg-red-600/30',
@@ -65,7 +65,7 @@ export const {
       value: 'WARNING',
       slug: 'warning',
       label: 'Warning',
-      icon: 'ri:alert-line',
+      icon: 'ri:alert-fill',
       order: 2,
       classNames: {
         container: 'bg-yellow-600/30',
@@ -80,7 +80,7 @@ export const {
       value: 'GOOD',
       slug: 'good',
       label: 'Good',
-      icon: 'ri:check-line',
+      icon: 'ri:checkbox-circle-fill',
       order: 3,
       classNames: {
         container: 'bg-green-600/30',
@@ -95,7 +95,7 @@ export const {
       value: 'INFO',
       slug: 'info',
       label: 'Info',
-      icon: 'ri:information-line',
+      icon: 'ri:information-fill',
       order: 4,
       classNames: {
         container: 'bg-blue-600/30',

web/src/constants/serviceUserRoles.ts

@@ -49,7 +49,7 @@ export const {
       value: 'MODERATOR',
       slug: 'moderator',
       label: 'Moderator',
-      icon: 'ri:glasses-2-line',
+      icon: 'ri:graduation-cap-fill',
       order: 3,
       color: 'teal',
     },

web/src/layouts/MarkdownLayout.astro

@@ -16,6 +16,7 @@ type Props = ComponentProps<typeof BaseLayout> &
     author: string
     pubDate: string
     description: string
+    icon?: string
   }>
 
 const { frontmatter, schemas, ...baseLayoutProps } = Astro.props
@@ -23,6 +24,8 @@ const publishDate = frontmatter.pubDate ? new Date(frontmatter.pubDate) : null
 const ogImageTemplateData = {
   template: 'generic',
   title: frontmatter.title,
+  description: frontmatter.description,
+  icon: frontmatter.icon,
 } satisfies OgImageAllTemplatesWithProps
 const weAreAuthor = frontmatter.author.toLowerCase().trim() === 'kycnot.me'
 ---

web/src/lib/overallScore.ts

@@ -0,0 +1,26 @@
+export function makeOverallScoreInfo(score: number, total = 10) {
+  const classNamesByColor = {
+    red: 'bg-score-1 text-black',
+    orange: 'bg-score-2 text-black',
+    yellow: 'bg-score-3 text-black',
+    blue: 'bg-score-4 text-black',
+    green: 'bg-score-5 text-black',
+  } as const satisfies Record<string, string>
+
+  const formattedScore = Math.round(score).toLocaleString()
+  const n = score / total
+
+  if (n > 1) return { text: '', classNameBg: classNamesByColor.green, formattedScore }
+  if (n >= 0.9 && n <= 1) return { text: 'Excellent', classNameBg: classNamesByColor.green, formattedScore }
+  if (n >= 0.8 && n < 0.9) return { text: 'Very Good', classNameBg: classNamesByColor.blue, formattedScore }
+  if (n >= 0.7 && n < 0.8) return { text: 'Good', classNameBg: classNamesByColor.blue, formattedScore }
+  if (n >= 0.6 && n < 0.7) return { text: 'Okay', classNameBg: classNamesByColor.yellow, formattedScore }
+  if (n >= 0.5 && n < 0.6) {
+    return { text: 'Acceptable', classNameBg: classNamesByColor.yellow, formattedScore }
+  }
+  if (n >= 0.4 && n < 0.5) return { text: 'Bad', classNameBg: classNamesByColor.orange, formattedScore }
+  if (n >= 0.3 && n < 0.4) return { text: 'Very Bad', classNameBg: classNamesByColor.orange, formattedScore }
+  if (n >= 0.2 && n < 0.3) return { text: 'Really Bad', classNameBg: classNamesByColor.red, formattedScore }
+  if (n >= 0 && n < 0.2) return { text: 'Terrible', classNameBg: classNamesByColor.red, formattedScore }
+  return { text: '', classNameBg: undefined, formattedScore }
+}

web/src/lib/zodUtils.ts

@@ -50,7 +50,6 @@ export const ACCEPTED_IMAGE_TYPES = [
   'image/svg+xml',
   'image/png',
   'image/jpeg',
-  'image/jxl',
   'image/avif',
   'image/webp',
 ] as const satisfies string[]
@@ -66,7 +65,7 @@ export const imageFileSchema = z
   )
   .refine(
     (file) => !file || ACCEPTED_IMAGE_TYPES.some((type) => file.type === type),
-    'Only SVG, PNG, JPG, JPEG XL, AVIF, WebP formats are supported.'
+    'Only SVG, PNG, JPG, AVIF, WebP formats are supported.'
   )
 
 export const imageFileSchemaRequired = imageFileSchema.refine((file) => !!file, 'Required')

web/src/pages/about.mdx

@@ -4,8 +4,11 @@ title: About
 author: KYCnot.me
 pubDate: 2025-05-15
 description: 'Learn how KYCnot.me website works and about our mission to protect privacy in cryptocurrency.'
+icon: 'ri:information-line'
 ---
 
+import DonationAddress from '../components/DonationAddress.astro'
+
 ## What is this page?
 
 KYCnot.me is a directory of trustworthy alternatives for buying, exchanging, trading, and using cryptocurrencies without having to disclose your identity, thus preserving your right to privacy.
@@ -189,10 +192,13 @@ To **see comments waiting for moderation**, toggle the switch in the comments se
 
 ## Support the project
 
-If you like this project, you can support it through these methods:
+If you like this project, you can **support** it through these methods:
 
-- Monero:
+<DonationAddress
-  - `88V2Xi2mvcu3NdnHkVeZGyPtACg2w3iXZdUMJugUiPvFQHv5mVkih3o43ceVGz6cVs9uTBMt4MRMVW2xFgfGdh8DTCQ7vtp`
+  cryptoName="Monero"
+  cryptoIcon="monero"
+  address="86nkJeHWarEYZJh3gcPGKcQeueKbq2uRRC2NX6kopBpdHFfY1j4vmrVAwRG1T4pNBwBwfJ4U4USLUZ6CjDtacp8x4y8v3rq"
+/>
 
 ## Contact
 
@@ -201,8 +207,7 @@ You can contact via direct chat or via email.
 - [SimpleX Chat](https://simplex.chat/contact#/?v=2&smp=smp%3A%2F%2F0YuTwO05YJWS8rkjn9eLJDjQhFKvIYd8d4xG8X1blIU%3D%40smp8.simplex.im%2FcgKHYUYnpAIVoGb9lxb0qEMEpvYIvc1O%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAIW_JSq8wOsLKG4Xv4O54uT2D_l8MJBYKQIFj1FjZpnU%253D%26srv%3Dbeccx4yfxxbvyhqypaavemqurytl6hozr47wfc7uuecacjqdvwpw2xid.onion)
 
 - If you use ProtonMail or Tutanota, you can have E2E encrypted communications with us directly. We also offer a [PGP Key](/pgp). Otherwise, we recommend reaching out via SimpleX chat for encrypted communications.
-  - [tuta.io](https://tuta.io) - <kycnotme@tuta.io>
+
-  - [proton.me](https://proton.me) - <contact@kycnot.me>
 
 ## Disclaimer
 

web/src/pages/account/edit.astro

@@ -24,7 +24,7 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
 <MiniLayout
   pageTitle={`Edit Profile - ${user.name}`}
   description="Edit your user profile"
-  ogImage={{ template: 'generic', title: 'Edit Profile' }}
+  ogImage={{ template: 'generic', title: 'Edit Profile', icon: 'ri:user-settings-line' }}
   layoutHeader={{
     icon: 'ri:edit-line',
     title: 'Edit profile',

web/src/pages/account/generate.astro

@@ -25,7 +25,12 @@ const prettyToken = preGeneratedToken ? prettifyUserSecretToken(preGeneratedToke
 <MiniLayout
   pageTitle="Create Account"
   description="Create a new account"
-  ogImage={{ template: 'generic', title: 'Create Account' }}
+  ogImage={{
+    template: 'generic',
+    title: 'Create Account',
+    description: 'Zero data, 100% anonymous',
+    icon: 'ri:user-add-line',
+  }}
   layoutHeader={{
     icon: 'ri:user-add-line',
     title: 'New account',

web/src/pages/account/index.astro

@@ -1,12 +1,11 @@
 ---
 import { Icon } from 'astro-icon/components'
 import { actions } from 'astro:actions'
-import { Picture } from 'astro:assets'
 import { sortBy } from 'lodash-es'
 
-import defaultServiceImage from '../../assets/fallback-service-image.jpg'
 import BadgeSmall from '../../components/BadgeSmall.astro'
 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 { getKarmaTransactionActionInfo } from '../../constants/karmaTransactionActions'
@@ -161,7 +160,12 @@ if (!user) return Astro.rewrite('/404')
 <BaseLayout
   pageTitle={`${user.name} - Account`}
   description="Manage your user profile"
-  ogImage={{ template: 'generic', title: `${user.name} | Account` }}
+  ogImage={{
+    template: 'generic',
+    title: `${user.name} | Account`,
+    description: 'Manage your user profile',
+    icon: 'ri:user-3-line',
+  }}
   widthClassName="max-w-screen-md"
   className={{
     main: 'space-y-6',
@@ -180,7 +184,13 @@ if (!user) return Astro.rewrite('/404')
     <header class="flex items-center gap-4">
       {
         user.picture ? (
-          <img src={user.picture} alt="" class="ring-day-500/30 size-16 rounded-full ring-2" />
+          <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" />
@@ -460,8 +470,9 @@ if (!user) return Astro.rewrite('/404')
                   href={`/service/${affiliation.service.slug}`}
                   class="text-day-300 group flex min-w-32 items-center gap-2 text-sm"
                 >
-                  <Picture
+                  <MyPicture
-                    src={affiliation.service.imageUrl ?? (defaultServiceImage as unknown as string)}
+                    src={affiliation.service.imageUrl}
+                    fallback="service"
                     alt={affiliation.service.name}
                     width={40}
                     height={40}

web/src/pages/account/login.astro

@@ -30,7 +30,12 @@ const message = Astro.url.searchParams.get('message')
 <MiniLayout
   pageTitle="Login"
   description="Login to your account"
-  ogImage={{ template: 'generic', title: 'Login' }}
+  ogImage={{
+    template: 'generic',
+    title: 'Login',
+    description: message ?? 'Enter your login key',
+    icon: 'ri:login-box-line',
+  }}
   layoutHeader={{
     icon: 'ri:user-line',
     title: 'Welcome back',

web/src/pages/account/welcome.astro

@@ -17,7 +17,12 @@ const prettyToken = result ? prettifyUserSecretToken(result.data.token) : null
 <MiniLayout
   pageTitle="Welcome"
   description="New account welcome page"
-  ogImage={{ template: 'generic', title: 'Welcome' }}
+  ogImage={{
+    template: 'generic',
+    title: 'Welcome',
+    description: 'New account welcome page',
+    icon: 'ri:key-2-line',
+  }}
   layoutHeader={{
     icon: 'ri:key-2-line',
     title: 'Save your Login Key',

web/src/pages/admin/announcements/index.astro

@@ -4,6 +4,12 @@ import { actions, isInputError } from 'astro:actions'
 import { z } from 'astro:schema'
 
 import { adminAnnouncementActions } from '../../../actions/admin/announcement'
+import Button from '../../../components/Button.astro'
+import InputCardGroup from '../../../components/InputCardGroup.astro'
+import InputSelect from '../../../components/InputSelect.astro'
+import InputSubmitButton from '../../../components/InputSubmitButton.astro'
+import InputText from '../../../components/InputText.astro'
+import InputTextArea from '../../../components/InputTextArea.astro'
 import SortArrowIcon from '../../../components/SortArrowIcon.astro'
 import TimeFormatted from '../../../components/TimeFormatted.astro'
 import Tooltip from '../../../components/Tooltip.astro'
@@ -99,6 +105,8 @@ const updateResult = Astro.getActionResult(adminAnnouncementActions.update)
 const deleteResult = Astro.getActionResult(adminAnnouncementActions.delete)
 const toggleResult = Astro.getActionResult(adminAnnouncementActions.toggleActive)
 
+const createInputErrors = isInputError(createResult?.error) ? createResult.error.fields : {}
+
 // Add success messages to banners
 Astro.locals.banners.addIfSuccess(createResult, 'Announcement created successfully!')
 Astro.locals.banners.addIfSuccess(updateResult, 'Announcement updated successfully!')
@@ -221,100 +229,85 @@ if (toggleResult?.error) {
       <h2 class="font-title mb-4 text-lg font-semibold text-blue-400">Create New Announcement</h2>
       <form method="POST" action={actions.admin.announcement.create} class="grid gap-4 md:grid-cols-2">
         <div class="space-y-3 md:col-span-2">
-          <div>
+          <InputText
-            <label for="title" class="block text-xs font-medium text-zinc-400">Title*</label>
+            label="Title*"
-            <input
+            name="title"
-              type="text"
+            error={createInputErrors.title}
-              name="title"
+            inputProps={{
-              id="title"
+              required: true,
-              required
+              maxlength: 255,
-              maxlength="255"
+              placeholder: 'Announcement Title',
-              placeholder="Announcement Title"
+              value: newAnnouncement.title,
-              value={newAnnouncement.title}
+            }}
-              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-blue-500 focus:ring-blue-500 focus:outline-none"
+          />
-            />
-          </div>
 
-          <div>
+          <InputTextArea
-            <label for="content" class="block text-xs font-medium text-zinc-400">Content*</label>
+            label="Content*"
-            <textarea
+            name="content"
-              name="content"
+            error={createInputErrors.content}
-              id="content"
+            value={newAnnouncement.content}
-              required
+            inputProps={{
-              maxlength="1000"
+              required: true,
-              rows="3"
+              maxlength: 1000,
-              placeholder="Announcement Content"
+              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-blue-500 focus:ring-blue-500 focus:outline-none"
+              placeholder: 'Announcement Content',
-              >{newAnnouncement.content}</textarea
+            }}
-            >
+          />
-          </div>
         </div>
 
         <div class="space-y-3">
-          <div>
+          <InputSelect
-            <label for="type" class="block text-xs font-medium text-zinc-400">Type*</label>
+            label="Type*"
-            <select
+            name="type"
-              name="type"
+            error={createInputErrors.type}
-              id="type"
+            options={[
-              required
+              { label: 'Info', value: 'INFO' },
-              class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
+              { label: 'Warning', value: 'WARNING' },
-            >
+              { label: 'Alert', value: 'ALERT' },
-              <option value="INFO" selected={true}>Info</option>
+            ]}
-              <option value="WARNING" selected={false}>Warning</option>
+            selectProps={{
-              <option value="ALERT" selected={false}>Alert</option>
+              required: true,
-            </select>
+              value: newAnnouncement.type,
-          </div>
+            }}
+          />
 
-          <div>
+          <InputText
-            <label for="startDate" class="block text-xs font-medium text-zinc-400">Start Date & Time*</label>
+            label="Start Date & Time*"
-            <input
+            name="startDate"
-              type="datetime-local"
+            error={createInputErrors.startDate}
-              name="startDate"
+            inputProps={{
-              id="startDate"
+              type: 'datetime-local',
-              required
+              required: true,
-              min={currentDate}
+              value: newAnnouncement.startDate,
-              value={newAnnouncement.startDate}
+            }}
-              class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
+          />
-            />
-          </div>
 
-          <div>
+          <InputText
-            <label for="endDate" class="block text-xs font-medium text-zinc-400"
+            label="End Date & Time (Optional)"
-              >End Date & Time (Optional)</label
+            name="endDate"
-            >
+            error={createInputErrors.endDate}
-            <input
+            inputProps={{
-              type="datetime-local"
+              type: 'datetime-local',
-              name="endDate"
+              value: newAnnouncement.endDate,
-              id="endDate"
+            }}
-              min={currentDate}
+          />
-              value={newAnnouncement.endDate}
-              class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
-            />
-          </div>
         </div>
 
         <div class="space-y-3">
-          <div class="flex items-center">
+          <InputCardGroup
-            <input
+            name="isActive"
-              type="checkbox"
+            label="Status"
-              name="isActive"
+            error={createInputErrors.isActive}
-              id="isActive"
+            options={[
-              value="true"
+              { label: 'Active', value: 'true' },
-              checked={newAnnouncement.isActive}
+              { label: 'Inactive', value: 'false' },
-              class="h-4 w-4 rounded border-zinc-700 bg-zinc-900 text-blue-600 focus:ring-blue-500"
+            ]}
-            />
+            selectedValue={newAnnouncement.isActive ? 'true' : 'false'}
-            <label for="isActive" class="ml-2 block text-sm text-zinc-400">Active</label>
+            cardSize="sm"
-          </div>
+          />
 
           <div class="pt-4">
-            <button
+            <InputSubmitButton label="Create Announcement" icon="ri:save-line" />
-              type="submit"
-              class="inline-flex items-center rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
-            >
-              <Icon name="ri:save-line" class="mr-1 h-4 w-4" />
-              Create Announcement
-            </button>
-
             <button
               type="button"
               id="cancel-create"
@@ -328,127 +321,6 @@ if (toggleResult?.error) {
     </div>
   </div>
 
-  <!-- Edit Announcement Modal -->
-  <dialog
-    id="edit-announcement-modal"
-    class="m-auto w-full max-w-2xl rounded-lg border border-zinc-700 bg-zinc-800 p-0 backdrop:bg-black/70"
-  >
-    <div class="p-4">
-      <div class="mb-4 flex items-center justify-between border-b border-zinc-700 pb-3">
-        <h3 class="font-title text-lg font-semibold text-blue-400">Edit Announcement</h3>
-        <button type="button" class="close-modal text-zinc-400 hover:text-zinc-200">
-          <Icon name="ri:close-line" class="h-6 w-6" />
-        </button>
-      </div>
-
-      <form
-        method="POST"
-        action={actions.admin.announcement.update}
-        id="edit-form"
-        class="grid gap-4 md:grid-cols-2"
-      >
-        <input type="hidden" name="id" id="edit-id" />
-
-        <div class="space-y-3 md:col-span-2">
-          <div>
-            <label for="edit-title" class="block text-xs font-medium text-zinc-400">Title*</label>
-            <input
-              type="text"
-              name="title"
-              id="edit-title"
-              required
-              maxlength="255"
-              class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
-            />
-          </div>
-
-          <div>
-            <label for="edit-content" class="block text-xs font-medium text-zinc-400">Content*</label>
-            <textarea
-              name="content"
-              id="edit-content"
-              required
-              maxlength="1000"
-              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 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
-            ></textarea>
-          </div>
-        </div>
-
-        <div class="space-y-3">
-          <div>
-            <label for="edit-type" class="block text-xs font-medium text-zinc-400">Type*</label>
-            <select
-              name="type"
-              id="edit-type"
-              required
-              class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
-            >
-              <option value="INFO" selected={true}>Info</option>
-              <option value="WARNING" selected={false}>Warning</option>
-              <option value="ALERT" selected={false}>Alert</option>
-            </select>
-          </div>
-
-          <div>
-            <label for="edit-startDate" class="block text-xs font-medium text-zinc-400"
-              >Start Date & Time*</label
-            >
-            <input
-              type="datetime-local"
-              name="startDate"
-              id="edit-startDate"
-              required
-              class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
-            />
-          </div>
-
-          <div>
-            <label for="edit-endDate" class="block text-xs font-medium text-zinc-400"
-              >End Date & Time (Optional)</label
-            >
-            <input
-              type="datetime-local"
-              name="endDate"
-              id="edit-endDate"
-              class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
-            />
-          </div>
-        </div>
-
-        <div class="space-y-3">
-          <div class="flex items-center">
-            <input
-              type="checkbox"
-              name="isActive"
-              id="edit-isActive"
-              value="true"
-              class="h-4 w-4 rounded border-zinc-700 bg-zinc-900 text-blue-600 focus:ring-blue-500"
-            />
-            <label for="edit-isActive" class="ml-2 block text-sm text-zinc-400">Active</label>
-          </div>
-
-          <div class="pt-4">
-            <button
-              type="submit"
-              class="inline-flex items-center rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
-            >
-              <Icon name="ri:save-line" class="mr-1 h-4 w-4" />
-              Update Announcement
-            </button>
-
-            <button
-              type="button"
-              class="close-modal ml-2 inline-flex items-center rounded-md border border-zinc-600 bg-zinc-800 px-4 py-2 text-sm font-medium text-zinc-300 hover:bg-zinc-700 focus:ring-2 focus:ring-zinc-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
-            >
-              Cancel
-            </button>
-          </div>
-        </div>
-      </form>
-    </div>
-  </dialog>
-
   <!-- Delete Confirmation Modal -->
   <dialog
     id="delete-confirmation-modal"
@@ -584,95 +456,196 @@ if (toggleResult?.error) {
             }
             {
               announcements.map((announcement) => (
-                <tr class="group hover:bg-zinc-700/30">
+                <>
-                  <td class="px-4 py-3 text-sm">
+                  <tr class="group hover:bg-zinc-700/30">
-                    <div class="font-medium text-zinc-200">{announcement.title}</div>
+                    <td class="px-4 py-3 text-sm">
-                    <div class="mt-1 line-clamp-1 text-xs text-zinc-400">{announcement.content}</div>
+                      <div class="font-medium text-zinc-200">{announcement.title}</div>
-                  </td>
+                      <div class="mt-1 line-clamp-1 text-xs text-zinc-400">{announcement.content}</div>
-                  <td class="px-4 py-3 text-left text-sm">
+                    </td>
-                    <span
+                    <td class="px-4 py-3 text-left text-sm">
-                      class={`inline-flex items-center rounded-md px-2.5 py-0.5 text-xs font-medium ${getTypeBadgeClass(announcement.type)}`}
+                      <span
-                    >
+                        class={`inline-flex items-center rounded-md px-2.5 py-0.5 text-xs font-medium ${getTypeBadgeClass(announcement.type)}`}
-                      {announcement.type}
-                    </span>
-                  </td>
-                  <td class="px-4 py-3 text-left text-sm text-zinc-300">
-                    <TimeFormatted date={announcement.startDate} hourPrecision={false} prefix={false} />
-                  </td>
-                  <td class="px-4 py-3 text-left text-sm text-zinc-300">
-                    {announcement.endDate ? (
-                      <TimeFormatted date={announcement.endDate} hourPrecision={false} prefix={false} />
-                    ) : (
-                      <span class="text-zinc-500">—</span>
-                    )}
-                  </td>
-                  <td class="px-4 py-3 text-center text-sm">
-                    <span
-                      class={`inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${announcement.isActive ? 'bg-green-900/30 text-green-400' : 'bg-zinc-700/50 text-zinc-400'}`}
-                    >
-                      {announcement.isActive ? 'Active' : 'Inactive'}
-                    </span>
-                  </td>
-                  <td class="px-4 py-3 text-left text-sm text-zinc-400">
-                    <TimeFormatted date={announcement.createdAt} hourPrecision hoursShort prefix={false} />
-                  </td>
-                  <td class="px-4 py-3">
-                    <div class="flex justify-center gap-2">
-                      <Tooltip
-                        as="button"
-                        type="button"
-                        data-id={announcement.id}
-                        class="edit-button inline-flex items-center rounded-md border border-blue-500/50 bg-blue-500/20 px-1 py-1 text-xs text-blue-400 transition-colors hover:bg-blue-500/30"
-                        text="Edit"
-                        data-announcement={JSON.stringify(announcement)}
                       >
-                        <Icon name="ri:edit-line" class="size-4" />
+                        {announcement.type}
-                      </Tooltip>
+                      </span>
+                    </td>
+                    <td class="px-4 py-3 text-left text-sm text-zinc-300">
+                      <TimeFormatted date={announcement.startDate} hourPrecision={false} prefix={false} />
+                    </td>
+                    <td class="px-4 py-3 text-left text-sm text-zinc-300">
+                      {announcement.endDate ? (
+                        <TimeFormatted date={announcement.endDate} hourPrecision={false} prefix={false} />
+                      ) : (
+                        <span class="text-zinc-500">—</span>
+                      )}
+                    </td>
+                    <td class="px-4 py-3 text-center text-sm">
+                      <span
+                        class={`inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${announcement.isActive ? 'bg-green-900/30 text-green-400' : 'bg-zinc-700/50 text-zinc-400'}`}
+                      >
+                        {announcement.isActive ? 'Active' : 'Inactive'}
+                      </span>
+                    </td>
+                    <td class="px-4 py-3 text-left text-sm text-zinc-400">
+                      <TimeFormatted date={announcement.createdAt} hourPrecision hoursShort prefix={false} />
+                    </td>
+                    <td class="px-4 py-3">
+                      <div class="flex justify-center gap-2">
+                        <Tooltip
+                          as="button"
+                          type="button"
+                          data-id={announcement.id}
+                          class="edit-button inline-flex items-center rounded-md border border-blue-500/50 bg-blue-500/20 px-1 py-1 text-xs text-blue-400 transition-colors hover:bg-blue-500/30"
+                          text="Edit"
+                          onclick={`document.getElementById('edit-announcement-form-${announcement.id}').classList.toggle('hidden')`}
+                        >
+                          <Icon name="ri:edit-line" class="size-4" />
+                        </Tooltip>
 
+                        <form
+                          method="POST"
+                          action={actions.admin.announcement.toggleActive}
+                          class="inline-block"
+                          data-confirm={`Are you sure you want to ${announcement.isActive ? 'deactivate' : 'activate'} this announcement?`}
+                        >
+                          <input type="hidden" name="id" value={announcement.id} />
+                          <input type="hidden" name="isActive" value={String(!announcement.isActive)} />
+                          <button
+                            type="submit"
+                            class={`rounded-md border px-1 py-1 text-xs transition-colors ${
+                              announcement.isActive
+                                ? 'border-yellow-500/50 bg-yellow-500/20 text-yellow-400 hover:bg-yellow-500/30'
+                                : 'border-green-500/50 bg-green-500/20 text-green-400 hover:bg-green-500/30'
+                            }`}
+                          >
+                            <Tooltip text={announcement.isActive ? 'Deactivate' : 'Activate'}>
+                              <Icon
+                                name={announcement.isActive ? 'ri:pause-circle-line' : 'ri:play-circle-line'}
+                                class="size-4"
+                              />
+                            </Tooltip>
+                          </button>
+                        </form>
+
+                        <form
+                          method="POST"
+                          action={actions.admin.announcement.delete}
+                          class="inline-block"
+                          data-confirm="Are you sure you want to delete this announcement?"
+                        >
+                          <input type="hidden" name="id" value={announcement.id} />
+                          <button
+                            type="submit"
+                            class="rounded-md border border-red-500/50 bg-red-500/20 px-1 py-1 text-xs text-red-400 transition-colors hover:bg-red-500/30"
+                          >
+                            <Tooltip text="Delete">
+                              <Icon name="ri:delete-bin-line" class="size-4" />
+                            </Tooltip>
+                          </button>
+                        </form>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr id={`edit-announcement-form-${announcement.id}`} class="hidden bg-zinc-700/20">
+                    <td colspan="7" class="p-4">
+                      <h3 class="font-title text-md mb-3 font-semibold text-blue-300">
+                        Edit: {announcement.title}
+                      </h3>
                       <form
                         method="POST"
-                        action={actions.admin.announcement.toggleActive}
+                        action={actions.admin.announcement.update}
-                        class="inline-block"
+                        class="grid gap-4 md:grid-cols-2"
-                        data-confirm={`Are you sure you want to ${announcement.isActive ? 'deactivate' : 'activate'} this announcement?`}
                       >
                         <input type="hidden" name="id" value={announcement.id} />
-                        <input type="hidden" name="isActive" value={String(!announcement.isActive)} />
+
-                        <button
+                        <div class="space-y-3 md:col-span-2">
-                          type="submit"
+                          <InputText
-                          class={`rounded-md border px-1 py-1 text-xs transition-colors ${
+                            label="Title*"
-                            announcement.isActive
+                            name="title"
-                              ? 'border-yellow-500/50 bg-yellow-500/20 text-yellow-400 hover:bg-yellow-500/30'
+                            inputProps={{
-                              : 'border-green-500/50 bg-green-500/20 text-green-400 hover:bg-green-500/30'
+                              id: `edit-title-${announcement.id}`,
-                          }`}
+                              required: true,
-                        >
+                              maxlength: 255,
-                          <Tooltip text={announcement.isActive ? 'Deactivate' : 'Activate'}>
+                              value: announcement.title,
-                            <Icon
+                            }}
-                              name={announcement.isActive ? 'ri:pause-circle-line' : 'ri:play-circle-line'}
+                          />
-                              class="size-4"
+                          <InputTextArea
+                            label="Content*"
+                            name="content"
+                            value={announcement.content}
+                            inputProps={{
+                              id: `edit-content-${announcement.id}`,
+                              required: true,
+                              maxlength: 1000,
+                              rows: 3,
+                            }}
+                          />
+                        </div>
+
+                        <div class="space-y-3">
+                          <InputSelect
+                            label="Type*"
+                            name="type"
+                            options={[
+                              { label: 'Info', value: 'INFO' },
+                              { label: 'Warning', value: 'WARNING' },
+                              { label: 'Alert', value: 'ALERT' },
+                            ]}
+                            selectProps={{
+                              id: `edit-type-${announcement.id}`,
+                              required: true,
+                              value: announcement.type,
+                            }}
+                          />
+                          <InputText
+                            label="Start Date & Time*"
+                            name="startDate"
+                            inputProps={{
+                              id: `edit-startDate-${announcement.id}`,
+                              type: 'datetime-local',
+                              required: true,
+                              value: new Date(announcement.startDate).toISOString().slice(0, 16),
+                            }}
+                          />
+                          <InputText
+                            label="End Date & Time (Optional)"
+                            name="endDate"
+                            inputProps={{
+                              id: `edit-endDate-${announcement.id}`,
+                              type: 'datetime-local',
+                              value: announcement.endDate
+                                ? new Date(announcement.endDate).toISOString().slice(0, 16)
+                                : '',
+                            }}
+                          />
+                        </div>
+
+                        <div class="space-y-3">
+                          <InputCardGroup
+                            name="isActive"
+                            label="Status"
+                            options={[
+                              { label: 'Active', value: 'true' },
+                              { label: 'Inactive', value: 'false' },
+                            ]}
+                            selectedValue={announcement.isActive ? 'true' : 'false'}
+                            cardSize="sm"
+                          />
+                          <div class="pt-4">
+                            <InputSubmitButton label="Save Changes" icon="ri:save-line" hideCancel={true} />
+                            <Button
+                              type="button"
+                              label="Cancel"
+                              color="gray"
+                              onclick={`document.getElementById('edit-announcement-form-${announcement.id}').classList.toggle('hidden')`}
+                              class="ml-2"
                             />
-                          </Tooltip>
+                          </div>
-                        </button>
+                        </div>
                       </form>
-
+                    </td>
-                      <form
+                  </tr>
-                        method="POST"
+                </>
-                        action={actions.admin.announcement.delete}
-                        class="inline-block"
-                        data-confirm="Are you sure you want to delete this announcement?"
-                      >
-                        <input type="hidden" name="id" value={announcement.id} />
-                        <button
-                          type="submit"
-                          class="rounded-md border border-red-500/50 bg-red-500/20 px-1 py-1 text-xs text-red-400 transition-colors hover:bg-red-500/30"
-                        >
-                          <Tooltip text="Delete">
-                            <Icon name="ri:delete-bin-line" class="size-4" />
-                          </Tooltip>
-                        </button>
-                      </form>
-                    </div>
-                  </td>
-                </tr>
               ))
             }
           </tbody>
@@ -714,6 +687,9 @@ if (toggleResult?.error) {
   input[type='date'] {
     color-scheme: dark;
   }
+  input[type='datetime-local'] {
+    color-scheme: dark;
+  }
 </style>
 
 <script>
@@ -730,53 +706,18 @@ if (toggleResult?.error) {
     newAnnouncementForm?.classList.add('hidden')
   })
 
-  // Edit Modal functionality
-  const editModal = document.getElementById('edit-announcement-modal') as HTMLDialogElement
-  const editButtons = document.querySelectorAll('.edit-button')
-  const editForm = document.getElementById('edit-form') as HTMLFormElement
-
-  editButtons.forEach((button) => {
-    button.addEventListener('click', () => {
-      const announcementData = JSON.parse(button.getAttribute('data-announcement') || '{}')
-
-      const idInput = document.getElementById('edit-id') as HTMLInputElement
-      const titleInput = document.getElementById('edit-title') as HTMLInputElement
-      const contentInput = document.getElementById('edit-content') as HTMLTextAreaElement
-      const typeSelect = document.getElementById('edit-type') as HTMLSelectElement
-      const startDateInput = document.getElementById('edit-startDate') as HTMLInputElement
-      const endDateInput = document.getElementById('edit-endDate') as HTMLInputElement
-      const isActiveCheckbox = document.getElementById('edit-isActive') as HTMLInputElement
-
-      idInput.value = announcementData.id.toString()
-      titleInput.value = announcementData.title
-      contentInput.value = announcementData.content
-      typeSelect.value = announcementData.type
-
-      // Format dates for the date inputs (YYYY-MM-DDThh:mm)
-      const formatDateForInput = (dateString: string | null) => {
-        if (!dateString) return ''
-        const date = new Date(dateString)
-        return date.toISOString().slice(0, 16)
-      }
-
-      startDateInput.value = formatDateForInput(announcementData.startDate) ?? ''
-      endDateInput.value = formatDateForInput(announcementData.endDate) ?? ''
-      isActiveCheckbox.checked = announcementData.isActive
-
-      editModal?.showModal()
-    })
-  })
-
   // Delete Modal functionality
   const deleteModal = document.getElementById('delete-confirmation-modal') as HTMLDialogElement
   const deleteButtons = document.querySelectorAll('.delete-button')
-  const deleteForm = document.getElementById('delete-form') as HTMLFormElement
+  // const deleteForm = document.getElementById('delete-form') as HTMLFormElement // Not strictly needed if not manipulating it
 
   deleteButtons.forEach((button) => {
     button.addEventListener('click', () => {
       const id = button.getAttribute('data-id')
       const deleteIdInput = document.getElementById('delete-id') as HTMLInputElement
-      deleteIdInput.value = id || ''
+      if (deleteIdInput) {
+        deleteIdInput.value = id || ''
+      }
       deleteModal?.showModal()
     })
   })

web/src/pages/admin/services/[slug]/edit.astro

@@ -8,8 +8,8 @@ import {
 } from '@prisma/client'
 import { Icon } from 'astro-icon/components'
 import { actions, isInputError } from 'astro:actions'
-import { Image } from 'astro:assets'
 
+import MyPicture from '../../../../components/MyPicture.astro'
 import { serviceVisibilities } from '../../../../constants/serviceVisibility'
 import BaseLayout from '../../../../layouts/BaseLayout.astro'
 import { cn } from '../../../../lib/cn'
@@ -334,7 +334,7 @@ const buttonSmallWarningClasses = cn(
             {
               service.imageUrl ? (
                 <div class="mt-2 shrink-0">
-                  <Image
+                  <MyPicture
                     src={service.imageUrl}
                     alt="Current service image"
                     width={100}

web/src/pages/admin/services/index.astro

@@ -2,9 +2,8 @@
 import { ServiceVisibility, VerificationStatus, type Prisma } from '@prisma/client'
 import { z } from 'astro/zod'
 import { Icon } from 'astro-icon/components'
-import { Image } from 'astro:assets'
 
-import defaultImage from '../../../assets/fallback-service-image.jpg'
+import MyPicture from '../../../components/MyPicture.astro'
 import SortArrowIcon from '../../../components/SortArrowIcon.astro'
 import { getKycLevelInfo } from '../../../constants/kycLevels'
 import { getVerificationStatusInfo } from '../../../constants/verificationStatus'
@@ -343,23 +342,14 @@ const truncate = (text: string, length: number) => {
                   <td class="px-4 py-3">
                     <div class="flex items-center space-x-3">
                       <div class="h-10 w-10 flex-shrink-0">
-                        {service.imageUrl ? (
+                        <MyPicture
-                          <Image
+                          src={service.imageUrl}
-                            src={service.imageUrl}
+                          fallback="service"
-                            alt={service.name}
+                          alt={service.name}
-                            width={40}
+                          width={40}
-                            height={40}
+                          height={40}
-                            class="h-10 w-10 rounded-md object-cover"
+                          class="h-10 w-10 rounded-md object-cover"
-                          />
+                        />
-                        ) : (
-                          <Image
-                            src={defaultImage}
-                            alt={service.name}
-                            width={40}
-                            height={40}
-                            class="h-10 w-10 rounded-md object-cover"
-                          />
-                        )}
                       </div>
                       <div class="min-w-0 flex-1">
                         <div class="text-sm font-medium text-zinc-200">{service.name}</div>

web/src/pages/admin/users/[username].astro

@@ -1,7 +1,6 @@
 ---
 import { Icon } from 'astro-icon/components'
 import { actions, isInputError } from 'astro:actions'
-import { Image } from 'astro:assets'
 
 import BadgeSmall from '../../../components/BadgeSmall.astro'
 import Button from '../../../components/Button.astro'
@@ -11,6 +10,7 @@ import InputSelect from '../../../components/InputSelect.astro'
 import InputSubmitButton from '../../../components/InputSubmitButton.astro'
 import InputText from '../../../components/InputText.astro'
 import InputTextArea from '../../../components/InputTextArea.astro'
+import MyPicture from '../../../components/MyPicture.astro'
 import TimeFormatted from '../../../components/TimeFormatted.astro'
 import { getServiceUserRoleInfo, serviceUserRoles } from '../../../constants/serviceUserRoles'
 import BaseLayout from '../../../layouts/BaseLayout.astro'
@@ -117,14 +117,13 @@ if (!user) return Astro.rewrite('/404')
 
 <BaseLayout
   pageTitle={`User: ${user.name}`}
-  htmx
   widthClassName="max-w-screen-lg"
   className={{ main: 'space-y-24' }}
 >
   <div class="mt-12">
     {
       !!user.picture && (
-        <Image
+        <MyPicture
           src={user.picture}
           alt=""
           width={80}
@@ -140,9 +139,9 @@ if (!user) return Astro.rewrite('/404')
     </h1>
 
     <div class="mb-4 flex flex-wrap justify-center gap-2">
-      {user.admin && <BadgeSmall color="green" text="Admin" icon="ri:shield-check-fill" />}
+      {user.admin && <BadgeSmall color="green" text="Admin" icon="ri:shield-star-fill" />}
       {user.verified && <BadgeSmall color="cyan" text="Verified" icon="ri:verified-badge-fill" />}
-      {user.verifier && <BadgeSmall color="blue" text="Verifier" icon="ri:check-fill" />}
+      {user.verifier && <BadgeSmall color="blue" text="Moderator" icon="ri:graduation-cap-fill" />}
       {user.spammer && <BadgeSmall color="red" text="Spammer" icon="ri:alert-fill" />}
     </div>
 
@@ -172,7 +171,13 @@ if (!user) return Astro.rewrite('/404')
     </div>
   </div>
 
-  <form method="POST" action={actions.admin.user.update} enctype="multipart/form-data" class="space-y-2">
+  <form
+    method="POST"
+    action={actions.admin.user.update}
+    enctype="multipart/form-data"
+    class="space-y-2"
+    data-astro-reload
+  >
     <h2 class="font-title text-center text-3xl leading-none font-bold">Edit profile</h2>
 
     <input type="hidden" name="id" value={user.id} />
@@ -213,17 +218,23 @@ if (!user) return Astro.rewrite('/404')
       value={user.picture}
       error={updateInputErrors.pictureFile}
       square
-      description="Upload a square image for best results. Supported formats: JPG, PNG, WebP, AVIF, JXL. Max size: 5MB."
+      description="Upload a square image for best results. Supported formats: JPG, PNG, WebP, AVIF. Max size: 5MB."
     />
 
     <InputCardGroup
-      name="role"
+      name="type"
-      label="Role"
+      label="Type"
       options={[
-        { label: 'Admin', value: 'admin', icon: 'ri:shield-check-fill' },
+        { label: 'Admin', value: 'admin', icon: 'ri:shield-star-fill' },
-        { label: 'Verified', value: 'verified', icon: 'ri:verified-badge-fill', disabled: true },
+        { label: 'Moderator', value: 'verifier', icon: 'ri:graduation-cap-fill' },
-        { label: 'Verifier', value: 'verifier', icon: 'ri:check-fill' },
         { label: 'Spammer', value: 'spammer', icon: 'ri:alert-fill' },
+        {
+          label: 'Verified',
+          value: 'verified',
+          icon: 'ri:verified-badge-fill',
+          disabled: true,
+          noTransitionPersist: true,
+        },
       ]}
       selectedValue={[
         user.admin ? 'admin' : null,
@@ -235,7 +246,7 @@ if (!user) return Astro.rewrite('/404')
       cardSize="sm"
       iconSize="sm"
       multiple
-      error={updateInputErrors.role}
+      error={updateInputErrors.type}
     />
 
     <InputSubmitButton label="Save" icon="ri:save-line" hideCancel />
@@ -254,7 +265,7 @@ if (!user) return Astro.rewrite('/404')
               <div class="mb-1 flex items-center justify-between gap-4">
                 <div class="flex items-center gap-1">
                   {!!note.addedByUser?.picture && (
-                    <Image
+                    <MyPicture
                       src={note.addedByUser.picture}
                       alt=""
                       width={12}
@@ -280,7 +291,12 @@ if (!user) return Astro.rewrite('/404')
                     <Icon name="ri:edit-line" class="size-5" />
                   </label>
 
-                  <form method="POST" action={actions.admin.user.internalNotes.delete} class="contents">
+                  <form
+                    method="POST"
+                    action={actions.admin.user.internalNotes.delete}
+                    class="contents"
+                    data-astro-reload
+                  >
                     <input type="hidden" name="noteId" value={note.id} />
                     <button type="submit" class="text-day-300 p-1 transition-colors hover:text-red-400">
                       <Icon name="ri:delete-bin-line" class="size-5" />
@@ -297,6 +313,7 @@ if (!user) return Astro.rewrite('/404')
                 method="POST"
                 action={actions.admin.user.internalNotes.update}
                 data-note-edit-form
+                data-astro-reload
                 class="mt-4 hidden space-y-4"
               >
                 <input type="hidden" name="noteId" value={note.id} />
@@ -314,7 +331,12 @@ if (!user) return Astro.rewrite('/404')
       )
     }
 
-    <form method="POST" action={actions.admin.user.internalNotes.add} class="mt-10 space-y-2">
+    <form
+      method="POST"
+      action={actions.admin.user.internalNotes.add}
+      class="mt-10 space-y-2"
+      data-astro-reload
+    >
       <h3 class="font-title mb-0 text-center text-xl leading-none font-bold">Add Note</h3>
 
       <input type="hidden" name="userId" value={user.id} />

web/src/pages/attributes.astro

@@ -1,12 +1,11 @@
 ---
 import { Icon } from 'astro-icon/components'
 import { Markdown } from 'astro-remote'
-import { Picture } from 'astro:assets'
 import { z } from 'astro:content'
 import { orderBy } from 'lodash-es'
 
 import BadgeStandard from '../components/BadgeStandard.astro'
-import { makeOverallScoreInfo } from '../components/ScoreSquare.astro'
+import MyPicture from '../components/MyPicture.astro'
 import SortArrowIcon from '../components/SortArrowIcon.astro'
 import { getAttributeCategoryInfo } from '../constants/attributeCategories'
 import { getAttributeTypeInfo } from '../constants/attributeTypes'
@@ -15,6 +14,7 @@ import BaseLayout from '../layouts/BaseLayout.astro'
 import { sortAttributes } from '../lib/attributes'
 import { cn } from '../lib/cn'
 import { formatNumber } from '../lib/numbers'
+import { makeOverallScoreInfo } from '../lib/overallScore'
 import { zodParseQueryParamsStoringErrors } from '../lib/parseUrlFilters'
 import { prisma } from '../lib/prisma'
 
@@ -102,8 +102,13 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
 
 <BaseLayout
   pageTitle="Attributes"
-  description="Browse all available service attributes used to evaluate privacy and trust scores on KYCnot.me."
+  description="Browse all available service attributes used to evaluate privacy and trust scores."
-  ogImage={{ template: 'generic', title: 'All attributes' }}
+  ogImage={{
+    template: 'generic',
+    title: 'All attributes',
+    description: 'Browse all available service attributes',
+    icon: 'ri:list-radio',
+  }}
 >
   <h1 class="font-title mb-2 text-center text-3xl font-bold text-white">Service attributes</h1>
 
@@ -202,12 +207,11 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
                       class="flex items-center gap-2 rounded-md p-2 transition-colors hover:bg-zinc-800"
                     >
                       {service.imageUrl ? (
-                        <Picture
+                        <MyPicture
                           src={service.imageUrl}
                           alt={service.name}
                           width={24}
                           height={24}
-                          formats={['jxl', 'avif', 'webp']}
                           class="size-6 shrink-0 rounded-xs object-contain"
                         />
                       ) : (
@@ -349,12 +353,11 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
                       class="flex items-center gap-2 rounded-md p-2 transition-colors hover:bg-zinc-800"
                     >
                       {service.imageUrl ? (
-                        <Picture
+                        <MyPicture
                           src={service.imageUrl}
                           alt={service.name}
                           width={24}
                           height={24}
-                          formats={['jxl', 'avif', 'webp']}
                           class="size-6 shrink-0 rounded-xs object-contain"
                         />
                       ) : (

web/src/pages/events.astro

@@ -1,11 +1,11 @@
 ---
 import { z } from 'astro/zod'
 import { Icon } from 'astro-icon/components'
-import { Picture } from 'astro:assets'
 import { orderBy } from 'lodash-es'
 
 import Button from '../components/Button.astro'
 import FormatTimeInterval from '../components/FormatTimeInterval.astro'
+import MyPicture from '../components/MyPicture.astro'
 import TimeFormatted from '../components/TimeFormatted.astro'
 import {
   eventTypes,
@@ -151,7 +151,12 @@ const createUrlWithoutFilter = (paramName: keyof typeof params) => {
   description="Discover important events, updates, and news about KYC-free services in chronological order."
   widthClassName="max-w-screen-lg"
   className={{ main: 'sm:flex sm:items-start sm:gap-6' }}
-  ogImage={{ template: 'generic', title: 'Events' }}
+  ogImage={{
+    template: 'generic',
+    title: 'Events',
+    description: 'Discover important events, updates, and news about KYC-free services',
+    icon: 'ri:calendar-event-line',
+  }}
   htmx
 >
   <h1 class="font-title mb-6 block text-center text-2xl font-bold text-white sm:hidden">
@@ -287,12 +292,11 @@ const createUrlWithoutFilter = (paramName: keyof typeof params) => {
                   class="group flex h-8 items-center gap-2 rounded-full border border-green-500/30 bg-black/40 px-3 text-sm text-white"
                 >
                   {service?.imageUrl && (
-                    <Picture
+                    <MyPicture
                       src={service.imageUrl}
                       alt={service.name}
                       width={16}
                       height={16}
-                      formats={['jxl', 'avif', 'webp']}
                       class="size-4 shrink-0 rounded-xs object-contain"
                     />
                   )}
@@ -385,12 +389,11 @@ const createUrlWithoutFilter = (paramName: keyof typeof params) => {
                     class="-m-1.5 flex w-fit items-center rounded-md p-1.5 leading-none transition-colors hover:bg-zinc-800"
                   >
                     {event.service.imageUrl && (
-                      <Picture
+                      <MyPicture
                         src={event.service.imageUrl}
                         alt={event.service.name}
                         width={16}
                         height={16}
-                        formats={['jxl', 'avif', 'webp']}
                         class="size-4 shrink-0 rounded-xs object-contain"
                       />
                     )}

web/src/pages/index.astro

@@ -10,6 +10,7 @@ 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 { getAttributeTypeInfo } from '../constants/attributeTypes'
 import {
   currencies,
   currenciesZodEnumBySlug,
@@ -31,7 +32,7 @@ import { prisma } from '../lib/prisma'
 import { makeSortSeed } from '../lib/sortSeed'
 import { transformCase } from '../lib/strings'
 
-import type { AttributeType, Prisma } from '@prisma/client'
+import type { Prisma } from '@prisma/client'
 
 const MIN_CATEGORIES_TO_SHOW = 8
 const MIN_ATTRIBUTES_TO_SHOW = 8
@@ -185,7 +186,8 @@ if (redirectUrl) return Astro.redirect(redirectUrl.toString())
 
 export type ServicesFiltersObject = typeof filters
 
-const [categories, [services, totalServices, hadToIncludeCommunityContributed]] =
+const currentDate = new Date()
+const [categories, [services, totalServices, hadToIncludeCommunityContributed], activeAnnouncements] =
   await Astro.locals.banners.tryMany([
     [
       'Unable to load category filters.',
@@ -324,7 +326,10 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
         })
         let hadToIncludeCommunityContributed = false
 
-        if (totalServices === 0 && !where.verificationStatus.in.includes('COMMUNITY_CONTRIBUTED')) {
+        if (
+          totalServices === 0 &&
+          areEqualArraysWithoutOrder(where.verificationStatus.in, ['VERIFICATION_FAILED', 'APPROVED'])
+        ) {
           const [unsortedServiceCommunityServices, totalCommunityServices] =
             await prisma.service.findManyAndCount({
               where: {
@@ -406,27 +411,30 @@ const [categories, [services, totalServices, hadToIncludeCommunityContributed]]
       },
       [[] as [], 0, false] as const,
     ],
+    [
+      'Unable to load announcements.',
+      () =>
+        prisma.announcement.findMany({
+          where: {
+            isActive: true,
+            startDate: { lte: currentDate },
+            OR: [{ endDate: null }, { endDate: { gt: currentDate } }],
+          },
+          select: {
+            id: true,
+            title: true,
+            content: true,
+            type: true,
+            startDate: true,
+            endDate: true,
+            isActive: true,
+          },
+          orderBy: [{ type: 'desc' }, { createdAt: 'desc' }],
+        }),
+      [],
+    ],
   ])
 
-const attributeIcons = {
-  GOOD: {
-    icon: 'ri:check-line',
-    iconClass: 'text-green-400',
-  },
-  BAD: {
-    icon: 'ri:close-line',
-    iconClass: 'text-red-400',
-  },
-  WARNING: {
-    icon: 'ri:alert-line',
-    iconClass: 'text-yellow-400',
-  },
-  INFO: {
-    icon: 'ri:information-line',
-    iconClass: 'text-blue-400',
-  },
-} as const satisfies Record<AttributeType, { icon: string; iconClass: string }>
-
 const attributes = await Astro.locals.banners.try(
   'Unable to load attribute filters.',
   () =>
@@ -451,12 +459,14 @@ const attributes = await Astro.locals.banners.try(
 const attributesByCategory = orderBy(
   Object.entries(
     groupBy(
-      attributes.map((attr) => ({
+      attributes.map((attr) => {
-        ...attr,
+        return {
-        ...attributeIcons[attr.type],
+          info: getAttributeTypeInfo(attr.type),
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+          ...attr,
-        value: filters.attr?.[attr.id] || undefined,
+          // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-      })),
+          value: filters.attr?.[attr.id] || undefined,
+        }
+      }),
       'category'
     )
   ).map(([category, attributes]) => ({
@@ -502,18 +512,7 @@ const filtersOptions = {
 
 export type ServicesFiltersOptions = typeof filtersOptions
 
-const currentDate = new Date()
+//
-const activeAnnouncements = await prisma.announcement.findMany({
-  where: {
-    isActive: true,
-    startDate: { lte: currentDate },
-    OR: [{ endDate: null }, { endDate: { gt: currentDate } }],
-  },
-  orderBy: [
-    { type: 'desc' }, // ALERT first, then WARNING, then INFO
-    { createdAt: 'desc' },
-  ],
-})
 ---
 
 <BaseLayout
@@ -529,11 +528,12 @@ const activeAnnouncements = await prisma.announcement.findMany({
     },
   ]}
 >
-  <!-- Display announcements at the top of the page -->
   <AnnouncementBanner announcements={activeAnnouncements} />
 
   <div class="flex flex-col gap-4 sm:flex-row sm:gap-8">
-    <div class="flex items-stretch sm:hidden">
+    <div
+      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 ? (
           <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">
@@ -656,11 +656,11 @@ const activeAnnouncements = await prisma.announcement.findMany({
       type="checkbox"
       id="show-filters"
       name="show-filters"
-      class="peer hidden"
+      class="peer sr-only sm:hidden"
       checked={Astro.url.searchParams.has('show-filters')}
     />
     <div
-      class="bg-night-700 fixed top-0 left-0 z-50 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 sm:relative sm:z-auto sm:h-auto sm:w-64 sm:translate-y-0 sm:overflow-visible sm:border-none sm:bg-none sm:p-0"
+      class="bg-night-700 fixed top-0 left-0 z-50 hidden h-dvh w-dvw shrink-0 translate-y-full overflow-y-auto overscroll-contain border-t border-green-500/30 px-8 pt-4 transition-transform peer-checked:translate-y-0 max-sm:peer-checked:block sm:relative sm:z-auto sm:block sm:h-auto sm:w-64 sm:translate-y-0 sm:overflow-visible sm:border-none sm:bg-none sm:p-0"
     >
       <ServicesFilters
         searchResultsId="search-results"

web/src/pages/karma.mdx

@@ -2,6 +2,7 @@
 layout: ../layouts/MarkdownLayout.astro
 title: How does karma work?
 description: "KYCnot.me has a user karma system, here's how it works"
+icon: 'ri:hearts-line'
 author: KYCnot.me
 pubDate: 2025-05-15
 ---

web/src/pages/notifications.astro

@@ -183,7 +183,12 @@ const notifications = dbNotifications.map((notification) => ({
   pageTitle="Notifications"
   description="View your notifications and manage your notification preferences."
   widthClassName="max-w-screen-lg"
-  ogImage={{ template: 'generic', title: 'Notifications' }}
+  ogImage={{
+    template: 'generic',
+    title: 'Notifications',
+    description: 'View and manage your notifications',
+    icon: 'ri:notification-line',
+  }}
 >
   <section class="mx-auto w-full">
     <div class="mb-4 flex items-center justify-between">

web/src/pages/ogimage.png.ts

@@ -1,23 +1,35 @@
-import { ogImageTemplates } from '../components/OgImage'
+import { ogImageTemplates, type OgImageAllTemplatesWithProps } from '../components/OgImage'
-import { urlParamsToObject } from '../lib/urls'
 
 import type { APIRoute } from 'astro'
+import type { Misc } from 'ts-toolbelt'
 
-export const GET: APIRoute = ({ url }) => {
+function toJSON<T extends Misc.JSON.Value>(data: string | null | undefined): T | undefined {
-  const { template, ...props } = urlParamsToObject(url.searchParams)
+  if (!data) return undefined
+  try {
+    return JSON.parse(data) as T
+  } catch (_error) {
+    return undefined
+  }
+}
 
-  if (!template) return ogImageTemplates.default()
+export const GET: APIRoute = async (context) => {
+  const { template, ...props } = toJSON<OgImageAllTemplatesWithProps>(
+    context.url.searchParams.get('data')
+  ) ?? { template: 'default' }
+
+  if (!template as unknown) return ogImageTemplates.default({}, context)
 
   if (!(template in ogImageTemplates)) {
     console.error(`Invalid template: "${template}"`)
-    return ogImageTemplates.default()
+    return ogImageTemplates.default({}, context)
   }
 
-  const response = ogImageTemplates[template as keyof typeof ogImageTemplates](props)
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
+  const response = await ogImageTemplates[template](props as any, context)
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (!response) {
     console.error(`Cannot generate image for template: ${template} and props: ${JSON.stringify(props)}`)
-    return ogImageTemplates.default()
+    return ogImageTemplates.default({}, context)
   }
 
   return response

web/src/pages/service-suggestion/[id].astro

@@ -86,7 +86,12 @@ const statusInfo = getServiceSuggestionStatusInfo(serviceSuggestion.status)
 <BaseLayout
   pageTitle={`${serviceSuggestion.service.name} | Service suggestion`}
   description="View your service suggestion"
-  ogImage={{ template: 'generic', title: serviceSuggestion.service.name }}
+  ogImage={{
+    template: 'generic',
+    title: 'My service suggestions',
+    description: 'View and manage your service suggestion',
+    icon: 'ri:service-line',
+  }}
   widthClassName="max-w-screen-md"
   htmx
   breadcrumbs={[

web/src/pages/service-suggestion/edit.astro

@@ -65,7 +65,12 @@ if (!service) return Astro.rewrite('/404')
 <BaseLayout
   pageTitle="Edit service"
   description="Suggest an edit to service"
-  ogImage={{ template: 'generic', title: 'Edit service' }}
+  ogImage={{
+    template: 'generic',
+    title: 'Edit service',
+    description: 'Suggest an edit to service',
+    icon: 'ri:edit-line',
+  }}
   widthClassName="max-w-screen-md"
   breadcrumbs={[
     {

web/src/pages/service-suggestion/index.astro

@@ -1,11 +1,10 @@
 ---
 import { Icon } from 'astro-icon/components'
 import { actions } from 'astro:actions'
-import { Picture } from 'astro:assets'
 import { z } from 'astro:content'
 
-import defaultServiceImage from '../../assets/fallback-service-image.jpg'
 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 {
@@ -72,7 +71,12 @@ const success = !!createResult && !createResult.error
 <BaseLayout
   pageTitle="My service suggestions"
   description="Manage your service suggestions"
-  ogImage={{ template: 'generic', title: 'Service suggestions' }}
+  ogImage={{
+    template: 'generic',
+    title: 'Service suggestions',
+    description: 'Manage your service suggestions',
+    icon: 'ri:service-line',
+  }}
   widthClassName="max-w-screen-md"
   breadcrumbs={[
     {
@@ -122,13 +126,13 @@ const success = !!createResult && !createResult.error
                   href={`/service/${suggestion.service.slug}`}
                   class="inline-flex w-full min-w-32 items-center gap-2 hover:underline"
                 >
-                  <Picture
+                  <MyPicture
-                    src={suggestion.service.imageUrl ?? (defaultServiceImage as unknown as string)}
+                    src={suggestion.service.imageUrl}
+                    fallback="service"
                     alt={suggestion.service.name}
                     width={32}
                     height={32}
                     class="inline-block size-8 min-w-8 shrink-0 rounded-md"
-                    formats={['jxl', 'avif', 'webp']}
                   />
                   <span class="shrink truncate">{suggestion.service.name}</span>
                 </a>

web/src/pages/service-suggestion/new.astro

@@ -65,7 +65,12 @@ const [categories, attributes] = await Astro.locals.banners.tryMany([
 <BaseLayout
   pageTitle="New service"
   description="Suggest a new service to be added to KYCnot.me"
-  ogImage={{ template: 'generic', title: 'New service' }}
+  ogImage={{
+    template: 'generic',
+    title: 'New service',
+    description: 'Suggest a new service to be listed',
+    icon: 'ri:add-circle-line',
+  }}
   widthClassName="max-w-screen-md"
   breadcrumbs={[
     {

web/src/pages/service/[slug].astro

@@ -4,8 +4,7 @@ import { Icon } from 'astro-icon/components'
 import { Markdown } from 'astro-remote'
 import { Schema } from 'astro-seo-schema'
 import { actions } from 'astro:actions'
-import { Picture } from 'astro:assets'
+import { head, orderBy, pick, shuffle, sortBy, tail } from 'lodash-es'
-import { head, orderBy, shuffle, sortBy, tail } from 'lodash-es'
 
 import AdminOnly from '../../components/AdminOnly.astro'
 import BadgeSmall from '../../components/BadgeSmall.astro'
@@ -17,6 +16,7 @@ import DropdownButton from '../../components/DropdownButton.astro'
 import DropdownButtonItemForm from '../../components/DropdownButtonItemForm.astro'
 import DropdownButtonItemLink from '../../components/DropdownButtonItemLink.astro'
 import FormatTimeInterval from '../../components/FormatTimeInterval.astro'
+import MyPicture from '../../components/MyPicture.astro'
 import { makeOgImageUrl, type OgImageAllTemplatesWithProps } from '../../components/OgImage'
 import ScoreGauge from '../../components/ScoreGauge.astro'
 import ScoreSquare from '../../components/ScoreSquare.astro'
@@ -349,8 +349,12 @@ const getVerificationStepStatusInfo = (status: VerificationStepStatus) => {
 const itemReviewedId = new URL(`/service/${service.slug}`, Astro.url).href
 
 const ogImageTemplateData = {
-  template: 'generic',
+  template: 'service',
   title: service.name,
+  description: service.description,
+  categories: service.categories.map((category) => pick(category, ['name', 'icon'])),
+  score: service.overallScore,
+  imageUrl: service.imageUrl,
 } satisfies OgImageAllTemplatesWithProps
 ---
 
@@ -477,9 +481,8 @@ const ogImageTemplateData = {
   <div class="flex items-center gap-4">
     {
       !!service.imageUrl && (
-        <Picture
+        <MyPicture
           src={service.imageUrl}
-          formats={['jxl', 'avif', 'webp']}
           alt={service.name || "Service's logo"}
           class="size-12 shrink-0 rounded-sm object-contain"
           width={48}
@@ -693,10 +696,15 @@ const ogImageTemplateData = {
           </li>
         ))}
 
-        <input type="checkbox" class="peer hidden" id="show-more-links" checked={hiddenLinks.length === 0} />
+        <input
+          type="checkbox"
+          class="peer sr-only checked:hidden"
+          id="show-more-links"
+          checked={hiddenLinks.length === 0}
+        />
 
         {hiddenLinks.length > 0 && (
-          <li class="peer-checked:hidden">
+          <li class="peer-focus-visible:ring-offset-night-700 rounded-full peer-checked:hidden peer-focus-visible:ring-4 peer-focus-visible:ring-orange-500 peer-focus-visible:ring-offset-2">
             <label
               for="show-more-links"
               class="2xs:text-sm 2xs:h-8 2xs:gap-2 2xs:px-4 text-day-100 bg-day-800 hover:bg-day-900 inline-flex h-6 cursor-pointer items-center gap-1 rounded-full px-2 text-xs whitespace-nowrap transition-colors duration-200"

web/src/pages/u/[username].astro

@@ -1,14 +1,13 @@
 ---
 import { Icon } from 'astro-icon/components'
 import { actions } from 'astro:actions'
-import { Picture } from 'astro:assets'
 import { sortBy } from 'lodash-es'
 
-import defaultServiceImage from '../../assets/fallback-service-image.jpg'
 import AdminOnly from '../../components/AdminOnly.astro'
 import BadgeSmall from '../../components/BadgeSmall.astro'
 import InputSubmitButton from '../../components/InputSubmitButton.astro'
 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 { getKarmaTransactionActionInfo } from '../../constants/karmaTransactionActions'
@@ -178,7 +177,13 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
 <BaseLayout
   pageTitle={`${user.name} - Account`}
   description="Manage your user profile"
-  ogImage={{ template: 'generic', title: `${user.name} | Account` }}
+  ogImage={{
+    template: 'generic',
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    title: user.displayName || user.name,
+    description: 'User profile page',
+    icon: 'ri:user-3-line',
+  }}
   widthClassName="max-w-screen-md"
   className={{
     main: 'space-y-6',
@@ -238,7 +243,13 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
     <header class="flex items-center gap-4">
       {
         user.picture ? (
-          <img src={user.picture} alt="" class="ring-day-500/30 size-16 rounded-full ring-2" />
+          <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" />
@@ -555,8 +566,9 @@ const isCurrentUser = !!Astro.locals.user && user.id === Astro.locals.user.id
                   href={`/service/${affiliation.service.slug}`}
                   class="text-day-300 group flex min-w-32 items-center gap-2 text-sm"
                 >
-                  <Picture
+                  <MyPicture
-                    src={affiliation.service.imageUrl ?? (defaultServiceImage as unknown as string)}
+                    src={affiliation.service.imageUrl}
+                    fallback="service"
                     alt={affiliation.service.name}
                     width={40}
                     height={40}