From e46235600ba540d9d4755a45d84d8c13c7819fe4 Mon Sep 17 00:00:00 2001 From: Ivan Rezchikov Date: Sun, 26 Jul 2026 18:26:26 +0300 Subject: [PATCH] add: news search bar, application history --- .../citizenship/review/application-card.tsx | 62 ++++++++++++++----- app/account/citizenship/review/columns.tsx | 10 ++- app/account/citizenship/review/page.tsx | 35 +++++++---- app/news/page.tsx | 25 +++++--- app/news/searchBar.tsx | 45 ++++++++++++++ lib/citizenship/repository.ts | 3 +- lib/citizenship/types.ts | 3 +- 7 files changed, 145 insertions(+), 38 deletions(-) create mode 100644 app/news/searchBar.tsx diff --git a/app/account/citizenship/review/application-card.tsx b/app/account/citizenship/review/application-card.tsx index ec8122a..a60aa7e 100644 --- a/app/account/citizenship/review/application-card.tsx +++ b/app/account/citizenship/review/application-card.tsx @@ -10,8 +10,8 @@ import { Textarea } from "@/components/ui/textarea"; import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"; import { approveApplication, rejectApplication } from "@/lib/citizenship/actions"; import { CitizenshipApplicationWithWarning } from "@/lib/citizenship/types"; -import { formatDate } from "@/lib/utils"; -import { TriangleAlertIcon } from "lucide-react"; +import { cn, formatDate } from "@/lib/utils"; +import { CheckIcon, ClockFadingIcon, PlusIcon, TriangleAlertIcon, XIcon } from "lucide-react"; import { useState } from "react"; import { toast } from "sonner"; @@ -36,7 +36,6 @@ export default function ApplicationCard({ application, onClose }: { application: setIsLoading(false) if (result.success) { toast.success("Application approved") - onClose() } else { toast.error(result.error ?? "Failed to approve application") } @@ -50,7 +49,6 @@ export default function ApplicationCard({ application, onClose }: { application: if (result.success) { toast.success("Application rejected") setRejectOpen(false) - onClose() } else { toast.error(result.error ?? "Failed to reject application") } @@ -64,14 +62,14 @@ export default function ApplicationCard({ application, onClose }: { application: {application.applicationType === "PREVIOUS_CITIZENSHIP" ? "Previous citizenship application" : "Naturalization application"} -
+ {application.status !== "REJECTED" && (
Profile photo
Signature
-
+
)}

Personal information

{ application.nameMismatch && ( @@ -147,17 +145,51 @@ export default function ApplicationCard({ application, onClose }: { application:
) } + +
+

Application history

+
+
+
+

Created on {formatDate(application.createdAt)}

+
+ {application.status !== "PENDING" && (
+

{application.reviewedAt ? `Reviewed on ${formatDate(application.reviewedAt)} by ${application.reviewer?.firstName} ${application.reviewer?.secondName}` : "Reviewed"}

+
)} + {application.status === "REJECTED" && ( +
+
+

Rejected

+
+
+

Rejection reason

+

{application.rejectionReason}

+
+
+ )} + {application.status === "APPROVED" && ( +
+

Approved

+
+ )} +
- - - - - + {application.status === "PENDING" ? ( + + + + + + ) : ( + + + + )} diff --git a/app/account/citizenship/review/columns.tsx b/app/account/citizenship/review/columns.tsx index 93575cf..7d547ba 100644 --- a/app/account/citizenship/review/columns.tsx +++ b/app/account/citizenship/review/columns.tsx @@ -5,6 +5,14 @@ import { CitizenshipApplication } from "@/lib/citizenship/types"; import { Badge } from "@/components/ui/badge"; import { formatDate } from "@/lib/utils"; +type BadgeVariant = "default" | "outline" | "destructive"; + +const variants: Record = { + PENDING: "outline", + REJECTED: "destructive", + APPROVED: "default", +} + export const columns: ColumnDef[] = [ { accessorKey: "surname", @@ -31,7 +39,7 @@ export const columns: ColumnDef[] = [ header: "Status", cell: ({ row }) => { const status = row.getValue("status") as string - return {status} + return {status} }, }, ] \ No newline at end of file diff --git a/app/account/citizenship/review/page.tsx b/app/account/citizenship/review/page.tsx index f2aabc7..b2be2d1 100644 --- a/app/account/citizenship/review/page.tsx +++ b/app/account/citizenship/review/page.tsx @@ -2,9 +2,10 @@ import ReviewPageClient from "./client"; import { getCurrentUser } from "@/lib/user"; import { redirect } from "next/navigation"; import { AccountMenu } from "../../account-menu"; -import { getPendingApplications } from "@/lib/citizenship/repository"; +import { getAllApplications } from "@/lib/citizenship/repository"; import { getImageUrl } from "@/lib/image"; import { Metadata } from "next"; +import { findUserById } from "@/lib/user/repository"; export const metadata: Metadata = { title: "Review citizenship applications", @@ -18,21 +19,31 @@ export default async function ReviewPage() { const user = await getCurrentUser(); if (!user?.isAdmin) redirect("/account/citizenship"); - const applications = await getPendingApplications(); + const applications = await getAllApplications(); const applicationsWithWarning = await Promise.all( - applications.map(async (application) => ({ - ...application, - profileUrl: await getImageUrl(application.profileKey), - signatureUrl: await getImageUrl(application.signatureKey), + applications.map(async (application) => { + const reviewerUser = application.reviewedBy + ? await findUserById(application.reviewedBy) + : null; - nameMismatch: - application.givenNames !== application.user.firstName || - application.surname !== application.user.secondName, + return { + ...application, + profileUrl: await getImageUrl(application.profileKey), + signatureUrl: await getImageUrl(application.signatureKey), - previousCitizenship: - application.user._count.citizenships > 0, - })) + nameMismatch: + application.givenNames !== application.user.firstName || + application.surname !== application.user.secondName, + + previousCitizenship: + application.user._count.citizenships > 0, + + reviewer: reviewerUser + ? { firstName: reviewerUser.firstName, secondName: reviewerUser.secondName } + : null, + }; + }) ); return ( diff --git a/app/news/page.tsx b/app/news/page.tsx index ca5db87..e6f3395 100644 --- a/app/news/page.tsx +++ b/app/news/page.tsx @@ -5,13 +5,23 @@ import { getPages } from "@/lib/pages/repository"; import { getCurrentUser } from "@/lib/user"; import { Metadata } from "next"; import Link from "next/link"; +import SearchBar from "./searchBar"; export const metadata: Metadata = { title: "News" }; -export default async function News() { +export default async function News({ searchParams }: { searchParams: Promise<{ q?: string }> }) { + const { q } = await searchParams; const user = await getCurrentUser(); const news = await getPages("NEWS", "PUBLISHED"); + const query = q?.trim().toLowerCase() ?? ""; + + const filteredNews = query + ? news.filter((n) => + `${n.title.toLowerCase()} ${n.meta.tags?.join(" ").toLowerCase() ?? ""}`.includes(query) + ) + : news; + const newsDrafts = await getPages("NEWS", "DRAFT"); const pageDrafts = await getPages("PAGE", "DRAFT"); @@ -21,6 +31,7 @@ export default async function News() {

News

+
{user?.isAdmin && (
@@ -31,12 +42,12 @@ export default async function News() {
- { - news.length > 0 ? news.map((n) => ( - - )) :

There are no news yet...

- } + { + filteredNews.length > 0 ? filteredNews.map((n) => ( + + )) :

There are no news yet...

+ }
); -} +} \ No newline at end of file diff --git a/app/news/searchBar.tsx b/app/news/searchBar.tsx new file mode 100644 index 0000000..7e54032 --- /dev/null +++ b/app/news/searchBar.tsx @@ -0,0 +1,45 @@ +"use client" + +import { SearchIcon } from "lucide-react"; +import { InputGroup, InputGroupAddon, InputGroupInput } from "@/components/ui/input-group"; +import { Field } from "@/components/ui/field"; +import { usePathname, useRouter, useSearchParams } from "next/navigation"; +import { useState, useTransition } from "react"; + +export default function SearchBar() { + const router = useRouter(); + const pathname = usePathname(); + const searchParams = useSearchParams(); + const [value, setValue] = useState(searchParams.get("q") ?? ""); + const [, startTransition] = useTransition(); + + function handleChange(next: string) { + setValue(next); + + const params = new URLSearchParams(searchParams.toString()); + if (next) { + params.set("q", next); + } else { + params.delete("q"); + } + + startTransition(() => { + router.replace(`${pathname}?${params.toString()}`, { scroll: false }); + }); + } + + return ( + + + handleChange(e.target.value)} + /> + + + + + + ) +} \ No newline at end of file diff --git a/lib/citizenship/repository.ts b/lib/citizenship/repository.ts index 8e5de33..4fa18c4 100644 --- a/lib/citizenship/repository.ts +++ b/lib/citizenship/repository.ts @@ -77,9 +77,8 @@ export async function getUserApplications(userId: string) { }); } -export async function getPendingApplications() { +export async function getAllApplications() { return prisma.citizenshipApplication.findMany({ - where: { status: "PENDING" }, orderBy: { createdAt: "desc" }, include: { user: { diff --git a/lib/citizenship/types.ts b/lib/citizenship/types.ts index 9b0a7e1..bb9e5fb 100644 --- a/lib/citizenship/types.ts +++ b/lib/citizenship/types.ts @@ -43,4 +43,5 @@ export type CitizenshipApplicationWithWarning = CitizenshipApplication & { previousCitizenship: boolean; profileUrl: string; signatureUrl: string; -}; + reviewer: { firstName: string; secondName: string } | null; +}; \ No newline at end of file