refactor: update payment types and user interface, enhance error handling, and adjust API base URL
Some checks failed
Build and Push Docker Images / Build and Push Docker Images (push) Failing after 3m14s

This commit is contained in:
2025-04-05 23:25:17 +05:00
parent aa18484475
commit 9e2a2f430e
15 changed files with 596 additions and 423 deletions

View File

@ -1,7 +1,9 @@
import { getPayment } from "@/actions/payment";
import { authOptions } from "@/app/auth";
import DevicesToPay from "@/components/devices-to-pay";
import { auth } from "@/app/auth";
import prisma from "@/lib/db";
import { cn } from "@/lib/utils";
import { tryCatch } from "@/utils/tryCatch";
import { getServerSession } from "next-auth";
import { headers } from "next/headers";
import React from "react";
export default async function PaymentPage({
@ -9,23 +11,13 @@ export default async function PaymentPage({
}: {
params: Promise<{ paymentId: string }>;
}) {
const session = await auth.api.getSession({
headers: await headers(),
});
const user = await prisma.user.findUnique({
where: {
id: session?.session.userId,
},
});
const session = await getServerSession(authOptions);
const paymentId = (await params).paymentId;
const payment = await prisma.payment.findUnique({
where: {
id: paymentId,
},
include: {
devices: true,
},
});
const [error, payment] = await tryCatch(getPayment({ id: paymentId }));
if (error) {
return <div>Error getting payment: {error.message}</div>;
}
return (
<div>
<div className="flex justify-between items-center border-[1px] rounded-md border-dashed font-bold title-bg py-4 px-2 mb-4">
@ -46,7 +38,10 @@ export default async function PaymentPage({
id="user-filters"
className="pb-4 gap-4 flex sm:flex-row flex-col items-start justify-start"
>
<DevicesToPay user={user || undefined} payment={payment || undefined} />
<DevicesToPay
user={session?.user || undefined}
payment={payment || undefined}
/>
</div>
</div>
);

2
app/next-auth.d.ts vendored
View File

@ -16,6 +16,8 @@ declare module "next-auth" {
username?: string;
user_permissions?: { id: number; name: string }[];
id_card?: string;
mobile?: string;
wallet_balance?: number;
first_name?: string;
last_name?: string;
last_login?: string;