donation component

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 = {
-  id: number
-  title: string
-  content: string
-  type: AnnouncementType
-  startDate: Date
-  endDate: Date | null
-  isActive: boolean
-}
+import type { Prisma } from '@prisma/client'
 
-export type Props = {
-  announcements: Announcement[]
+type Props = {
+  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/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/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/pages/about.mdx

@@ -7,6 +7,8 @@ description: 'Learn how KYCnot.me website works and about our mission to protect
 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.
@@ -190,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:
-  - `88V2Xi2mvcu3NdnHkVeZGyPtACg2w3iXZdUMJugUiPvFQHv5mVkih3o43ceVGz6cVs9uTBMt4MRMVW2xFgfGdh8DTCQ7vtp`
+<DonationAddress
+  cryptoName="Monero"
+  cryptoIcon="monero"
+  address="86nkJeHWarEYZJh3gcPGKcQeueKbq2uRRC2NX6kopBpdHFfY1j4vmrVAwRG1T4pNBwBwfJ4U4USLUZ6CjDtacp8x4y8v3rq"
+/>
 
 ## Contact
 
@@ -202,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/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>
-            <label for="title" class="block text-xs font-medium text-zinc-400">Title*</label>
-            <input
-              type="text"
-              name="title"
-              id="title"
-              required
-              maxlength="255"
-              placeholder="Announcement 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>
+          <InputText
+            label="Title*"
+            name="title"
+            error={createInputErrors.title}
+            inputProps={{
+              required: true,
+              maxlength: 255,
+              placeholder: 'Announcement Title',
+              value: newAnnouncement.title,
+            }}
+          />
 
-          <div>
-            <label for="content" class="block text-xs font-medium text-zinc-400">Content*</label>
-            <textarea
-              name="content"
-              id="content"
-              required
-              maxlength="1000"
-              rows="3"
-              placeholder="Announcement Content"
-              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"
-              >{newAnnouncement.content}</textarea
-            >
-          </div>
+          <InputTextArea
+            label="Content*"
+            name="content"
+            error={createInputErrors.content}
+            value={newAnnouncement.content}
+            inputProps={{
+              required: true,
+              maxlength: 1000,
+              rows: 3,
+              placeholder: 'Announcement Content',
+            }}
+          />
         </div>
 
         <div class="space-y-3">
-          <div>
-            <label for="type" class="block text-xs font-medium text-zinc-400">Type*</label>
-            <select
-              name="type"
-              id="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>
+          <InputSelect
+            label="Type*"
+            name="type"
+            error={createInputErrors.type}
+            options={[
+              { label: 'Info', value: 'INFO' },
+              { label: 'Warning', value: 'WARNING' },
+              { label: 'Alert', value: 'ALERT' },
+            ]}
+            selectProps={{
+              required: true,
+              value: newAnnouncement.type,
+            }}
+          />
 
-          <div>
-            <label for="startDate" class="block text-xs font-medium text-zinc-400">Start Date & Time*</label>
-            <input
-              type="datetime-local"
-              name="startDate"
-              id="startDate"
-              required
-              min={currentDate}
-              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>
+          <InputText
+            label="Start Date & Time*"
+            name="startDate"
+            error={createInputErrors.startDate}
+            inputProps={{
+              type: 'datetime-local',
+              required: true,
+              value: newAnnouncement.startDate,
+            }}
+          />
 
-          <div>
-            <label for="endDate" class="block text-xs font-medium text-zinc-400"
-              >End Date & Time (Optional)</label
-            >
-            <input
-              type="datetime-local"
-              name="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>
+          <InputText
+            label="End Date & Time (Optional)"
+            name="endDate"
+            error={createInputErrors.endDate}
+            inputProps={{
+              type: 'datetime-local',
+              value: newAnnouncement.endDate,
+            }}
+          />
         </div>
 
         <div class="space-y-3">
-          <div class="flex items-center">
-            <input
-              type="checkbox"
-              name="isActive"
-              id="isActive"
-              value="true"
-              checked={newAnnouncement.isActive}
-              class="h-4 w-4 rounded border-zinc-700 bg-zinc-900 text-blue-600 focus:ring-blue-500"
-            />
-            <label for="isActive" class="ml-2 block text-sm text-zinc-400">Active</label>
-          </div>
+          <InputCardGroup
+            name="isActive"
+            label="Status"
+            error={createInputErrors.isActive}
+            options={[
+              { label: 'Active', value: 'true' },
+              { label: 'Inactive', value: 'false' },
+            ]}
+            selectedValue={newAnnouncement.isActive ? 'true' : 'false'}
+            cardSize="sm"
+          />
 
           <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" />
-              Create Announcement
-            </button>
-
+            <InputSubmitButton label="Create Announcement" icon="ri:save-line" />
             <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">
-                    <div class="font-medium text-zinc-200">{announcement.title}</div>
-                    <div class="mt-1 line-clamp-1 text-xs text-zinc-400">{announcement.content}</div>
-                  </td>
-                  <td class="px-4 py-3 text-left text-sm">
-                    <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)}
+                <>
+                  <tr class="group hover:bg-zinc-700/30">
+                    <td class="px-4 py-3 text-sm">
+                      <div class="font-medium text-zinc-200">{announcement.title}</div>
+                      <div class="mt-1 line-clamp-1 text-xs text-zinc-400">{announcement.content}</div>
+                    </td>
+                    <td class="px-4 py-3 text-left text-sm">
+                      <span
+                        class={`inline-flex items-center rounded-md px-2.5 py-0.5 text-xs font-medium ${getTypeBadgeClass(announcement.type)}`}
                       >
-                        <Icon name="ri:edit-line" class="size-4" />
-                      </Tooltip>
+                        {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"
+                          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}
-                        class="inline-block"
-                        data-confirm={`Are you sure you want to ${announcement.isActive ? 'deactivate' : 'activate'} this announcement?`}
+                        action={actions.admin.announcement.update}
+                        class="grid gap-4 md:grid-cols-2"
                       >
                         <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"
+
+                        <div class="space-y-3 md:col-span-2">
+                          <InputText
+                            label="Title*"
+                            name="title"
+                            inputProps={{
+                              id: `edit-title-${announcement.id}`,
+                              required: true,
+                              maxlength: 255,
+                              value: announcement.title,
+                            }}
+                          />
+                          <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>
-                        </button>
+                          </div>
+                        </div>
                       </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>
+                    </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/index.astro

@@ -186,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.',
@@ -410,6 +411,28 @@ 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 attributes = await Astro.locals.banners.try(
@@ -489,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
@@ -516,7 +528,6 @@ 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">