0
'has-checked:border-green-700 has-checked:bg-green-700/20 has-checked:ring-1 has-checked:ring-green-700',
multiple &&
'has-focus-visible:border-day-300 has-focus-visible:ring-2 has-focus-visible:ring-green-700 has-focus-visible:ring-offset-1',
- disabled && 'cursor-not-allowed opacity-50'
+ 'has-[input:disabled]:cursor-not-allowed has-[input:disabled]:opacity-50'
)}
>
0
type={multiple ? 'checkbox' : 'radio'}
name={wrapperProps.name}
value={option.value}
- checked={selectedValue === option.value}
+ checked={
+ Array.isArray(selectedValue)
+ ? selectedValue.includes(option.value)
+ : selectedValue === option.value
+ }
class="peer sr-only"
- disabled={disabled}
+ disabled={disabled || option.disabled}
/>
{option.icon && (
diff --git a/web/src/components/InputSelect.astro b/web/src/components/InputSelect.astro
new file mode 100644
index 0000000..6800c9e
--- /dev/null
+++ b/web/src/components/InputSelect.astro
@@ -0,0 +1,48 @@
+---
+import { omit } from 'lodash-es'
+
+import { cn } from '../lib/cn'
+import { baseInputClassNames } from '../lib/formInputs'
+
+import InputWrapper from './InputWrapper.astro'
+
+import type { ComponentProps, HTMLAttributes } from 'astro/types'
+
+type Props = Omit, 'children' | 'inputId' | 'required'> & {
+ options: {
+ label: string
+ value: string
+ disabled?: boolean
+ }[]
+ selectProps?: Omit, 'name'>
+}
+
+const { options, selectProps, ...wrapperProps } = Astro.props
+
+const inputId = selectProps?.id ?? Astro.locals.makeId(`input-${wrapperProps.name}`)
+const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
+---
+
+
+
+
diff --git a/web/src/components/InputTextArea.astro b/web/src/components/InputTextArea.astro
index 094e564..05fe4c2 100644
--- a/web/src/components/InputTextArea.astro
+++ b/web/src/components/InputTextArea.astro
@@ -1,44 +1,36 @@
---
+import { omit } from 'lodash-es'
+
import { cn } from '../lib/cn'
import { baseInputClassNames } from '../lib/formInputs'
import InputWrapper from './InputWrapper.astro'
-import type { ComponentProps } from 'astro/types'
+import type { ComponentProps, HTMLAttributes } from 'astro/types'
-type Props = Omit, 'children' | 'inputId'> & {
+type Props = Omit, 'children' | 'inputId' | 'required'> & {
+ inputProps?: Omit, 'name'>
value?: string
- placeholder?: string
- disabled?: boolean
- autofocus?: boolean
- rows?: number
- maxlength?: number
}
-const { value, placeholder, maxlength, disabled, autofocus, rows = 3, ...wrapperProps } = Astro.props
+const { inputProps, value, ...wrapperProps } = Astro.props
-const inputId = Astro.locals.makeId(`input-${wrapperProps.name}`)
+const inputId = inputProps?.id ?? Astro.locals.makeId(`input-${wrapperProps.name}`)
const hasError = !!wrapperProps.error && wrapperProps.error.length > 0
---
-{/* eslint-disable astro/jsx-a11y/no-autofocus */}
-
-
+
{value}
diff --git a/web/src/components/InputWrapper.astro b/web/src/components/InputWrapper.astro
index ac092a4..a447fcd 100644
--- a/web/src/components/InputWrapper.astro
+++ b/web/src/components/InputWrapper.astro
@@ -66,7 +66,7 @@ const hasError = !!error && error.length > 0
{
!!description && (
-
+
+
+
+
+
diff --git a/web/src/pages/admin/index.astro b/web/src/pages/admin/index.astro
index bb2124b..49592dc 100644
--- a/web/src/pages/admin/index.astro
+++ b/web/src/pages/admin/index.astro
@@ -43,6 +43,12 @@ const adminLinks: AdminLink[] = [
href: '/admin/service-suggestions',
description: 'Review and manage service suggestions',
},
+ {
+ icon: 'ri:megaphone-line',
+ title: 'Announcements',
+ href: '/admin/announcements',
+ description: 'Manage site announcements',
+ },
]
---
diff --git a/web/src/pages/admin/users/[username].astro b/web/src/pages/admin/users/[username].astro
index 9008650..82da00c 100644
--- a/web/src/pages/admin/users/[username].astro
+++ b/web/src/pages/admin/users/[username].astro
@@ -1,12 +1,20 @@
---
import { Icon } from 'astro-icon/components'
import { actions, isInputError } from 'astro:actions'
+import { Image } from 'astro:assets'
-import Tooltip from '../../../components/Tooltip.astro'
+import BadgeSmall from '../../../components/BadgeSmall.astro'
+import Button from '../../../components/Button.astro'
+import InputCardGroup from '../../../components/InputCardGroup.astro'
+import InputImageFile from '../../../components/InputImageFile.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 TimeFormatted from '../../../components/TimeFormatted.astro'
+import { getServiceUserRoleInfo, serviceUserRoles } from '../../../constants/serviceUserRoles'
import BaseLayout from '../../../layouts/BaseLayout.astro'
import { prisma } from '../../../lib/prisma'
-import { transformCase } from '../../../lib/strings'
-import { timeAgo } from '../../../lib/timeAgo'
const { username } = Astro.params
@@ -56,6 +64,8 @@ const [user, allServices] = await Astro.locals.banners.tryMany([
select: {
id: true,
name: true,
+ displayName: true,
+ picture: true,
},
},
},
@@ -105,543 +115,321 @@ const [user, allServices] = await Astro.locals.banners.tryMany([
if (!user) return Astro.rewrite('/404')
---
-
-
+
= {
+ value: T
+ slug: string
+ label: string
+ icon: string
+}
+
+export const {
+ dataArray: karmaTransactionActions,
+ dataObject: karmaTransactionActionsById,
+ getFn: getKarmaTransactionActionInfo,
+ getFnSlug: getKarmaTransactionActionInfoBySlug,
+ zodEnumBySlug: karmaTransactionActionsZodEnumBySlug,
+ zodEnumById: karmaTransactionActionsZodEnumById,
+ keyToSlug: karmaTransactionActionIdToSlug,
+ slugToKey: karmaTransactionActionSlugToId,
+} = makeHelpersForOptions(
+ 'value',
+ (value): KarmaTransactionActionInfo => ({
+ value,
+ slug: value ? value.toLowerCase() : '',
+ label: value ? transformCase(value.replace('_', ' '), 'title') : String(value),
+ icon: 'ri:question-line',
+ }),
+ [
+ {
+ value: 'COMMENT_APPROVED',
+ slug: 'comment-approved',
+ label: 'Comment approved',
+ icon: 'ri:check-line',
+ },
+ {
+ value: 'COMMENT_VERIFIED',
+ slug: 'comment-verified',
+ label: 'Comment verified',
+ icon: 'ri:verified-badge-line',
+ },
+ {
+ value: 'COMMENT_SPAM',
+ slug: 'comment-spam',
+ label: 'Comment marked as SPAM',
+ icon: 'ri:spam-2-line',
+ },
+ {
+ value: 'COMMENT_SPAM_REVERTED',
+ slug: 'comment-spam-reverted',
+ label: 'Comment SPAM reverted',
+ icon: 'ri:spam-2-line',
+ },
+ {
+ value: 'COMMENT_UPVOTE',
+ slug: 'comment-upvote',
+ label: 'Comment upvoted',
+ icon: 'ri:thumb-up-line',
+ },
+ {
+ value: 'COMMENT_DOWNVOTE',
+ slug: 'comment-downvote',
+ label: 'Comment downvoted',
+ icon: 'ri:thumb-down-line',
+ },
+ {
+ value: 'COMMENT_VOTE_REMOVED',
+ slug: 'comment-vote-removed',
+ label: 'Comment vote removed',
+ icon: 'ri:thumb-up-line',
+ },
+ {
+ value: 'SUGGESTION_APPROVED',
+ slug: 'suggestion-approved',
+ label: 'Suggestion approved',
+ icon: 'ri:lightbulb-line',
+ },
+ {
+ value: 'MANUAL_ADJUSTMENT',
+ slug: 'manual-adjustment',
+ label: 'Manual adjustment',
+ icon: 'ri:gift-line',
+ },
+ ] as const satisfies KarmaTransactionActionInfo[]
+)
diff --git a/web/src/pages/account/index.astro b/web/src/pages/account/index.astro
index a8ab0b4..78c15c1 100644
--- a/web/src/pages/account/index.astro
+++ b/web/src/pages/account/index.astro
@@ -9,6 +9,7 @@ import BadgeSmall from '../../components/BadgeSmall.astro'
import Button from '../../components/Button.astro'
import TimeFormatted from '../../components/TimeFormatted.astro'
import Tooltip from '../../components/Tooltip.astro'
+import { getKarmaTransactionActionInfo } from '../../constants/karmaTransactionActions'
import { karmaUnlocks, karmaUnlocksById } from '../../constants/karmaUnlocks'
import { SUPPORT_EMAIL } from '../../constants/project'
import { getServiceSuggestionStatusInfo } from '../../constants/serviceSuggestionStatus'
@@ -61,6 +62,12 @@ const user = await Astro.locals.banners.try('user', async () => {
action: true,
description: true,
createdAt: true,
+ grantedBy: {
+ select: {
+ name: true,
+ displayName: true,
+ },
+ },
comment: {
select: {
id: true,
@@ -864,24 +871,41 @@ if (!user) return Astro.rewrite('/404')
- {user.karmaTransactions.map((transaction) => (
-
- {transaction.action}
- {transaction.description}
- = 0 ? 'text-green-400' : 'text-red-400'
- )}
- >
- {transaction.points >= 0 && '+'}
- {transaction.points}
-
-
- {new Date(transaction.createdAt).toLocaleDateString()}
-
-
- ))}
+ {user.karmaTransactions.map((transaction) => {
+ const actionInfo = getKarmaTransactionActionInfo(transaction.action)
+ return (
+
+
+
+
+ {transaction.description}
+ = 0 ? 'text-green-400' : 'text-red-400'
+ )}
+ >
+ {transaction.points >= 0 && '+'}
+ {transaction.points}
+
+
+ {new Date(transaction.createdAt).toLocaleDateString()}
+
+
+ )
+ })}
diff --git a/web/src/pages/admin/announcements/index.astro b/web/src/pages/admin/announcements/index.astro
new file mode 100644
index 0000000..e8cdf58
--- /dev/null
+++ b/web/src/pages/admin/announcements/index.astro
@@ -0,0 +1,808 @@
+---
+import { Icon } from 'astro-icon/components'
+import { actions, isInputError } from 'astro:actions'
+import { z } from 'astro:schema'
+
+import { adminAnnouncementActions } from '../../../actions/admin/announcement'
+import SortArrowIcon from '../../../components/SortArrowIcon.astro'
+import TimeFormatted from '../../../components/TimeFormatted.astro'
+import Tooltip from '../../../components/Tooltip.astro'
+import BaseLayout from '../../../layouts/BaseLayout.astro'
+import { zodParseQueryParamsStoringErrors } from '../../../lib/parseUrlFilters'
+import { prisma } from '../../../lib/prisma'
+
+import type { AnnouncementType, Prisma } from '@prisma/client'
+
+const { data: filters } = zodParseQueryParamsStoringErrors(
+ {
+ 'sort-by': z
+ .enum(['title', 'type', 'startDate', 'endDate', 'isActive', 'createdAt'])
+ .default('createdAt'),
+ 'sort-order': z.enum(['asc', 'desc']).default('desc'),
+ search: z.string().optional(),
+ type: z.enum(['INFO', 'WARNING', 'ALERT']).optional(),
+ status: z.enum(['active', 'inactive']).optional(),
+ },
+ Astro
+)
+
+// Set up Prisma orderBy with correct typing
+const prismaOrderBy = {
+ [filters['sort-by']]: filters['sort-order'] === 'asc' ? 'asc' : 'desc',
+} as const satisfies Prisma.AnnouncementOrderByWithRelationInput
+
+// Build where clause based on filters
+const whereClause: Prisma.AnnouncementWhereInput = {}
+
+if (filters.search) {
+ whereClause.OR = [
+ { title: { contains: filters.search, mode: 'insensitive' } },
+ { content: { contains: filters.search, mode: 'insensitive' } },
+ ]
+}
+
+if (filters.type) {
+ whereClause.type = filters.type as AnnouncementType
+}
+
+if (filters.status) {
+ whereClause.isActive = filters.status === 'active'
+}
+
+// Retrieve announcements from the database
+const announcements = await prisma.announcement.findMany({
+ where: whereClause,
+ orderBy: prismaOrderBy,
+})
+
+// Helper for generating sort URLs
+const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
+ const currentSortBy = filters['sort-by']
+ const currentSortOrder = filters['sort-order']
+ const newSortOrder = currentSortBy === slug && currentSortOrder === 'asc' ? 'desc' : 'asc'
+ const searchParams = new URLSearchParams(Astro.url.search)
+ searchParams.set('sort-by', slug)
+ searchParams.set('sort-order', newSortOrder)
+ return `/admin/announcements?${searchParams.toString()}`
+}
+
+// Get type badge class based on announcement type
+const getTypeBadgeClass = (type: AnnouncementType) => {
+ switch (type) {
+ case 'INFO':
+ return 'bg-blue-900/30 text-blue-400'
+ case 'WARNING':
+ return 'bg-yellow-900/30 text-yellow-400'
+ case 'ALERT':
+ return 'bg-red-900/30 text-red-400'
+ default:
+ return 'bg-zinc-900/30 text-zinc-400'
+ }
+}
+
+// Current date for form min values
+const currentDate = new Date().toISOString().slice(0, 16) // Format: YYYY-MM-DDThh:mm
+
+// Default new announcement
+const newAnnouncement = {
+ title: '',
+ content: '',
+ type: 'INFO' as const,
+ startDate: currentDate,
+ endDate: '',
+ isActive: true,
+}
+
+// Get action results
+const createResult = Astro.getActionResult(adminAnnouncementActions.create)
+const updateResult = Astro.getActionResult(adminAnnouncementActions.update)
+const deleteResult = Astro.getActionResult(adminAnnouncementActions.delete)
+const toggleResult = Astro.getActionResult(adminAnnouncementActions.toggleActive)
+
+// Add success messages to banners
+Astro.locals.banners.addIfSuccess(createResult, 'Announcement created successfully!')
+Astro.locals.banners.addIfSuccess(updateResult, 'Announcement updated successfully!')
+Astro.locals.banners.addIfSuccess(deleteResult, 'Announcement deleted successfully!')
+Astro.locals.banners.addIfSuccess(
+ toggleResult,
+ (data) => `Announcement ${data.updatedAnnouncement.isActive ? 'activated' : 'deactivated'} successfully!`
+)
+
+// Add error messages to banners
+if (createResult?.error) {
+ const err = createResult.error
+ Astro.locals.banners.add({
+ uiMessage: err.message,
+ type: 'error',
+ origin: 'action',
+ error: err,
+ })
+}
+if (updateResult?.error) {
+ const err = updateResult.error
+ Astro.locals.banners.add({
+ uiMessage: err.message,
+ type: 'error',
+ origin: 'action',
+ error: err,
+ })
+}
+if (deleteResult?.error) {
+ const err = deleteResult.error
+ Astro.locals.banners.add({
+ uiMessage: err.message,
+ type: 'error',
+ origin: 'action',
+ error: err,
+ })
+}
+if (toggleResult?.error) {
+ const err = toggleResult.error
+ Astro.locals.banners.add({
+ uiMessage: err.message,
+ type: 'error',
+ origin: 'action',
+ error: err,
+ })
+}
+---
+
+
+
+
+ Announcement Management
+
+ {announcements.length} announcements
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create New Announcement
+ +
+
+
+
+
+ Announcements List
+
+ Scroll horizontally to see more →
+
+
-
-
+
-
User Profile: {user.name}
- -
+ {
+ !!user.picture && (
+
-
- + {user.displayName ? `${user.displayName} (${user.name})` : user.name} +
+ +
+ {user.admin &&
-
- {
- user.picture ? (
- 
- ) : (
-
-
-
+
- {user.name.charAt(0) || 'A'}
-
- )
- }
-
-
- {user.name}
-
- {
- user.admin && (
-
- admin
-
- )
- }
- {
- user.verified && (
-
- verified
-
- )
- }
- {
- user.verifier && (
-
- verifier
-
- )
- }
-
-
+
{
- Astro.locals.user && user.id !== Astro.locals.user.id && (
-
-
+