announcements style
This commit is contained in:
pluja
@@ -0,0 +1,2 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "Announcement" ADD COLUMN "link" TEXT;
|
||||
@@ -0,0 +1,8 @@
|
||||
/*
|
||||
Warnings:
|
||||
|
||||
- You are about to drop the column `title` on the `Announcement` table. All the data in the column will be lost.
|
||||
|
||||
*/
|
||||
-- AlterTable
|
||||
ALTER TABLE "Announcement" DROP COLUMN "title";
|
||||
@@ -0,0 +1,2 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "Announcement" ADD COLUMN "linkText" TEXT;
|
||||
@@ -613,9 +613,10 @@ model ServiceUser {
|
||||
|
||||
model Announcement {
|
||||
id Int @id @default(autoincrement())
|
||||
title String
|
||||
content String
|
||||
type AnnouncementType
|
||||
link String?
|
||||
linkText String?
|
||||
startDate DateTime
|
||||
endDate DateTime?
|
||||
isActive Boolean @default(true)
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
EventType,
|
||||
type User,
|
||||
ServiceUserRole,
|
||||
AnnouncementType,
|
||||
} from '@prisma/client'
|
||||
import { uniqBy } from 'lodash-es'
|
||||
import { generateUsername } from 'unique-username-generator'
|
||||
@@ -981,6 +982,22 @@ const generateFakeInternalNote = (userId: number, addedByUserId?: number) =>
|
||||
addedByUser: addedByUserId ? { connect: { id: addedByUserId } } : undefined,
|
||||
}) satisfies Prisma.InternalUserNoteCreateInput
|
||||
|
||||
const generateFakeAnnouncement = () => {
|
||||
const type = faker.helpers.arrayElement(Object.values(AnnouncementType))
|
||||
const startDate = faker.date.past()
|
||||
const endDate = faker.helpers.maybe(() => faker.date.future(), { probability: 0.3 })
|
||||
|
||||
return {
|
||||
content: faker.lorem.sentence(),
|
||||
type,
|
||||
link: faker.internet.url(),
|
||||
linkText: faker.lorem.word({ length: 2 }),
|
||||
startDate,
|
||||
endDate,
|
||||
isActive: true,
|
||||
} as const satisfies Prisma.AnnouncementCreateInput
|
||||
}
|
||||
|
||||
async function runFaker() {
|
||||
await prisma.$transaction(
|
||||
async (tx) => {
|
||||
@@ -1004,6 +1021,7 @@ async function runFaker() {
|
||||
await tx.category.deleteMany()
|
||||
await tx.internalUserNote.deleteMany()
|
||||
await tx.user.deleteMany()
|
||||
await tx.announcement.deleteMany()
|
||||
console.info('✅ Existing data cleaned up')
|
||||
} catch (error) {
|
||||
console.error('❌ Error cleaning up data:', error)
|
||||
@@ -1307,6 +1325,11 @@ async function runFaker() {
|
||||
)
|
||||
})
|
||||
)
|
||||
|
||||
// ---- Create announcement ----
|
||||
await tx.announcement.create({
|
||||
data: generateFakeAnnouncement(),
|
||||
})
|
||||
},
|
||||
{
|
||||
timeout: 1000 * 60 * 10, // 10 minutes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { type Prisma, type PrismaClient, type AnnouncementType } from '@prisma/client'
|
||||
import { type Prisma, type PrismaClient } from '@prisma/client'
|
||||
import { ActionError } from 'astro:actions'
|
||||
import { z } from 'zod'
|
||||
|
||||
@@ -9,9 +9,10 @@ const prisma = prismaInstance as PrismaClient
|
||||
|
||||
const selectAnnouncementReturnFields = {
|
||||
id: true,
|
||||
title: true,
|
||||
content: true,
|
||||
type: true,
|
||||
link: true,
|
||||
linkText: true,
|
||||
startDate: true,
|
||||
endDate: true,
|
||||
isActive: true,
|
||||
@@ -24,12 +25,18 @@ export const adminAnnouncementActions = {
|
||||
accept: 'form',
|
||||
permissions: 'admin',
|
||||
input: z.object({
|
||||
title: z.string().min(1, 'Title is required').max(255, 'Title must be less than 255 characters'),
|
||||
content: z
|
||||
.string()
|
||||
.min(1, 'Content is required')
|
||||
.max(1000, 'Content must be less than 1000 characters'),
|
||||
type: z.enum(['INFO', 'WARNING', 'ALERT']),
|
||||
link: z.string().url().nullable().optional(),
|
||||
linkText: z
|
||||
.string()
|
||||
.min(1, 'Link text is required')
|
||||
.max(255, 'Link text must be less than 255 characters')
|
||||
.nullable()
|
||||
.optional(),
|
||||
startDate: z.coerce.date(),
|
||||
endDate: z.coerce.date().nullable().optional(),
|
||||
isActive: z.coerce.boolean().default(true),
|
||||
@@ -37,8 +44,13 @@ export const adminAnnouncementActions = {
|
||||
handler: async (input) => {
|
||||
const announcement = await prisma.announcement.create({
|
||||
data: {
|
||||
...input,
|
||||
endDate: input.endDate || null,
|
||||
content: input.content,
|
||||
type: input.type,
|
||||
startDate: input.startDate,
|
||||
isActive: input.isActive,
|
||||
link: input.link ?? null,
|
||||
linkText: input.linkText ?? null,
|
||||
endDate: input.endDate ?? null,
|
||||
},
|
||||
select: selectAnnouncementReturnFields,
|
||||
})
|
||||
@@ -52,12 +64,18 @@ export const adminAnnouncementActions = {
|
||||
permissions: 'admin',
|
||||
input: z.object({
|
||||
id: z.coerce.number().int().positive(),
|
||||
title: z.string().min(1, 'Title is required').max(255, 'Title must be less than 255 characters'),
|
||||
content: z
|
||||
.string()
|
||||
.min(1, 'Content is required')
|
||||
.max(1000, 'Content must be less than 1000 characters'),
|
||||
type: z.enum(['INFO', 'WARNING', 'ALERT']),
|
||||
link: z.string().url().nullable().optional(),
|
||||
linkText: z
|
||||
.string()
|
||||
.min(1, 'Link text is required')
|
||||
.max(255, 'Link text must be less than 255 characters')
|
||||
.nullable()
|
||||
.optional(),
|
||||
startDate: z.coerce.date(),
|
||||
endDate: z.coerce.date().nullable().optional(),
|
||||
isActive: z.coerce.boolean().default(true),
|
||||
@@ -82,8 +100,13 @@ export const adminAnnouncementActions = {
|
||||
const updatedAnnouncement = await prisma.announcement.update({
|
||||
where: { id: announcement.id },
|
||||
data: {
|
||||
...input,
|
||||
endDate: input.endDate || null,
|
||||
content: input.content,
|
||||
type: input.type,
|
||||
startDate: input.startDate,
|
||||
isActive: input.isActive,
|
||||
link: input.link ?? null,
|
||||
linkText: input.linkText ?? null,
|
||||
endDate: input.endDate ?? null,
|
||||
},
|
||||
select: selectAnnouncementReturnFields,
|
||||
})
|
||||
|
||||
@@ -1,57 +1,89 @@
|
||||
---
|
||||
import { Icon } from 'astro-icon/components'
|
||||
import { Markdown } from 'astro-remote'
|
||||
|
||||
import { getAnnouncementTypeInfo } from '../constants/announcementTypes'
|
||||
import { cn } from '../lib/cn'
|
||||
|
||||
import type { Prisma } from '@prisma/client'
|
||||
import type { HTMLAttributes } from 'astro/types'
|
||||
|
||||
type Props = {
|
||||
announcements:
|
||||
| Prisma.AnnouncementGetPayload<{
|
||||
select: {
|
||||
id: true
|
||||
title: true
|
||||
content: true
|
||||
type: true
|
||||
startDate: true
|
||||
endDate: true
|
||||
isActive: true
|
||||
}
|
||||
}>[]
|
||||
| null
|
||||
| undefined
|
||||
type Props = HTMLAttributes<'div'> & {
|
||||
announcement: Prisma.AnnouncementGetPayload<{
|
||||
select: {
|
||||
id: true
|
||||
content: true
|
||||
type: true
|
||||
link: true
|
||||
linkText: true
|
||||
startDate: true
|
||||
endDate: true
|
||||
isActive: true
|
||||
}
|
||||
}>
|
||||
}
|
||||
|
||||
const { announcements } = Astro.props
|
||||
const { announcement, class: className, ...props } = Astro.props
|
||||
|
||||
const typeInfo = getAnnouncementTypeInfo(announcement.type)
|
||||
|
||||
const Tag = announcement.link ? 'a' : 'div'
|
||||
---
|
||||
|
||||
{
|
||||
!!announcements && announcements.length > 0 && (
|
||||
<div class="mb-4 flex flex-col items-center space-y-1">
|
||||
{announcements.map((announcement) => {
|
||||
const typeInfo = getAnnouncementTypeInfo(announcement.type)
|
||||
|
||||
return (
|
||||
<div
|
||||
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={cn('mr-2 size-4 flex-shrink-0', typeInfo.classNames.title)} />
|
||||
<div class="flex min-w-0 flex-col">
|
||||
<span class={cn('truncate text-sm leading-tight font-bold', typeInfo.classNames.title)}>
|
||||
{announcement.title}
|
||||
</span>
|
||||
<span class={cn('truncate text-xs leading-snug [&_a]:underline', typeInfo.classNames.content)}>
|
||||
<Markdown content={announcement.content} />
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
<Tag
|
||||
href={announcement.link}
|
||||
target={announcement.link ? '_blank' : undefined}
|
||||
rel="noopener noreferrer"
|
||||
class={cn(
|
||||
'group relative isolate z-50 flex items-center justify-center gap-x-6 overflow-hidden border-b border-zinc-800 bg-black px-6 py-2 focus-visible:outline-none sm:px-3.5',
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
<div
|
||||
aria-hidden="true"
|
||||
class="pointer-events-none absolute top-1/2 left-[max(-7rem,calc(50%-52rem))] -z-10 -translate-y-1/2 transform-gpu blur-2xl"
|
||||
>
|
||||
<div
|
||||
class={cn(
|
||||
'aspect-[577/310] w-[36.0625rem] bg-gradient-to-r from-green-500 to-green-700 opacity-20',
|
||||
typeInfo.classNames.bg
|
||||
)}
|
||||
style="clip-path:polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)"
|
||||
>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
<div
|
||||
aria-hidden="true"
|
||||
class="pointer-events-none absolute top-1/2 left-[max(45rem,calc(50%+8rem))] -z-10 -translate-y-1/2 transform-gpu blur-2xl"
|
||||
>
|
||||
<div
|
||||
class={cn(
|
||||
'aspect-[577/310] w-[36.0625rem] bg-gradient-to-r from-green-500 to-green-700 opacity-30',
|
||||
typeInfo.classNames.bg
|
||||
)}
|
||||
style="clip-path:polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-between gap-x-3 md:justify-center">
|
||||
<div class={cn('flex items-center gap-x-3', typeInfo.classNames.icon)}>
|
||||
<Icon name={typeInfo.icon} class={cn('size-5 flex-shrink-0')} />
|
||||
<span
|
||||
class={cn(
|
||||
'font-title bg-[linear-gradient(90deg,var(--gradient-edge,#FFEBF9)_0%,var(--gradient-center,#8a56cc)_50%,var(--gradient-edge,#FFEBF9)_100%)] bg-clip-text text-sm leading-tight text-transparent [&_a]:underline',
|
||||
typeInfo.classNames.content
|
||||
)}
|
||||
>
|
||||
{announcement.content}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="text-day-300 group-focus-visible:outline-primary transition-background relative inline-flex h-full min-w-[120px] cursor-pointer items-center justify-center gap-1.5 overflow-hidden rounded-full border border-white/20 bg-black/10 p-[1px] px-3 py-1 text-sm font-medium shadow-sm backdrop-blur-3xl transition-colors group-hover:bg-white/5 group-focus-visible:ring-2 group-focus-visible:ring-blue-500 group-focus-visible:ring-offset-2 group-focus-visible:ring-offset-black/80"
|
||||
>
|
||||
{announcement.linkText}
|
||||
<Icon name="ri:arrow-right-line" class="size-4 transition-transform group-hover:translate-x-0.5" />
|
||||
</div>
|
||||
</Tag>
|
||||
|
||||
@@ -35,6 +35,7 @@ const splashText = showSplashText ? sample(splashTexts) : null
|
||||
'border-red-900 bg-red-500/60': !!actualUser,
|
||||
}
|
||||
)}
|
||||
transition:name="header-container"
|
||||
>
|
||||
<nav class={cn('container mx-auto flex h-full w-full items-stretch justify-between px-4', classNames?.nav)}>
|
||||
<div class="@container -ml-4 flex max-w-[192px] grow-99999 items-center">
|
||||
|
||||
@@ -9,56 +9,66 @@ type AnnouncementTypeInfo<T extends string | null | undefined = string> = {
|
||||
icon: string
|
||||
classNames: {
|
||||
container: string
|
||||
title: string
|
||||
bg: string
|
||||
content: string
|
||||
icon: string
|
||||
badge: string
|
||||
}
|
||||
}
|
||||
|
||||
export const {
|
||||
dataArray: announcementTypes,
|
||||
dataObject: announcementTypesById,
|
||||
getFn: getAnnouncementTypeInfo,
|
||||
zodEnumById: zodAnnouncementTypesById,
|
||||
} = makeHelpersForOptions(
|
||||
'value',
|
||||
(value): AnnouncementTypeInfo<typeof value> => ({
|
||||
value,
|
||||
label: value ? transformCase(value.replaceAll('_', ' '), 'title') : String(value),
|
||||
icon: 'ri:information-line',
|
||||
icon: 'ri:information-fill',
|
||||
classNames: {
|
||||
container: 'bg-blue-900/40 border-blue-500/30',
|
||||
title: 'text-blue-400',
|
||||
content: 'text-blue-300',
|
||||
container: 'bg-blue-950',
|
||||
bg: 'from-blue-400 to-blue-700',
|
||||
content: '[--gradient-edge:var(--color-blue-100)] [--gradient-center:var(--color-blue-200)]',
|
||||
icon: 'text-blue-400/80',
|
||||
badge: 'bg-blue-900/30 text-blue-400',
|
||||
},
|
||||
}),
|
||||
[
|
||||
{
|
||||
value: 'INFO',
|
||||
label: 'Info',
|
||||
icon: 'ri:information-line',
|
||||
icon: 'ri:information-fill',
|
||||
classNames: {
|
||||
container: 'bg-blue-900/40 border-blue-500/30',
|
||||
title: 'text-blue-400',
|
||||
content: 'text-blue-300',
|
||||
container: 'bg-green-950',
|
||||
bg: 'from-green-400 to-green-700',
|
||||
content: '[--gradient-edge:var(--color-green-100)] [--gradient-center:var(--color-lime-200)]',
|
||||
icon: 'text-green-400/80',
|
||||
badge: 'bg-blue-900/30 text-blue-400',
|
||||
},
|
||||
},
|
||||
{
|
||||
value: 'WARNING',
|
||||
label: 'Warning',
|
||||
icon: 'ri:alert-line',
|
||||
icon: 'ri:alert-fill',
|
||||
classNames: {
|
||||
container: 'bg-yellow-900/40 border-yellow-500/30',
|
||||
title: 'text-yellow-400',
|
||||
content: 'text-yellow-300',
|
||||
container: 'bg-yellow-950',
|
||||
bg: 'from-yellow-400 to-yellow-700',
|
||||
content: '[--gradient-edge:var(--color-yellow-100)] [--gradient-center:var(--color-amber-200)]',
|
||||
icon: 'text-yellow-400/80',
|
||||
badge: 'bg-yellow-900/30 text-yellow-400',
|
||||
},
|
||||
},
|
||||
{
|
||||
value: 'ALERT',
|
||||
label: 'Alert',
|
||||
icon: 'ri:error-warning-line',
|
||||
icon: 'ri:spam-fill',
|
||||
classNames: {
|
||||
container: 'bg-red-900/40 border-red-500/30',
|
||||
title: 'text-red-400',
|
||||
content: 'text-red-300',
|
||||
container: 'bg-red-950',
|
||||
bg: 'from-red-400 to-red-700',
|
||||
content: '[--gradient-edge:var(--color-red-100)] [--gradient-center:var(--color-rose-200)]',
|
||||
icon: 'text-red-400/80',
|
||||
badge: 'bg-red-900/30 text-red-400',
|
||||
},
|
||||
},
|
||||
] as const satisfies AnnouncementTypeInfo<AnnouncementType>[]
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
---
|
||||
import AnnouncementBanner from '../components/AnnouncementBanner.astro'
|
||||
import BaseHead from '../components/BaseHead.astro'
|
||||
import Footer from '../components/Footer.astro'
|
||||
import Header from '../components/Header.astro'
|
||||
import { cn } from '../lib/cn'
|
||||
import { prisma } from '../lib/prisma'
|
||||
|
||||
import type { AstroChildren } from '../lib/astro'
|
||||
import type { ComponentProps } from 'astro/types'
|
||||
@@ -42,6 +44,31 @@ const {
|
||||
|
||||
const actualErrors = [...errors, ...Astro.locals.banners.errors]
|
||||
const actualSuccess = [...success, ...Astro.locals.banners.successes]
|
||||
|
||||
const currentDate = new Date()
|
||||
const announcement = await Astro.locals.banners.try(
|
||||
'Unable to load announcements.',
|
||||
() =>
|
||||
prisma.announcement.findFirst({
|
||||
where: {
|
||||
isActive: true,
|
||||
startDate: { lte: currentDate },
|
||||
OR: [{ endDate: null }, { endDate: { gt: currentDate } }],
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
content: true,
|
||||
type: true,
|
||||
link: true,
|
||||
linkText: true,
|
||||
startDate: true,
|
||||
endDate: true,
|
||||
isActive: true,
|
||||
},
|
||||
orderBy: [{ type: 'desc' }, { createdAt: 'desc' }],
|
||||
}),
|
||||
null
|
||||
)
|
||||
---
|
||||
|
||||
<html lang="en" transition:name="root" transition:animate="none">
|
||||
@@ -51,6 +78,7 @@ const actualSuccess = [...success, ...Astro.locals.banners.successes]
|
||||
<BaseHead {...baseHeadProps} />
|
||||
</head>
|
||||
<body class={cn('bg-night-700 text-day-300 flex min-h-dvh flex-col *:shrink-0', className?.body)}>
|
||||
{announcement && <AnnouncementBanner announcement={announcement} transition:name="header-announcement" />}
|
||||
<Header
|
||||
classNames={{
|
||||
nav: cn(
|
||||
|
||||
@@ -190,7 +190,7 @@ Some reviews may be spam or fake. Read comments carefully and **always do your o
|
||||
|
||||
To **see comments waiting for moderation**, toggle the switch in the comments section. These comments show up with a yellow background and a "pending" label.
|
||||
|
||||
## Support the project
|
||||
## Support
|
||||
|
||||
If you like this project, you can **support** it through these methods:
|
||||
|
||||
|
||||
@@ -6,13 +6,17 @@ 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'
|
||||
import {
|
||||
announcementTypes,
|
||||
getAnnouncementTypeInfo,
|
||||
zodAnnouncementTypesById,
|
||||
} from '../../../constants/announcementTypes'
|
||||
import BaseLayout from '../../../layouts/BaseLayout.astro'
|
||||
import { zodParseQueryParamsStoringErrors } from '../../../lib/parseUrlFilters'
|
||||
import { prisma } from '../../../lib/prisma'
|
||||
@@ -26,7 +30,7 @@ const { data: filters } = zodParseQueryParamsStoringErrors(
|
||||
.default('createdAt'),
|
||||
'sort-order': z.enum(['asc', 'desc']).default('desc'),
|
||||
search: z.string().optional(),
|
||||
type: z.enum(['INFO', 'WARNING', 'ALERT']).optional(),
|
||||
type: zodAnnouncementTypesById.optional(),
|
||||
status: z.enum(['active', 'inactive']).optional(),
|
||||
},
|
||||
Astro
|
||||
@@ -41,10 +45,7 @@ const prismaOrderBy = {
|
||||
const whereClause: Prisma.AnnouncementWhereInput = {}
|
||||
|
||||
if (filters.search) {
|
||||
whereClause.OR = [
|
||||
{ title: { contains: filters.search, mode: 'insensitive' } },
|
||||
{ content: { contains: filters.search, mode: 'insensitive' } },
|
||||
]
|
||||
whereClause.OR = [{ content: { contains: filters.search, mode: 'insensitive' } }]
|
||||
}
|
||||
|
||||
if (filters.type) {
|
||||
@@ -72,32 +73,19 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
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,
|
||||
link: null,
|
||||
linkText: null,
|
||||
startDate: currentDate,
|
||||
endDate: '',
|
||||
isActive: true,
|
||||
}
|
||||
isActive: true as boolean,
|
||||
} satisfies Prisma.AnnouncementCreateInput
|
||||
|
||||
// Get action results
|
||||
const createResult = Astro.getActionResult(adminAnnouncementActions.create)
|
||||
@@ -184,9 +172,13 @@ if (toggleResult?.error) {
|
||||
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="" selected={!filters.type}>All Types</option>
|
||||
<option value="INFO" selected={filters.type === 'INFO'}>Info</option>
|
||||
<option value="WARNING" selected={filters.type === 'WARNING'}>Warning</option>
|
||||
<option value="ALERT" selected={filters.type === 'ALERT'}>Alert</option>
|
||||
{
|
||||
announcementTypes.map((type) => (
|
||||
<option value={type.value} selected={filters.type === type.value}>
|
||||
{type.label}
|
||||
</option>
|
||||
))
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
@@ -229,20 +221,8 @@ 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">
|
||||
<InputText
|
||||
label="Title*"
|
||||
name="title"
|
||||
error={createInputErrors.title}
|
||||
inputProps={{
|
||||
required: true,
|
||||
maxlength: 255,
|
||||
placeholder: 'Announcement Title',
|
||||
value: newAnnouncement.title,
|
||||
}}
|
||||
/>
|
||||
|
||||
<InputTextArea
|
||||
label="Content*"
|
||||
label="Content"
|
||||
name="content"
|
||||
error={createInputErrors.content}
|
||||
value={newAnnouncement.content}
|
||||
@@ -256,23 +236,41 @@ if (toggleResult?.error) {
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<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,
|
||||
<InputText
|
||||
label="Link"
|
||||
name="link"
|
||||
error={createInputErrors.link}
|
||||
inputProps={{
|
||||
type: 'url',
|
||||
placeholder: 'https://example.com',
|
||||
}}
|
||||
/>
|
||||
<InputText
|
||||
label="Link Text "
|
||||
name="linkText"
|
||||
error={createInputErrors.linkText}
|
||||
inputProps={{
|
||||
placeholder: 'Link Text',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<InputCardGroup
|
||||
label="Type"
|
||||
name="type"
|
||||
options={announcementTypes.map((type) => ({
|
||||
label: type.label,
|
||||
value: type.value,
|
||||
icon: type.icon,
|
||||
}))}
|
||||
cardSize="sm"
|
||||
required
|
||||
selectedValue={newAnnouncement.type}
|
||||
/>
|
||||
|
||||
<InputText
|
||||
label="Start Date & Time*"
|
||||
label="Start Date & Time"
|
||||
name="startDate"
|
||||
error={createInputErrors.startDate}
|
||||
inputProps={{
|
||||
@@ -283,7 +281,7 @@ if (toggleResult?.error) {
|
||||
/>
|
||||
|
||||
<InputText
|
||||
label="End Date & Time (Optional)"
|
||||
label="End Date & Time"
|
||||
name="endDate"
|
||||
error={createInputErrors.endDate}
|
||||
inputProps={{
|
||||
@@ -307,7 +305,7 @@ if (toggleResult?.error) {
|
||||
/>
|
||||
|
||||
<div class="pt-4">
|
||||
<InputSubmitButton label="Create Announcement" icon="ri:save-line" />
|
||||
<InputSubmitButton label="Create Announcement" icon="ri:save-line" hideCancel />
|
||||
<button
|
||||
type="button"
|
||||
id="cancel-create"
|
||||
@@ -455,198 +453,215 @@ 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"
|
||||
onclick={`document.getElementById('edit-announcement-form-${announcement.id}').classList.toggle('hidden')`}
|
||||
>
|
||||
<Icon name="ri:edit-line" class="size-4" />
|
||||
</Tooltip>
|
||||
announcements.map((announcement) => {
|
||||
const announcementTypeInfo = getAnnouncementTypeInfo(announcement.type)
|
||||
|
||||
return (
|
||||
<>
|
||||
<tr class="group hover:bg-zinc-700/30">
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<div class="line-clamp-2 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 ${announcementTypeInfo.classNames.badge}`}
|
||||
>
|
||||
<Icon name={announcementTypeInfo.icon} class="me-1 size-3" />
|
||||
{announcementTypeInfo.label}
|
||||
</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.content}
|
||||
</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"
|
||||
/>
|
||||
</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.update}
|
||||
class="grid gap-4 md:grid-cols-2"
|
||||
>
|
||||
<input type="hidden" name="id" value={announcement.id} />
|
||||
|
||||
<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"
|
||||
<div class="space-y-3 md:col-span-2">
|
||||
<InputTextArea
|
||||
label="Content"
|
||||
name="content"
|
||||
value={announcement.content}
|
||||
inputProps={{
|
||||
required: true,
|
||||
maxlength: 1000,
|
||||
rows: 3,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</>
|
||||
))
|
||||
|
||||
<div class="space-y-3">
|
||||
<InputText
|
||||
label="Link"
|
||||
name="link"
|
||||
inputProps={{
|
||||
type: 'url',
|
||||
placeholder: 'https://example.com',
|
||||
value: announcement.link,
|
||||
}}
|
||||
/>
|
||||
<InputText
|
||||
label="Link Text"
|
||||
name="linkText"
|
||||
inputProps={{
|
||||
placeholder: 'Link Text',
|
||||
value: announcement.linkText,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<InputCardGroup
|
||||
label="Type"
|
||||
name="type"
|
||||
options={announcementTypes.map((type) => ({
|
||||
label: type.label,
|
||||
value: type.value,
|
||||
icon: type.icon,
|
||||
}))}
|
||||
cardSize="sm"
|
||||
required
|
||||
selectedValue={announcement.type}
|
||||
/>
|
||||
|
||||
<InputText
|
||||
label="Start Date & Time"
|
||||
name="startDate"
|
||||
inputProps={{
|
||||
type: 'datetime-local',
|
||||
required: true,
|
||||
value: new Date(announcement.startDate).toISOString().slice(0, 16),
|
||||
}}
|
||||
/>
|
||||
<InputText
|
||||
label="End Date & Time"
|
||||
name="endDate"
|
||||
inputProps={{
|
||||
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 />
|
||||
<Button
|
||||
type="button"
|
||||
label="Cancel"
|
||||
color="gray"
|
||||
onclick={`document.getElementById('edit-announcement-form-${announcement.id}').classList.toggle('hidden')`}
|
||||
class="ml-2"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</>
|
||||
)
|
||||
})
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -4,7 +4,6 @@ import { z } from 'astro:schema'
|
||||
import { groupBy, orderBy } from 'lodash-es'
|
||||
import seedrandom from 'seedrandom'
|
||||
|
||||
import AnnouncementBanner from '../components/AnnouncementBanner.astro'
|
||||
import Button from '../components/Button.astro'
|
||||
import Pagination from '../components/Pagination.astro'
|
||||
import ServiceFiltersPill from '../components/ServiceFiltersPill.astro'
|
||||
@@ -186,8 +185,7 @@ if (redirectUrl) return Astro.redirect(redirectUrl.toString())
|
||||
|
||||
export type ServicesFiltersObject = typeof filters
|
||||
|
||||
const currentDate = new Date()
|
||||
const [categories, [services, totalServices, hadToIncludeCommunityContributed], activeAnnouncements] =
|
||||
const [categories, [services, totalServices, hadToIncludeCommunityContributed]] =
|
||||
await Astro.locals.banners.tryMany([
|
||||
[
|
||||
'Unable to load category filters.',
|
||||
@@ -411,28 +409,6 @@ 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(
|
||||
@@ -528,8 +504,6 @@ export type ServicesFiltersOptions = typeof filtersOptions
|
||||
},
|
||||
]}
|
||||
>
|
||||
<AnnouncementBanner announcements={activeAnnouncements} />
|
||||
|
||||
<div class="flex flex-col gap-4 sm:flex-row sm:gap-8">
|
||||
<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'
|
||||
|
||||
Reference in New Issue
Block a user