Compare commits
17
Commits
15f3429de9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
646d6d326d | ||
|
|
cb8d4aeed3 | ||
|
|
04da7c325b | ||
|
|
8eefce6534 | ||
|
|
e4f0d5bca1 | ||
|
|
746e6e57be | ||
|
|
2a85485de4 | ||
|
|
db97576fc5 | ||
|
|
669c2027b9 | ||
|
|
e826e7b099 | ||
|
|
2e4ea8a052 | ||
|
|
e46235600b | ||
|
|
8aeacaf0ea | ||
|
|
00ed4f923b | ||
|
|
670a7d31c9 | ||
|
|
3f03ee0742 | ||
|
|
e957879212 |
-82
@@ -1,82 +0,0 @@
|
||||
kind: pipeline
|
||||
type: docker
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: lint frontend
|
||||
image: node:20-alpine
|
||||
commands:
|
||||
- npm install
|
||||
- npm run lint
|
||||
|
||||
- name: build and push frontend
|
||||
image: docker:24
|
||||
volumes:
|
||||
- name: dockersock
|
||||
path: /var/run/docker.sock
|
||||
- name: appdir
|
||||
path: /opt/app
|
||||
commands:
|
||||
- docker build
|
||||
-t localhost:5000/eu:latest
|
||||
-f ./Dockerfile
|
||||
.
|
||||
- docker push localhost:5000/eu:latest
|
||||
|
||||
- name: deploy
|
||||
image: docker:24
|
||||
volumes:
|
||||
- name: dockersock
|
||||
path: /var/run/docker.sock
|
||||
- name: appdir
|
||||
path: /opt/app
|
||||
environment:
|
||||
PUBLIC_URL:
|
||||
from_secret: PUBLIC_URL
|
||||
DATABASE_URL:
|
||||
from_secret: DATABASE_URL
|
||||
KOTOSOFT_ID_API_PUBLIC_URL:
|
||||
from_secret: KOTOSOFT_ID_API_PUBLIC_URL
|
||||
KOTOSOFT_ID_API_URL:
|
||||
from_secret: KOTOSOFT_ID_API_URL
|
||||
KOTOSOFT_CLIENT_ID:
|
||||
from_secret: KOTOSOFT_CLIENT_ID
|
||||
KOTOSOFT_CLIENT_SECRET:
|
||||
from_secret: KOTOSOFT_CLIENT_SECRET
|
||||
JWT_SECRET:
|
||||
from_secret: JWT_SECRET
|
||||
MINIO_URL:
|
||||
from_secret: MINIO_URL
|
||||
MINIO_ACCESS_KEY:
|
||||
from_secret: MINIO_ACCESS_KEY
|
||||
MINIO_SECRET_KEY:
|
||||
from_secret: MINIO_SECRET_KEY
|
||||
MINIO_PUBLIC_URL:
|
||||
from_secret: MINIO_PUBLIC_URL
|
||||
VIRTUAL_HOST:
|
||||
from_secret: API_DOMAIN
|
||||
LETSENCRYPT_HOST:
|
||||
from_secret: API_DOMAIN
|
||||
LETSENCRYPT_EMAIL:
|
||||
from_secret: LETSENCRYPT_EMAIL
|
||||
DOMAIN:
|
||||
from_secret: DOMAIN
|
||||
commands:
|
||||
- apk add --no-cache docker-cli-compose
|
||||
- mkdir -p /opt/app
|
||||
- cp docker-compose.yml /opt/app/docker-compose.yml
|
||||
- cd /opt/app
|
||||
- docker compose -p eu pull
|
||||
- docker compose -p eu up -d --remove-orphans
|
||||
|
||||
volumes:
|
||||
- name: dockersock
|
||||
host:
|
||||
path: /var/run/docker.sock
|
||||
- name: appdir
|
||||
host:
|
||||
path: /opt/drone/eu
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
- main
|
||||
@@ -45,3 +45,5 @@ next-env.d.ts
|
||||
|
||||
/lib/generated/prisma
|
||||
.prisma/
|
||||
|
||||
docker-compose.yml
|
||||
+2
-4
@@ -16,11 +16,9 @@ COPY --from=builder /app/.next ./.next
|
||||
COPY --from=builder /app/public ./public
|
||||
COPY --from=builder /app/prisma ./prisma
|
||||
COPY --from=builder /app/next.config.ts ./next.config.ts
|
||||
COPY entrypoint.sh /app/entrypoint.sh
|
||||
RUN chmod +x /app/entrypoint.sh
|
||||
RUN npm prune --omit=dev
|
||||
EXPOSE 80
|
||||
ENTRYPOINT ["/app/entrypoint.sh"]
|
||||
USER node
|
||||
EXPOSE 3000
|
||||
CMD ["npm", "start", "--", "-p", "3000", "-H", "0.0.0.0"]
|
||||
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
|
||||
CMD wget -q --spider http://localhost:3000/ || exit 1
|
||||
@@ -14,6 +14,7 @@ import { getNavLinkByPageId } from "@/lib/navlinks/repository";
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
|
||||
import { Metadata } from "next";
|
||||
import { getImageUrl } from "@/lib/image";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
|
||||
function makeDescription(text?: string, maxLength = 160) {
|
||||
if (!text) return undefined;
|
||||
@@ -127,7 +128,7 @@ function BlockRenderer({ block }: { block: Block }) {
|
||||
|
||||
case "CALLOUT":
|
||||
return (
|
||||
<Alert className="md:w-max">
|
||||
<Alert className="max-w-xl">
|
||||
<InfoIcon />
|
||||
<AlertTitle>{b.title}</AlertTitle>
|
||||
<AlertDescription>{b.text}</AlertDescription>
|
||||
@@ -200,8 +201,8 @@ function BlockRenderer({ block }: { block: Block }) {
|
||||
return <Separator />;
|
||||
|
||||
case "LINK":
|
||||
return <Link href={b.href} target="_blank">
|
||||
<Button variant="secondary" className="max-w-full">{b.label}</Button>
|
||||
return <Link href={b.href} className="w-max " target="_blank">
|
||||
<Button variant="secondary">{b.label}</Button>
|
||||
</Link>
|
||||
|
||||
default:
|
||||
@@ -249,6 +250,8 @@ export default async function Page({ params }: { params: Promise<{ type: string;
|
||||
user?.isAdmin && wasUpdatedByOther && updatedBy
|
||||
? `${updatedBy.firstName} ${updatedBy.secondName}`
|
||||
: null,
|
||||
|
||||
tags: isNews ? page.meta.tags : null,
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -273,8 +276,14 @@ export default async function Page({ params }: { params: Promise<{ type: string;
|
||||
{meta.author && <p className="flex gap-1.5 items-center"><UserIcon size={16} />{meta.author}</p>}
|
||||
{meta.updatedBy && <p className="flex gap-1.5 items-center"><UserIcon size={16} />Last update by {meta.updatedBy}</p>}
|
||||
</div>
|
||||
{isNews && (<div className="flex flex-row gap-4">
|
||||
{((meta as PageMeta)?.tags)?.map((tag) => (
|
||||
<Badge key={tag}>{tag}</Badge>
|
||||
))}
|
||||
</div>)}
|
||||
</div>
|
||||
<div className="flex flex-col gap-6">
|
||||
<div className={cn(isNews && `max-w-2xl mx-auto`)}>
|
||||
<div className="flex flex-col gap-6 [&>a+a]:-my-2.5">
|
||||
{isArchived && (
|
||||
<Alert className="md:w-max">
|
||||
<InfoIcon />
|
||||
@@ -287,5 +296,6 @@ export default async function Page({ params }: { params: Promise<{ type: string;
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -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,24 +62,24 @@ export default function ApplicationCard({ application, onClose }: { application:
|
||||
<CardDescription>{application.applicationType === "PREVIOUS_CITIZENSHIP" ? "Previous citizenship application" : "Naturalization application"}</CardDescription>
|
||||
</CardHeader>
|
||||
<CardContent className="max-w-sm">
|
||||
<div className="flex flex-row gap-3 mb-4">
|
||||
{application.status !== "REJECTED" && (<div className="flex flex-row gap-3 mb-4">
|
||||
<div className="w-20 aspect-4/5 rounded-md overflow-hidden ring-1 ring-foreground/10 shrink-0">
|
||||
<img src={application.profileUrl} alt="Profile photo" className="w-full h-full object-cover" />
|
||||
</div>
|
||||
<div className="w-40 px-2 aspect-5/2 rounded-md overflow-hidden ring-1 ring-foreground/10 shrink-0 bg-white">
|
||||
<img src={application.signatureUrl} alt="Signature" className="w-full h-full object-contain" />
|
||||
</div>
|
||||
</div>
|
||||
</div>)}
|
||||
<div className="flex flex-col gap-1">
|
||||
<h4 className="mb-1">Personal information</h4>
|
||||
{ application.nameMismatch && (
|
||||
{ application.status === "PENDING" && application.nameMismatch && (
|
||||
<Alert className="mb-2" variant="warning">
|
||||
<TriangleAlertIcon />
|
||||
<AlertTitle>Name mismatch</AlertTitle>
|
||||
<AlertDescription className="w-fit max-w-full">The name on this application differs from the applicant's Kotosoft ID. Verify before approving.</AlertDescription>
|
||||
</Alert>
|
||||
)}
|
||||
{ application.previousCitizenship && (
|
||||
{ application.status === "PENDING" && application.previousCitizenship && (
|
||||
<Alert className="mb-2" variant="warning">
|
||||
<TriangleAlertIcon />
|
||||
<AlertTitle>Previous citizenship holder</AlertTitle>
|
||||
@@ -147,8 +145,37 @@ export default function ApplicationCard({ application, onClose }: { application:
|
||||
</div>
|
||||
)
|
||||
}
|
||||
<Separator className="my-2" />
|
||||
<div className="flex flex-col gap-1">
|
||||
<h4 className="mb-1">Application history</h4>
|
||||
</div>
|
||||
<div className="flex flex-col gap-1">
|
||||
<div className="flex flex-row gap-2 items-center text-muted-foreground">
|
||||
<PlusIcon size={16} /><p>Created on {formatDate(application.createdAt)}</p>
|
||||
</div>
|
||||
{application.status !== "PENDING" && (<div className="flex flex-row gap-2 items-center text-muted-foreground">
|
||||
<ClockFadingIcon size={16} /><p>{application.reviewedAt ? `Reviewed on ${formatDate(application.reviewedAt)} by ${application.reviewer?.firstName} ${application.reviewer?.secondName}` : "Reviewed"}</p>
|
||||
</div>)}
|
||||
{application.status === "REJECTED" && (
|
||||
<div className="flex flex-col gap-0.5">
|
||||
<div className="flex flex-row gap-2 items-center text-destructive">
|
||||
<XIcon size={16} /><p>Rejected</p>
|
||||
</div>
|
||||
<div className="flex flex-col">
|
||||
<p>Rejection reason</p>
|
||||
<p className="text-muted-foreground">{application.rejectionReason}</p>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{application.status === "APPROVED" && (
|
||||
<div className="flex flex-row gap-2 items-center">
|
||||
<CheckIcon size={16} /><p>Approved</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</CardContent>
|
||||
{application.status === "PENDING" ? (
|
||||
<CardFooter className="gap-2">
|
||||
<Button onClick={handleApprove} disabled={isloading}>
|
||||
{isloading && <Spinner />}Approve
|
||||
@@ -158,6 +185,11 @@ export default function ApplicationCard({ application, onClose }: { application:
|
||||
</Button>
|
||||
<Button variant="outline" onClick={onClose}>Close</Button>
|
||||
</CardFooter>
|
||||
) : (
|
||||
<CardFooter>
|
||||
<Button variant="outline" onClick={onClose}>Close</Button>
|
||||
</CardFooter>
|
||||
)}
|
||||
</Card>
|
||||
<Dialog open={rejectOpen} onOpenChange={setRejectOpen}>
|
||||
<DialogContent>
|
||||
|
||||
@@ -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<string, BadgeVariant> = {
|
||||
PENDING: "outline",
|
||||
REJECTED: "destructive",
|
||||
APPROVED: "default",
|
||||
}
|
||||
|
||||
export const columns: ColumnDef<CitizenshipApplication>[] = [
|
||||
{
|
||||
accessorKey: "surname",
|
||||
@@ -31,7 +39,7 @@ export const columns: ColumnDef<CitizenshipApplication>[] = [
|
||||
header: "Status",
|
||||
cell: ({ row }) => {
|
||||
const status = row.getValue("status") as string
|
||||
return <Badge variant={status === "PENDING" ? "outline" : "default"}>{status}</Badge>
|
||||
return <Badge variant={variants[status] ?? "default"}>{status}</Badge>
|
||||
},
|
||||
},
|
||||
]
|
||||
@@ -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,10 +19,15 @@ 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) => ({
|
||||
applications.map(async (application) => {
|
||||
const reviewerUser = application.reviewedBy
|
||||
? await findUserById(application.reviewedBy)
|
||||
: null;
|
||||
|
||||
return {
|
||||
...application,
|
||||
profileUrl: await getImageUrl(application.profileKey),
|
||||
signatureUrl: await getImageUrl(application.signatureKey),
|
||||
@@ -32,7 +38,12 @@ export default async function ReviewPage() {
|
||||
|
||||
previousCitizenship:
|
||||
application.user._count.citizenships > 0,
|
||||
}))
|
||||
|
||||
reviewer: reviewerUser
|
||||
? { firstName: reviewerUser.firstName, secondName: reviewerUser.secondName }
|
||||
: null,
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
return (
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
export function GET() {
|
||||
return Response.json({ ok: true });
|
||||
}
|
||||
+13
-2
@@ -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() {
|
||||
<div className="flex flex-col p-4 md:p-16 gap-8 md:gap-16 mb-4 md:mb-0">
|
||||
<div className="flex flex-col gap-4 md:flex-row md:items-center justify-between">
|
||||
<h1>News</h1>
|
||||
<SearchBar />
|
||||
<div className="flex flex-row items-center gap-4">
|
||||
{user?.isAdmin && (
|
||||
<div className="flex flex-row items-center gap-4">
|
||||
@@ -32,7 +43,7 @@ export default async function News() {
|
||||
</div>
|
||||
<div className="flex flex-col gap-6">
|
||||
{
|
||||
news.length > 0 ? news.map((n) => (
|
||||
filteredNews.length > 0 ? filteredNews.map((n) => (
|
||||
<NewsCard news={n} key={n.id} />
|
||||
)) : <h2 className="text-muted-foreground">There are no news yet...</h2>
|
||||
}
|
||||
|
||||
@@ -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 (
|
||||
<Field className="max-w-sm">
|
||||
<InputGroup>
|
||||
<InputGroupInput
|
||||
placeholder="Search..."
|
||||
value={value}
|
||||
onChange={(e) => handleChange(e.target.value)}
|
||||
/>
|
||||
<InputGroupAddon align="inline-start">
|
||||
<SearchIcon className="text-muted-foreground" />
|
||||
</InputGroupAddon>
|
||||
</InputGroup>
|
||||
</Field>
|
||||
)
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { NewsCard } from "@/components/news-card";
|
||||
import { getPages } from "@/lib/pages/repository";
|
||||
import { ArrowRightIcon } from "lucide-react";
|
||||
import Image from "next/image";
|
||||
import Link from "next/link";
|
||||
|
||||
export default async function Home() {
|
||||
|
||||
@@ -7,8 +7,8 @@ import { formatDate } from "@/lib/utils";
|
||||
export function NewsCard({ news }: { news: PagePublic }) {
|
||||
return (
|
||||
<div className="flex flex-col gap-1">
|
||||
<Link href={`/news/${news.slug}`} className="w-max">
|
||||
<h2 className="hover:underline underline-offset-8 decoration-2 cursor-pointer">{news.title}</h2>
|
||||
<Link href={`/news/${news.slug}`} className="max-w-vh">
|
||||
<h2 className="hover:underline underline-offset-8 decoration-2 cursor-pointer truncate">{news.title}</h2>
|
||||
</Link>
|
||||
<div className="flex flex-col md:flex-row gap-2 md:gap-8 md:items-center">
|
||||
<div className="flex flex-row gap-4 md:gap-8">
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
services:
|
||||
eu:
|
||||
image: localhost:5000/eu:latest
|
||||
restart: unless-stopped
|
||||
extra_hosts:
|
||||
- "assets.dusiburg.ru:172.18.0.4"
|
||||
environment:
|
||||
PUBLIC_URL: ${PUBLIC_URL}
|
||||
DATABASE_URL: ${DATABASE_URL}
|
||||
|
||||
KOTOSOFT_ID_API_PUBLIC_URL: ${KOTOSOFT_ID_API_PUBLIC_URL}
|
||||
KOTOSOFT_ID_API_URL: ${KOTOSOFT_ID_API_URL}
|
||||
KOTOSOFT_CLIENT_ID: ${KOTOSOFT_CLIENT_ID}
|
||||
KOTOSOFT_CLIENT_SECRET: ${KOTOSOFT_CLIENT_SECRET}
|
||||
|
||||
JWT_SECRET: ${JWT_SECRET}
|
||||
SESSION_MAX_AGE: 604800
|
||||
|
||||
MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
|
||||
MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
|
||||
MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL}
|
||||
|
||||
VIRTUAL_HOST: ${DOMAIN}
|
||||
VIRTUAL_PORT: 3000
|
||||
LETSENCRYPT_HOST: ${DOMAIN}
|
||||
LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL}
|
||||
expose:
|
||||
- "3000"
|
||||
networks:
|
||||
- proxy
|
||||
- eu_net
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
eu_net:
|
||||
external: true
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
NGINX_PROXY_NAME="${NGINX_PROXY_CONTAINER_NAME:-nginx-proxy}"
|
||||
|
||||
TARGET_DOMAIN=$(echo "$MINIO_PUBLIC_URL" | sed -E 's#^https?://##; s#/.*##; s#:.*##')
|
||||
|
||||
if [ -n "$TARGET_DOMAIN" ]; then
|
||||
IP=$(getent hosts "$NGINX_PROXY_NAME" | awk '{ print $1 }' | head -n1)
|
||||
|
||||
if [ -n "$IP" ]; then
|
||||
echo "$IP $TARGET_DOMAIN" >> /etc/hosts
|
||||
echo "[entrypoint] resolved $NGINX_PROXY_NAME -> $IP for $TARGET_DOMAIN"
|
||||
else
|
||||
echo "[entrypoint] WARNING: could not resolve $NGINX_PROXY_NAME, using public DNS as fallback"
|
||||
fi
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
@@ -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: {
|
||||
|
||||
@@ -43,4 +43,5 @@ export type CitizenshipApplicationWithWarning = CitizenshipApplication & {
|
||||
previousCitizenship: boolean;
|
||||
profileUrl: string;
|
||||
signatureUrl: string;
|
||||
reviewer: { firstName: string; secondName: string } | null;
|
||||
};
|
||||
+36
-11
@@ -1,29 +1,42 @@
|
||||
import crypto from "crypto";
|
||||
import sharp from "sharp";
|
||||
import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3";
|
||||
import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
|
||||
|
||||
import { AppError } from "@/lib/action-result";
|
||||
import { getMinioClient } from "@/lib/minio";
|
||||
import { BUCKET, getInternalClient, getPublicClient } from "@/lib/storage";
|
||||
|
||||
const BUCKET = "uploads";
|
||||
const MAX_FILE_SIZE = 5 * 1024 * 1024;
|
||||
const ALLOWED_INPUT_FORMATS = new Set(["jpeg", "png", "webp"]);
|
||||
|
||||
export async function uploadImage(file: File, directory: string, options: { maxWidth?: number; maxHeight?: number; fit?: "inside" | "cover" }): Promise<string> {
|
||||
const DIRECTORY_RE = /^[a-z0-9][a-z0-9_-]*(\/[a-z0-9][a-z0-9_-]*)*$/;
|
||||
const KEY_RE = /^[a-z0-9][a-z0-9_-]*(\/[a-z0-9][a-z0-9_-]*)*\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.webp$/;
|
||||
|
||||
const URL_WINDOW_SEC = 60 * 60;
|
||||
const URL_EXPIRES_SEC = URL_WINDOW_SEC * 2;
|
||||
|
||||
export async function uploadImage(
|
||||
file: File,
|
||||
directory: string,
|
||||
options: { maxWidth?: number; maxHeight?: number; fit?: "inside" | "cover" } = {},
|
||||
): Promise<string> {
|
||||
if (!DIRECTORY_RE.test(directory)) throw new Error("Invalid upload directory");
|
||||
if (file.size === 0) throw new AppError("A file is required");
|
||||
if (file.size > MAX_FILE_SIZE) throw new AppError("Image must be smaller than 5MB");
|
||||
|
||||
const input = Buffer.from(await file.arrayBuffer());
|
||||
if (input.length > MAX_FILE_SIZE) throw new AppError("Image must be smaller than 5MB");
|
||||
|
||||
const image = sharp(input, {
|
||||
failOn: "error",
|
||||
limitInputPixels: 30_000_000,
|
||||
sequentialRead: true,
|
||||
});
|
||||
|
||||
const metadata = await image.metadata();
|
||||
if (!metadata.format || !ALLOWED_INPUT_FORMATS.has(metadata.format)) {
|
||||
throw new AppError("Only JPEG, PNG, or WEBP images are allowed");
|
||||
}
|
||||
|
||||
if (!metadata.width || !metadata.height || metadata.width < 100 || metadata.height < 100) {
|
||||
throw new AppError("Image is too small");
|
||||
}
|
||||
@@ -42,18 +55,30 @@ export async function uploadImage(file: File, directory: string, options: { maxW
|
||||
.toBuffer();
|
||||
|
||||
const key = `${directory}/${crypto.randomUUID()}.webp`;
|
||||
await getMinioClient().putObject(BUCKET, key, output, output.length, { "Content-Type": "image/webp" });
|
||||
await getInternalClient().send(
|
||||
new PutObjectCommand({
|
||||
Bucket: BUCKET,
|
||||
Key: key,
|
||||
Body: output,
|
||||
ContentLength: output.length,
|
||||
ContentType: "image/webp",
|
||||
CacheControl: "public, max-age=31536000, immutable",
|
||||
}),
|
||||
);
|
||||
return key;
|
||||
}
|
||||
|
||||
export async function removeImage(key: string) {
|
||||
await getMinioClient().removeObject(BUCKET, key)
|
||||
if (!KEY_RE.test(key)) throw new Error("Invalid image key");
|
||||
await getInternalClient().send(new DeleteObjectCommand({ Bucket: BUCKET, Key: key }));
|
||||
}
|
||||
|
||||
export async function getImageUrl(key: string): Promise<string> {
|
||||
return getMinioClient().presignedGetObject(
|
||||
BUCKET,
|
||||
key,
|
||||
60 * 5
|
||||
);
|
||||
if (!KEY_RE.test(key)) throw new Error("Invalid image key");
|
||||
const windowMs = URL_WINDOW_SEC * 1000;
|
||||
const signingDate = new Date(Math.floor(Date.now() / windowMs) * windowMs);
|
||||
return getSignedUrl(getPublicClient(), new GetObjectCommand({ Bucket: BUCKET, Key: key }), {
|
||||
expiresIn: URL_EXPIRES_SEC,
|
||||
signingDate,
|
||||
});
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
import { Client } from "minio";
|
||||
|
||||
let _client: Client | null = null;
|
||||
|
||||
export function getMinioClient(): Client {
|
||||
if (!_client) {
|
||||
const url = new URL(process.env.MINIO_PUBLIC_URL!);
|
||||
_client = new Client({
|
||||
endPoint: url.hostname,
|
||||
port: url.port ? Number(url.port) : 443,
|
||||
useSSL: url.protocol === "https:",
|
||||
accessKey: process.env.MINIO_ACCESS_KEY!,
|
||||
secretKey: process.env.MINIO_SECRET_KEY!,
|
||||
});
|
||||
}
|
||||
return _client;
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
import "server-only";
|
||||
import { S3Client } from "@aws-sdk/client-s3";
|
||||
|
||||
function env(name: string): string {
|
||||
const value = process.env[name];
|
||||
if (!value) throw new Error(`Missing environment variable: ${name}`);
|
||||
return value;
|
||||
}
|
||||
|
||||
export const BUCKET = process.env.RUSTFS_BUCKET ?? "uploads";
|
||||
const REGION = process.env.RUSTFS_REGION ?? "us-east-1";
|
||||
|
||||
let internalClient: S3Client | null = null;
|
||||
let publicClient: S3Client | null = null;
|
||||
|
||||
const credentials = () => ({
|
||||
accessKeyId: env("RUSTFS_ACCESS_KEY"),
|
||||
secretAccessKey: env("RUSTFS_SECRET_KEY"),
|
||||
});
|
||||
|
||||
|
||||
export function getInternalClient(): S3Client {
|
||||
internalClient ??= new S3Client({
|
||||
endpoint: `http://${env("RUSTFS_INTERNAL_HOST")}:${process.env.RUSTFS_INTERNAL_PORT ?? 9000}`,
|
||||
region: REGION,
|
||||
credentials: credentials(),
|
||||
forcePathStyle: true,
|
||||
requestChecksumCalculation: "WHEN_REQUIRED",
|
||||
responseChecksumValidation: "WHEN_REQUIRED",
|
||||
maxAttempts: 3,
|
||||
requestHandler: { connectionTimeout: 3_000, requestTimeout: 15_000 },
|
||||
});
|
||||
return internalClient;
|
||||
}
|
||||
|
||||
export function getPublicClient(): S3Client {
|
||||
publicClient ??= new S3Client({
|
||||
endpoint: new URL(env("RUSTFS_PUBLIC_URL")).origin,
|
||||
region: REGION,
|
||||
credentials: credentials(),
|
||||
forcePathStyle: true,
|
||||
requestChecksumCalculation: "WHEN_REQUIRED",
|
||||
responseChecksumValidation: "WHEN_REQUIRED",
|
||||
});
|
||||
return publicClient;
|
||||
}
|
||||
+11
-7
@@ -1,22 +1,26 @@
|
||||
import type { NextConfig } from "next";
|
||||
|
||||
const minioHost = process.env.MINIO_PUBLIC_URL ? new URL(process.env.MINIO_PUBLIC_URL).hostname : "localhost";
|
||||
const minioPort = process.env.MINIO_PUBLIC_URL ? new URL(process.env.MINIO_PUBLIC_URL).port : undefined;
|
||||
const publicUrl = process.env.RUSTFS_PUBLIC_URL ? new URL(process.env.RUSTFS_PUBLIC_URL) : null;
|
||||
|
||||
const nextConfig: NextConfig = {
|
||||
images: {
|
||||
remotePatterns: [
|
||||
remotePatterns: publicUrl
|
||||
? [
|
||||
{
|
||||
hostname: minioHost,
|
||||
...(minioPort ? { port: minioPort } : {}),
|
||||
protocol: publicUrl.protocol === "https:" ? "https" : "http",
|
||||
hostname: publicUrl.hostname,
|
||||
...(publicUrl.port ? { port: publicUrl.port } : {}),
|
||||
pathname: `/${process.env.RUSTFS_BUCKET ?? "uploads"}/**`,
|
||||
},
|
||||
],
|
||||
]
|
||||
: [],
|
||||
},
|
||||
experimental: {
|
||||
serverActions: {
|
||||
bodySizeLimit: "5mb",
|
||||
bodySizeLimit: "6mb",
|
||||
},
|
||||
},
|
||||
output: "standalone",
|
||||
};
|
||||
|
||||
export default nextConfig;
|
||||
+34
-25
@@ -9,39 +9,41 @@
|
||||
"lint": "eslint"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.1169.0",
|
||||
"@aws-sdk/s3-request-presigner": "^3.1169.0",
|
||||
"@imgly/background-removal": "^1.7.0",
|
||||
"@prisma/adapter-pg": "^7.8.0",
|
||||
"@prisma/client": "^7.8.0",
|
||||
"@prisma/adapter-pg": "^7.10.1",
|
||||
"@prisma/client": "^7.10.1",
|
||||
"@tanstack/react-table": "^8.21.3",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"jose": "^6.2.3",
|
||||
"lucide-react": "^1.20.0",
|
||||
"minio": "^8.0.7",
|
||||
"next": "16.2.9",
|
||||
"pg": "^8.21.0",
|
||||
"radix-ui": "^1.6.0",
|
||||
"jose": "^6.2.17",
|
||||
"lucide-react": "^1.73.0",
|
||||
"next": "16.4.6",
|
||||
"pg": "^8.23.1",
|
||||
"radix-ui": "^1.8.1",
|
||||
"react": "19.2.4",
|
||||
"react-dom": "19.2.4",
|
||||
"shadcn": "^4.11.0",
|
||||
"sharp": "^0.35.3",
|
||||
"sonner": "^2.0.7",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"server-only": "^0.0.1",
|
||||
"sharp": "^0.35.5",
|
||||
"sonner": "^2.0.8",
|
||||
"tailwind-merge": "^3.7.0",
|
||||
"tw-animate-css": "^1.4.0",
|
||||
"uuid": "^14.0.0",
|
||||
"zod": "^4.4.3"
|
||||
"uuid": "^14.0.3",
|
||||
"zod": "^4.6.7"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tailwindcss/postcss": "^4",
|
||||
"@types/node": "^20",
|
||||
"@types/pg": "^8.20.0",
|
||||
"@types/react": "^19",
|
||||
"@types/react-dom": "^19",
|
||||
"eslint": "^9",
|
||||
"eslint-config-next": "16.2.9",
|
||||
"prisma": "^7.8.0",
|
||||
"tailwindcss": "^4",
|
||||
"typescript": "^5"
|
||||
"@tailwindcss/postcss": "^4.3.5",
|
||||
"@types/node": "^20.19.43",
|
||||
"@types/pg": "^8.23.1",
|
||||
"@types/react": "^19.3.0",
|
||||
"@types/react-dom": "^19.3.0",
|
||||
"eslint": "^9.39.5",
|
||||
"eslint-config-next": "16.4.6",
|
||||
"prisma": "^7.10.1",
|
||||
"shadcn": "^4.23.0",
|
||||
"tailwindcss": "^4.3.5",
|
||||
"typescript": "^5.9.3"
|
||||
},
|
||||
"ignoreScripts": [
|
||||
"sharp",
|
||||
@@ -54,5 +56,12 @@
|
||||
"protobufjs",
|
||||
"sharp",
|
||||
"unrs-resolver"
|
||||
]
|
||||
],
|
||||
"overrides": {
|
||||
"fast-xml-parser": "^5.10.1",
|
||||
"source-map-js": "^1.2.2",
|
||||
"baseline-browser-mapping": "^2.11.0",
|
||||
"fast-uri": "^3.1.6",
|
||||
"zod": "^4.6.7"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user