feat: add floating label input component for enhanced form usability ✨

refactor: implement device payment verification with useActionState hook 🔨

actions/payment.ts

@@ -179,24 +179,16 @@ export async function cancelTopup({ id }: { id: string }) {
 export async function cancelPayment({ id }: { id: string }) {
 	const session = await getServerSession(authOptions);
 	const response = await fetch(
-		`${process.env.SARLINK_API_BASE_URL}/api/billing/payment/${id}/delete/`,
+		`${process.env.SARLINK_API_BASE_URL}/api/billing/payment/${id}/cancel/`,
 		{
-			method: "DELETE",
+			method: "PATCH",
 			headers: {
 				"Content-Type": "application/json",
 				Authorization: `Token ${session?.apiToken}`,
 			},
 		},
 	);
-	if (!response.ok) {
-		const errorData = (await response.json()) as ApiError;
-		const errorMessage =
-			errorData.message || errorData.detail || "An error occurred.";
-		const error = new Error(errorMessage);
-		(error as ApiError & { details?: ApiError }).details = errorData; // Attach the errorData to the error object
-		throw error;
-	}
-	return { message: "Payment successfully canceled." };
+	return handleApiResponse<Payment>(response, "cancelPayment");
 }
 
 type UpdatePayment = {
@@ -226,6 +218,84 @@ export async function verifyPayment({ id, method }: UpdatePayment) {
 	return handleApiResponse<Payment>(response, "updatePayment");
 }
 
+export type VerifyDevicePaymentState = {
+	payment?: Payment;
+	message: string;
+	success: boolean;
+	fieldErrors: Record<string, string>;
+	payload?: FormData;
+}
+
+export async function verifyDevicePayment(
+	_prevState: VerifyDevicePaymentState,
+	formData: FormData
+): Promise<VerifyDevicePaymentState> {
+	const session = await getServerSession(authOptions);
+
+	// Get the payment ID and method from the form data
+	const paymentId = formData.get('paymentId') as string;
+	const method = formData.get('method') as "TRANSFER" | "WALLET";
+
+	if (!paymentId) {
+		return {
+			message: "Payment ID is required",
+			success: false,
+			fieldErrors: { paymentId: "Payment ID is required" },
+		};
+	}
+
+	if (!method) {
+		return {
+			message: "Payment method is required",
+			success: false,
+			fieldErrors: { method: "Payment method is required" },
+		};
+	}
+
+	try {
+		const response = await fetch(
+			`${process.env.SARLINK_API_BASE_URL}/api/billing/payment/${paymentId}/verify/`,
+			{
+				method: "PUT",
+				headers: {
+					"Content-Type": "application/json",
+					Authorization: `Token ${session?.apiToken}`,
+				},
+				body: JSON.stringify({
+					method,
+				}),
+			},
+		);
+
+		const result = await handleApiResponse<Payment>(response, "verifyDevicePayment");
+
+		revalidatePath("/payments/[paymentId]", "page");
+
+		return {
+			message: method === "WALLET"
+				? "Payment completed successfully using wallet!"
+				: "Payment verification successful!",
+			success: true,
+			fieldErrors: {},
+			payment: result,
+		};
+	} catch (error: unknown) {
+		if (error instanceof Error) {
+			return {
+				message: error.message || "Payment verification failed. Please try again.",
+				success: false,
+				fieldErrors: {},
+			};
+		} else {
+			return {
+				message: "Payment verification failed.",
+				success: false,
+				fieldErrors: {},
+			};
+		}
+	}
+}
+
 
 export type VerifyTopupPaymentState = {
 	transaction?: {
@@ -293,18 +363,4 @@ export async function verifyTopupPayment(
 	}
 }
 
-export async function getProfile() {
-	const session = await getServerSession(authOptions);
-	const response = await fetch(
-		`${process.env.SARLINK_API_BASE_URL}/api/auth/profile/`,
-		{
-			method: "GET",
-			headers: {
-				"Content-Type": "application/json",
-				Authorization: `Token ${session?.apiToken}`,
-			},
-		},
-	);
 
-	return handleApiResponse<User>(response, "getProfile");
-}

actions/user-actions.ts

@@ -1,8 +1,9 @@
 "use server";
-import { VerifyUserDetails } from "@/lib/person";
-import { revalidatePath } from "next/cache";
-import { redirect } from "next/navigation";
-import { CreateClient } from "./ninja/client";
+
+import { getServerSession } from "next-auth";
+import { authOptions } from "@/app/auth";
+import type { User, UserProfile } from "@/lib/types/user";
+import { handleApiResponse } from "@/utils/tryCatch";
 
 export async function VerifyUser(userId: string) {
 	// const user = await prisma.user.findUnique({
@@ -52,72 +53,37 @@ export async function VerifyUser(userId: string) {
 	// revalidatePath("/users");
 }
 
-export async function Rejectuser({
-	userId,
-	reason,
-}: { userId: string; reason: string }) {
-	// const user = await prisma.user.findUnique({
-	// 	where: {
-	// 		id: userId,
-	// 	},
-	// });
-	// if (!user) {
-	// 	throw new Error("User not found");
-	// }
-
-	// await SendUserRejectionDetailSMS({
-	// 	details: reason,
-	// 	phoneNumber: user.phoneNumber,
-	// });
-	// await prisma.user.delete({
-	// 	where: {
-	// 		id: userId,
-	// 	},
-	// });
-	revalidatePath("/users");
-	redirect("/users");
-}
-
-export const SendUserRejectionDetailSMS = async ({
-	details,
-	phoneNumber,
-}: {
-	details: string;
-	phoneNumber: string;
-}) => {
-	try {
-		const respose = await fetch(`${process.env.SMS_API_BASE_URL}/api/sms`, {
-			method: "POST",
+export async function getProfile() {
+	const session = await getServerSession(authOptions);
+	const response = await fetch(
+		`${process.env.SARLINK_API_BASE_URL}/api/auth/profile/`,
+		{
+			method: "GET",
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${process.env.SMS_API_KEY}`,
+				Authorization: `Token ${session?.apiToken}`,
 			},
-			body: JSON.stringify({
-				check_delivery: false,
-				number: phoneNumber,
-				message: details,
-			}),
-		});
-		const data = await respose.json();
-		console.log(data);
-		return data;
-	} catch (error) {
-		console.error(error);
-	}
-};
+		},
+	);
 
-export async function AddDevice({
-	name,
-	mac_address,
-	user_id,
-}: { name: string; mac_address: string; user_id: string }) {
-	// const newDevice = await prisma.device.create({
-	// 	data: {
-	// 		name: name,
-	// 		mac: mac_address,
-	// 		userId: user_id,
-	// 	},
-	// });
-	revalidatePath("/devices");
-	// return newDevice;
+	return handleApiResponse<User>(response, "getProfile");
 }
+
+
+
+export async function getProfileById(userId: string) {
+	const session = await getServerSession(authOptions);
+	const response = await fetch(
+		`${process.env.SARLINK_API_BASE_URL}/api/auth/users/${userId}/`,
+		{
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Authorization: `Token ${session?.apiToken}`,
+			},
+		},
+	);
+
+	return handleApiResponse<UserProfile>(response, "getProfilebyId");
+}
+

app/(dashboard)/payments/[paymentId]/page.tsx

@@ -1,11 +1,13 @@
+import { redirect } from "next/navigation";
 import { getPayment, getProfile } from "@/actions/payment";
 import CancelPaymentButton from "@/components/billing/cancel-payment-button";
+import ExpiryCountDown from "@/components/billing/expiry-time-countdown";
 import ClientErrorMessage from "@/components/client-error-message";
 import DevicesToPay from "@/components/devices-to-pay";
 import { Button } from "@/components/ui/button";
+import { TextShimmer } from "@/components/ui/text-shimmer";
 import { cn } from "@/lib/utils";
 import { tryCatch } from "@/utils/tryCatch";
-import { redirect } from "next/navigation";
 export default async function PaymentPage({
 	params,
 }: {
@@ -28,28 +30,50 @@ export default async function PaymentPage({
 			<div className="flex justify-between items-center border rounded-md border-dashed font-bold title-bg py-4 px-4 mb-4 mx-2">
 				<h3 className="text-sarLinkOrange text-2xl">Payment</h3>
 				<div className="flex flex-col gap-4 items-end w-full">
+					{!payment.is_expired && payment.paid && payment.status !== "PENDING" && (
 						<Button
 							disabled
 							className={cn(
 								"rounded-md opacity-100! uppercase font-semibold",
 								payment?.paid
-								? "text-green-500 bg-green-500/20"
-								: "text-yellow-500 bg-yellow-900",
+									? "text-green-900 bg-green-500/20"
+									: "text-inherit bg-yellow-400",
 							)}
 						>
-						{payment?.paid ? "Paid" : "Pending"}
+							{payment.status}
 						</Button>
-					{!payment.paid && (
-						<CancelPaymentButton paymentId={paymentId} />
 					)}
+					{payment.status === "PENDING" && !payment.is_expired && (
+						<Button>
+							<TextShimmer>Payment Pending</TextShimmer>{" "}
+						</Button>
+					)}
+					{!payment.paid &&
+						(payment.is_expired ? (
+							<Button
+								disabled
+								className="rounded-md opacity-100! uppercase font-semibold text-red-500 bg-red-500/20"
+							>
+								Payment Expired
+							</Button>
+						) : payment.status === "PENDING" ? (
+							<CancelPaymentButton paymentId={paymentId} />
+						) : payment.status === "CANCELLED" ? (
+							<Button disabled>Payment Cancelled</Button>
+						) : (
+							""
+						))}
 				</div>
 			</div>
-
+			{!payment.paid && (
+				<ExpiryCountDown expiryLabel="Payment" expiresAt={payment.expires_at} />
+			)}
 			<div
-				id="user-filters"
+				id="user-device-payments"
 				className="pb-4 gap-4 flex sm:flex-row flex-col items-start justify-start"
 			>
 				<DevicesToPay
+					disabled={payment.paid || payment.is_expired}
 					user={userProfile || undefined}
 					payment={payment || undefined}
 				/>

app/(dashboard)/profile/page.tsx

@@ -0,0 +1,95 @@
+import { redirect } from "next/navigation";
+import { getServerSession } from "next-auth";
+import { getProfileById } from "@/actions/user-actions";
+import { authOptions } from "@/app/auth";
+import ClientErrorMessage from "@/components/client-error-message";
+import { Badge } from "@/components/ui/badge";
+import { FloatingLabelInput } from "@/components/ui/floating-label";
+import { tryCatch } from "@/utils/tryCatch";
+
+export default async function Profile() {
+  const session = await getServerSession(authOptions);
+  if (!session?.user) return redirect("/auth/signin?callbackUrl=/profile");
+  const [error, profile] = await tryCatch(getProfileById(session?.user.id));
+  if (error) {
+    if (error.message === "Invalid token.") redirect("/auth/signin");
+    return <ClientErrorMessage message={error.message} />;
+  }
+  return (
+    <div>
+      <div className="flex justify-between items-center font-bold border rounded-md border-dashed title-bg py-4 px-2 mb-4">
+        <h3 className="text-sarLinkOrange text-2xl">Profile</h3>
+        <div className="text-sarLinkOrange uppercase font-mono text-sm flex flex-col items-center rounded gap-2 py-2 px-4">
+          <span>Profile Status</span>
+          {verifiedStatus(profile?.verified ?? false)}
+        </div>
+      </div>
+      <fieldset>
+        <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4 max-w-4xl">
+          <FloatingLabelInput
+            id="floating-name"
+            label="Full Name"
+            value={`${profile?.first_name} ${profile?.last_name}`}
+            readOnly
+          />
+          <FloatingLabelInput
+            id="floating-id-card"
+            label="ID Card"
+            value={`${profile?.id_card}`}
+            readOnly
+          />
+          <FloatingLabelInput
+            id="floating-island"
+            label="Island"
+            value={`${profile?.atoll.name}. ${profile?.island.name}`}
+            readOnly
+          />
+          <FloatingLabelInput
+            id="floating-dob"
+            label="Date of Birth"
+            value={`${new Date(
+              profile?.dob.toString() ?? "",
+            ).toLocaleDateString("en-US", {
+              month: "short",
+              day: "2-digit",
+              year: "numeric",
+            })}`}
+            readOnly
+          />
+          <FloatingLabelInput
+            id="floating-address"
+            label="Address"
+            value={`${profile?.address}`}
+            readOnly
+          />
+          <FloatingLabelInput
+            id="floating-mobile"
+            label="Phone Number"
+            value={`${profile?.mobile}`}
+            readOnly
+          />
+          <FloatingLabelInput
+            id="floating-account"
+            label="Account Number"
+            value={`${profile?.acc_no}`}
+            readOnly
+          />
+        </div>
+      </fieldset>
+      {/* <Suspense key={query} fallback={"loading...."}>
+        <TopupsTable searchParams={searchParams} />
+      </Suspense> */}
+    </div>
+  );
+}
+
+function verifiedStatus(status: boolean) {
+  switch (status) {
+    case true:
+      return <Badge className="bg-green-500 text-white">Verified</Badge>;
+    case false:
+      return <Badge className="bg-red-500 text-white">Not Verified</Badge>;
+    default:
+      return <Badge className="bg-yellow-500 text-white">Unknown</Badge>;
+  }
+}

app/(dashboard)/top-ups/[topupId]/page.tsx

@@ -20,50 +20,58 @@ export default async function TopupPage({
     return <ClientErrorMessage message={error.message} />;
   }
 
-
   return (
     <div>
       <div className="flex justify-between items-center border rounded-md border-dashed font-bold title-bg py-4 px-4 mb-4 mx-2">
         <h3 className="text-sarLinkOrange text-2xl">Topup</h3>
         <div className="flex flex-col gap-4 items-end w-full">
-          {!topup.is_expired && (
-
+          {!topup.is_expired && topup.paid && topup.status !== "PENDING" && (
             <Button
               disabled
               className={cn(
                 "rounded-md opacity-100! uppercase font-semibold",
-                // topup?.paid
-                // ? "text-green-900 bg-green-500/20"
-                // : "text-inherit bg-yellow-400",
+                topup?.paid
+                  ? "text-green-900 bg-green-500/20"
+                  : "text-inherit bg-yellow-400",
               )}
             >
-              {topup?.paid ? <span>Paid</span> : <TextShimmer>Payment Pending</TextShimmer>}
+              {topup.status}
+            </Button>
+          )}
+          {topup.status === "PENDING" && !topup.is_expired && (
+            <Button>
+              <TextShimmer>Payment Pending</TextShimmer>{" "}
             </Button>
           )}
 
-          {!topup.paid && (
-            topup.is_expired ? (
+          {!topup.paid &&
+            (topup.is_expired ? (
               <Button
                 disabled
                 className="rounded-md opacity-100! uppercase font-semibold text-red-500 bg-red-500/20"
               >
                 Topup Expired
               </Button>
-            ) : (
+            ) : topup.status === "PENDING" ? (
               <CancelTopupButton topupId={topupId} />
-            )
-          )}
+            ) : topup.status === "CANCELLED" ? (
+              <Button disabled>Topup Cancelled</Button>
+            ) : (
+              ""
+            ))}
         </div>
       </div>
-      {!topup.paid && (
-        <ExpiryCountDown expiresAt={topup.expires_at} />
+      {!topup.paid && topup.status === "PENDING" && !topup.is_expired && (
+        <ExpiryCountDown expiryLabel="Top up" expiresAt={topup.expires_at} />
       )}
       <div
         id="user-topup-details"
         className="pb-4 gap-4 flex sm:flex-row flex-col items-start justify-start"
       >
         <TopupToPay
-          disabled={topup.paid || topup.is_expired}
+          disabled={
+            topup.paid || topup.is_expired || topup.status === "CANCELLED"
+          }
           topup={topup || undefined}
         />
       </div>

components/account-information.tsx

@@ -0,0 +1,56 @@
+"use client"
+import { Clipboard, ClipboardCheck } from "lucide-react";
+import { useState } from "react";
+import { toast } from "sonner";
+import { Button } from "./ui/button";
+
+export function AccountInfomation({
+  accountNo,
+  accName,
+}: {
+  accountNo: string;
+  accName: string;
+}) {
+  const [accNo, setAccNo] = useState(false);
+  return (
+    <div className="justify-center items-center border my-4 flex flex-col gap-2 p-2 rounded-md">
+      <h6 className="title-bg uppercase p-2 border rounded w-full font-semibold">
+        Account Information
+      </h6>
+      <div className="border justify-center flex flex-col items-center bg-white/10 w-full p-2 rounded">
+        <div className="text-sm font-semibold">Account Name</div>
+        <span>{accName}</span>
+      </div>
+      <div className="border flex justify-between items-center gap-2 w-full p-2 rounded">
+        <div className="flex flex-col items-center justify-center w-full">
+          <p className="text-sm font-semibold">Account No</p>
+          <span>{accountNo}</span>
+          <Button
+            onClick={() => {
+              setTimeout(() => {
+                setAccNo(true);
+                navigator.clipboard.writeText(accountNo);
+              }, 2000);
+              toast.success("Account number copied!");
+              setAccNo((prev) => !prev);
+            }}
+            className="mt-2 w-full"
+            variant={"secondary"}
+          >
+            {accNo ? (
+              <div className="flex items-center gap-2">
+                <span>Copy Account Number</span>
+                <Clipboard />
+              </div>
+            ) : (
+              <div className="flex items-center gap-2">
+                <span>Copy Account Number</span>
+                <ClipboardCheck color="green" />
+              </div>
+            )}
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+}

components/auth/account-popver.tsx

@@ -1,13 +1,14 @@
 "use client";
+import { Loader2, User as UserIcon } from "lucide-react";
+import Link from "next/link";
+import { signOut, useSession } from "next-auth/react";
+import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import {
 	Popover,
 	PopoverContent,
 	PopoverTrigger,
 } from "@/components/ui/popover";
-import { Loader2, User as UserIcon } from "lucide-react";
-import { signOut, useSession } from "next-auth/react";
-import { useState } from "react";
 
 export function AccountPopover() {
 	const session = useSession();
@@ -36,6 +37,7 @@ export function AccountPopover() {
 							<p>{session.data?.user?.mobile}</p>
 						</div>
 					</div>
+					<div className="flex flex-col gap-2">
 						<Button
 							disabled={loading}
 							onClick={async () => {
@@ -46,6 +48,13 @@ export function AccountPopover() {
 						>
 							{loading ? <Loader2 className="animate-spin" /> : "Logout"}
 						</Button>
+						<Link href="/profile" className="text-muted-foreground">
+							<Button variant={"secondary"} className="w-full">
+								View Profile
+							</Button>
+						</Link>
+					</div>
+
 				</div>
 			</PopoverContent>
 		</Popover>

components/auth/application-layout.tsx

@@ -1,7 +1,7 @@
 import { redirect } from "next/navigation";
 import { getServerSession } from "next-auth";
 import { NuqsAdapter } from 'nuqs/adapters/next/app'
-import { getProfile } from "@/actions/payment";
+import { getProfile } from "@/actions/user-actions";
 import { authOptions } from "@/app/auth";
 import { DeviceCartDrawer } from "@/components/device-cart";
 import { ModeToggle } from "@/components/theme-toggle";

components/billing/cancel-payment-button.tsx

@@ -1,11 +1,11 @@
 "use client";
 
-import { cancelPayment } from "@/actions/payment";
-import { tryCatch } from "@/utils/tryCatch";
 import { Loader2, Trash2 } from "lucide-react";
 import { useRouter } from "next/navigation";
 import React from "react";
 import { toast } from "sonner";
+import { cancelPayment } from "@/actions/payment";
+import { tryCatch } from "@/utils/tryCatch";
 import { Button } from "../ui/button";
 
 export default function CancelPaymentButton({
@@ -17,12 +17,16 @@ export default function CancelPaymentButton({
 		<Button
 			onClick={async () => {
 				setLoading(true);
-				const [error, x] = await tryCatch(cancelPayment({ id: paymentId }));
-				console.log(x);
+				const [error, payment] = await tryCatch(cancelPayment({ id: paymentId }));
+				console.log(payment);
 				if (error) {
 					toast.error(error.message);
 					setLoading(false);
 				} else {
+					toast.success("Payment cancelled successfully!", {
+						description: `Your payment of ${payment?.amount} MVR has been cancelled.`,
+						closeButton: true,
+					});
 					router.replace("/devices");
 				}
 			}}

components/billing/expiry-time-countdown.tsx

@@ -15,7 +15,7 @@ const HumanizeTimeLeft = (seconds: number) => {
   return `${minutes}m ${remainingSeconds}s`
 }
 
-export default function ExpiryCountDown({ expiresAt }: { expiresAt: string }) {
+export default function ExpiryCountDown({ expiresAt, expiryLabel }: { expiresAt: string, expiryLabel: string }) {
   const [timeLeft, setTimeLeft] = useState(calculateTimeLeft(expiresAt))
   const [mounted, setMounted] = useState(false)
   const router = useRouter()
@@ -47,7 +47,7 @@ export default function ExpiryCountDown({ expiresAt }: { expiresAt: string }) {
       {timeLeft ? (
         <span>Time left: {HumanizeTimeLeft(timeLeft)}</span>
       ) : (
-        <span>Top up has expired. Please make another topup to add balance to your wallet.</span>
+        <span>{expiryLabel} has expired.</span>
       )}
       {timeLeft > 0 && (
         <Progress className='absolute bottom-0 left-0 right-0' color='#f49b5b' value={timeLeft / 600 * 100} />

components/devices-table.tsx

@@ -52,7 +52,6 @@ export async function DevicesTable({
 	}
 	apiParams.limit = limit;
 	apiParams.offset = offset;
-	console.log("API Params:", apiParams);
 	const [error, devices] = await tryCatch(
 		getDevices(apiParams),
 	);

components/devices-to-pay.tsx

@@ -1,14 +1,12 @@
 "use client";
 import {
 	BadgeDollarSign,
-	Clipboard,
-	ClipboardCheck,
 	Loader2,
-	Wallet,
+	Wallet
 } from "lucide-react";
-import { useState } from "react";
+import { useActionState, useEffect } from "react";
 import { toast } from "sonner";
-import { verifyPayment } from "@/actions/payment";
+import { type VerifyDevicePaymentState, verifyDevicePayment } from "@/actions/payment";
 import {
 	Table,
 	TableBody,
@@ -19,15 +17,36 @@ import {
 } from "@/components/ui/table";
 import type { Payment } from "@/lib/backend-types";
 import type { User } from "@/lib/types/user";
+import { AccountInfomation } from "./account-information";
 import { Button } from "./ui/button";
 
+const initialState: VerifyDevicePaymentState = {
+	message: "",
+	success: false,
+	fieldErrors: {},
+};
+
 export default function DevicesToPay({
 	payment,
 	user,
-}: { payment?: Payment; user?: User }) {
-	const [verifyingWalletPayment, setVerifyingWalletPayment] = useState(false);
-	const [verifyingTransferPayment, setVerifyingTransferPayment] = useState(false);
+	disabled
+}: { payment?: Payment; user?: User, disabled?: boolean }) {
+	const [state, formAction, isPending] = useActionState(verifyDevicePayment, initialState);
 
+	// Handle toast notifications based on state changes
+	useEffect(() => {
+		if (state.success && state.message) {
+			toast.success("Payment successful!", {
+				closeButton: true,
+				description: state.message,
+			});
+		} else if (!state.success && state.message && state.message !== initialState.message) {
+			toast.error("Payment Verification Failed", {
+				closeButton: true,
+				description: state.message,
+			});
+		}
+	}, [state]);
 
 	const devices = payment?.devices;
 	if (devices?.length === 0) {
@@ -81,58 +100,55 @@ export default function DevicesToPay({
 							) : (
 								<div className="flex flex-col gap-2">
 									{isWalletPayVisible && (
+										<form action={formAction}>
+											<input type="hidden" name="paymentId" value={payment?.id ?? ""} />
+											<input type="hidden" name="method" value="WALLET" />
 											<Button
-											disabled={verifyingWalletPayment || verifyingTransferPayment}
-											onClick={async () => {
-												setVerifyingWalletPayment(true);
-												await verifyPayment({
-													method: "WALLET",
-													id: payment?.id ?? "",
-												});
-												setVerifyingWalletPayment(false);
-											}}
+												disabled={isPending}
+												type="submit"
 												variant={"secondary"}
 												size={"lg"}
 											>
-											{verifyingWalletPayment ? "Processing payment..." : "Pay with wallet"}
+												{isPending ? "Processing payment..." : "Pay with wallet"}
 												<Wallet />
 											</Button>
+										</form>
 									)}
+									<form action={formAction}>
+										<input type="hidden" name="paymentId" value={payment?.id ?? ""} />
+										<input type="hidden" name="method" value="TRANSFER" />
 										<Button
-										disabled={verifyingTransferPayment || verifyingWalletPayment}
-										onClick={async () => {
-											setVerifyingTransferPayment(true);
-											try {
-												await verifyPayment({
-													id: payment?.id ?? "",
-													method: "TRANSFER"
-												});
-												toast.success("Payment verification successful!");
-											} catch (error: unknown) {
-												if (error instanceof Error) {
-													toast.error(error.message);
-												} else {
-													toast.error("Payment verification failed.");
-												}
-											} finally {
-												setVerifyingTransferPayment(false);
-											}
-										}}
+											disabled={isPending || disabled}
+											type="submit"
 											size={"lg"}
 											className="mb-4"
 										>
-										{verifyingTransferPayment ? "Processing payment..." : "I have paid"}
-										{verifyingTransferPayment ? (
+											{isPending ? "Processing payment..." : "I have paid"}
+											{isPending ? (
 												<Loader2 className="animate-spin" />
 											) : (
 												<BadgeDollarSign />
 											)}
 										</Button>
+									</form>
 								</div>
 							)}
 						</div>
 					</TableCaption>
 					<TableBody className="">
+						<TableRow>
+							<TableCell>Payment created</TableCell>
+							<TableCell className="text-right">
+								{new Date(payment?.created_at ?? "").toLocaleDateString("en-US", {
+									month: "short",
+									day: "2-digit",
+									year: "numeric",
+									minute: "2-digit",
+									hour: "2-digit",
+									second: "2-digit",
+								})}
+							</TableCell>
+						</TableRow>
 						<TableRow>
 							<TableCell>Total Devices</TableCell>
 							<TableCell className="text-right text-xl">
@@ -144,6 +160,7 @@ export default function DevicesToPay({
 							<TableCell className="text-right text-xl">
 								{payment?.number_of_months} Months
 							</TableCell>
+
 						</TableRow>
 					</TableBody>
 					<TableFooter>
@@ -160,42 +177,4 @@ export default function DevicesToPay({
 	);
 }
 
-function AccountInfomation({
-	accountNo,
-	accName,
-}: {
-	accountNo: string;
-	accName: string;
-}) {
-	const [accNo, setAccNo] = useState(false);
-	return (
-		<div className="justify-start items-start border my-4 flex flex-col gap-2 p-2 rounded-md">
-			<h6 className="title-bg uppercase p-2 border rounded w-full font-semibold">
-				Account Information
-			</h6>
-			<div className="border justify-start flex flex-col items-start bg-white/10 w-full p-2 rounded">
-				<div className="text-sm font-semibold">Account Name</div>
-				<span>{accName}</span>
-			</div>
-			<div className="border flex justify-between items-start gap-2  bg-white/10 w-full p-2 rounded">
-				<div className="flex flex-col items-start justify-start">
-					<p className="text-sm font-semibold">Account No</p>
-					<span>{accountNo}</span>
-				</div>
-				<Button
-					onClick={() => {
-						setTimeout(() => {
-							setAccNo(true);
-							navigator.clipboard.writeText(accountNo);
-						}, 2000);
-						toast.success("Account number copied!");
-						setAccNo((prev) => !prev);
-					}}
-					variant={"link"}
-				>
-					{accNo ? <Clipboard /> : <ClipboardCheck color="green" />}
-				</Button>
-			</div>
-		</div>
-	);
-}
+

components/payments-table.tsx

@@ -28,12 +28,17 @@ export async function PaymentsTable({
 	}>;
 }) {
 	const resolvedParams = await searchParams;
+	const page = Number.parseInt(resolvedParams.page as string) || 1;
+	const limit = 10;
+	const offset = (page - 1) * limit;
 	const apiParams: Record<string, string | number | undefined> = {};
 	for (const [key, value] of Object.entries(resolvedParams)) {
 		if (value !== undefined && value !== "") {
 			apiParams[key] = typeof value === "number" ? value : String(value);
 		}
 	}
+	apiParams.limit = limit;
+	apiParams.offset = offset;
 	const [error, payments] = await tryCatch(getPayments(apiParams));
 
 	if (error) {
@@ -59,7 +64,7 @@ export async function PaymentsTable({
 								<TableRow>
 									<TableHead>Details</TableHead>
 									<TableHead>Duration</TableHead>
-
+									<TableHead>Status</TableHead>
 									<TableHead>Amount</TableHead>
 								</TableRow>
 							</TableHeader>
@@ -71,7 +76,9 @@ export async function PaymentsTable({
 												className={cn(
 													"flex flex-col items-start border rounded p-2",
 													payment?.paid
-														? "bg-green-500/10 border-dashed border-green=500"
+														? "bg-green-500/10 border-dashed border-green-500"
+														: payment?.is_expired
+															? "bg-gray-500/10 border-dashed border-gray-500 dark:border-gray-500/50"
 															: "bg-yellow-500/10 border-dashed border-yellow-500 dark:border-yellow-500/50",
 												)}
 											>
@@ -84,6 +91,9 @@ export async function PaymentsTable({
 																month: "short",
 																day: "2-digit",
 																year: "numeric",
+																minute: "2-digit",
+																hour: "2-digit",
+																timeZone: "Indian/Maldives", // Force consistent timezone
 															},
 														)}
 													</span>
@@ -98,16 +108,6 @@ export async function PaymentsTable({
 															View Details
 														</Button>
 													</Link>
-													<Badge
-														className={cn(
-															payment?.paid
-																? "text-green-500 bg-green-500/20"
-																: "text-yellow-500 bg-yellow-500/20",
-														)}
-														variant={payment.paid ? "outline" : "secondary"}
-													>
-														{payment.paid ? "Paid" : "Unpaid"}
-													</Badge>
 												</div>
 												<div className="bg-white dark:bg-black p-2 rounded mt-2 w-full border">
 													<h3 className="text-sm font-medium">Devices</h3>
@@ -124,9 +124,30 @@ export async function PaymentsTable({
 												</div>
 											</div>
 										</TableCell>
+
 										<TableCell className="font-medium">
 											{payment.number_of_months} Months
 										</TableCell>
+										<TableCell>
+											<span className="font-semibold pr-2">
+												{payment.paid ? (
+													<Badge
+														className={cn(
+															payment.status === "PENDING"
+																? "bg-yellow-100 text-yellow-700 dark:bg-yellow-700 dark:text-yellow-100"
+																: "bg-green-100 dark:bg-green-700",
+														)}
+														variant="outline"
+													>
+														{payment.status}
+													</Badge>
+												) : payment.is_expired ? (
+													<Badge>Expired</Badge>
+												) : (
+													<Badge variant="outline">{payment.status}</Badge>
+												)}
+											</span>
+										</TableCell>
 										<TableCell>
 											<span className="font-semibold pr-2">
 												{payment.amount.toFixed(2)}
@@ -138,8 +159,7 @@ export async function PaymentsTable({
 							</TableBody>
 							<TableFooter>
 								<TableRow>
-
-									<TableCell colSpan={3} className="text-muted-foreground">
+									<TableCell colSpan={4} className="text-muted-foreground">
 										{meta?.total === 1 ? (
 											<p className="text-center">
 												Total {meta?.total} payment.
@@ -148,12 +168,13 @@ export async function PaymentsTable({
 											<p className="text-center">
 												Total {meta?.total} payments.
 											</p>
-										)}									</TableCell>
+										)}{" "}
+									</TableCell>
 								</TableRow>
 							</TableFooter>
 						</Table>
 						<Pagination
-							totalPages={meta.total / meta.per_page}
+							totalPages={meta.last_page}
 							currentPage={meta.current_page}
 						/>
 					</div>
@@ -174,7 +195,9 @@ function MobilePaymentDetails({ payment }: { payment: Payment }) {
 			className={cn(
 				"flex flex-col items-start border rounded p-2 my-2",
 				payment?.paid
-					? "bg-green-500/10 border-dashed border-green=500"
+					? "bg-green-500/10 border-dashed border-green-500"
+					: payment?.is_expired
+						? "bg-gray-500/10 border-dashed border-gray-500 dark:border-gray-500/50"
 						: "bg-yellow-500/10 border-dashed border-yellow-500 dark:border-yellow-500/50",
 			)}
 		>
@@ -185,6 +208,9 @@ function MobilePaymentDetails({ payment }: { payment: Payment }) {
 						month: "short",
 						day: "2-digit",
 						year: "numeric",
+						minute: "2-digit",
+						hour: "2-digit",
+						timeZone: "Indian/Maldives", // Force consistent timezone
 					})}
 				</span>
 			</div>
@@ -198,16 +224,6 @@ function MobilePaymentDetails({ payment }: { payment: Payment }) {
 						View Details
 					</Button>
 				</Link>
-				<Badge
-					className={cn(
-						payment?.paid
-							? "text-green-500 bg-green-500/20"
-							: "text-yellow-500 bg-yellow-500/20",
-					)}
-					variant={payment.paid ? "outline" : "secondary"}
-				>
-					{payment.paid ? "Paid" : "Unpaid"}
-				</Badge>
 			</div>
 			<div className="bg-white dark:bg-black p-2 rounded mt-2 w-full border">
 				<h3 className="text-sm font-medium">Devices</h3>
@@ -226,9 +242,29 @@ function MobilePaymentDetails({ payment }: { payment: Payment }) {
 					</span>
 					<Separator className="my-2" />
 					<h3 className="text-sm font-medium">Amount</h3>
+					<div className="flex items-center justify-between">
 						<span className="text-sm text-muted-foreground">
 							{payment.amount.toFixed(2)} MVR
 						</span>
+						<span className="font-semibold pr-2">
+							{payment.paid ? (
+								<Badge
+									className={cn(
+										payment.status === "PENDING"
+											? "bg-yellow-100 text-yellow-700 dark:bg-yellow-700 dark:text-yellow-100"
+											: "bg-green-100 dark:bg-green-700",
+									)}
+									variant="outline"
+								>
+									{payment.status}
+								</Badge>
+							) : payment.is_expired ? (
+								<Badge>Expired</Badge>
+							) : (
+								<Badge variant="secondary">{payment.status}</Badge>
+							)}
+						</span>
+					</div>
 				</div>
 			</div>
 		</div>

components/topup-to-pay.tsx

@@ -1,13 +1,14 @@
 "use client";
 import {
 	BadgeDollarSign,
-	Clipboard,
-	ClipboardCheck,
-	Loader2,
+	Loader2
 } from "lucide-react";
-import { useActionState, useEffect, useState } from "react";
+import { useActionState, useEffect } from "react";
 import { toast } from "sonner";
-import { type VerifyTopupPaymentState, verifyTopupPayment } from "@/actions/payment";
+import {
+	type VerifyTopupPaymentState,
+	verifyTopupPayment,
+} from "@/actions/payment";
 import {
 	Table,
 	TableBody,
@@ -17,17 +18,25 @@ import {
 	TableRow,
 } from "@/components/ui/table";
 import type { Topup } from "@/lib/backend-types";
+import { AccountInfomation } from "./account-information";
 import { Button } from "./ui/button";
 
-
-
 const initialState: VerifyTopupPaymentState = {
 	message: "",
 	success: false,
 	fieldErrors: {},
 };
-export default function TopupToPay({ topup, disabled }: { topup?: Topup, disabled?: boolean }) {
-	const [state, formAction, isPending] = useActionState(verifyTopupPayment, initialState);
+export default function TopupToPay({
+	topup,
+	disabled,
+}: {
+	topup?: Topup;
+	disabled?: boolean;
+}) {
+	const [state, formAction, isPending] = useActionState(
+		verifyTopupPayment,
+		initialState,
+	);
 
 	// Handle toast notifications based on state changes
 	useEffect(() => {
@@ -38,7 +47,11 @@ export default function TopupToPay({ topup, disabled }: { topup?: Topup, disable
 					? `Your topup payment has been verified successfully using ${state.transaction.sourceBank} bank transfer on ${state.transaction.trxDate}.`
 					: state.message,
 			});
-		} else if (!state.success && state.message && state.message !== initialState.message) {
+		} else if (
+			!state.success &&
+			state.message &&
+			state.message !== initialState.message
+		) {
 			toast.error("Topup Payment Verification Failed", {
 				closeButton: true,
 				description: state.message,
@@ -69,16 +82,18 @@ export default function TopupToPay({ topup, disabled }: { topup?: Topup, disable
 							) : (
 								<div className="flex flex-col gap-2">
 									<form action={formAction}>
-										<input type="hidden" name="topupId" value={topup?.id ?? ""} />
+										<input
+											type="hidden"
+											name="topupId"
+											value={topup?.id ?? ""}
+										/>
 										<Button
 											disabled={disabled || isPending}
 											type="submit"
 											size={"lg"}
-											className="mb-4"
+											className="mb-4 w-full"
 										>
-											{isPending
-												? "Processing payment..."
-												: "I have paid"}
+											{isPending ? "Processing payment..." : "I have paid"}
 											{isPending ? (
 												<Loader2 className="animate-spin" />
 											) : (
@@ -86,7 +101,6 @@ export default function TopupToPay({ topup, disabled }: { topup?: Topup, disable
 											)}
 										</Button>
 									</form>
-
 								</div>
 							)}
 						</div>
@@ -141,42 +155,4 @@ export default function TopupToPay({ topup, disabled }: { topup?: Topup, disable
 	);
 }
 
-function AccountInfomation({
-	accountNo,
-	accName,
-}: {
-	accountNo: string;
-	accName: string;
-}) {
-	const [accNo, setAccNo] = useState(false);
-	return (
-		<div className="justify-start items-start border my-4 flex flex-col gap-2 p-2 rounded-md">
-			<h6 className="title-bg uppercase p-2 border rounded w-full font-semibold">
-				Account Information
-			</h6>
-			<div className="border justify-start flex flex-col items-start bg-white/10 w-full p-2 rounded">
-				<div className="text-sm font-semibold">Account Name</div>
-				<span>{accName}</span>
-			</div>
-			<div className="border flex justify-between items-start gap-2  bg-white/10 w-full p-2 rounded">
-				<div className="flex flex-col items-start justify-start">
-					<p className="text-sm font-semibold">Account No</p>
-					<span>{accountNo}</span>
-				</div>
-				<Button
-					onClick={() => {
-						setTimeout(() => {
-							setAccNo(true);
-							navigator.clipboard.writeText(accountNo);
-						}, 2000);
-						toast.success("Account number copied!");
-						setAccNo((prev) => !prev);
-					}}
-					variant={"link"}
-				>
-					{accNo ? <Clipboard /> : <ClipboardCheck color="green" />}
-				</Button>
-			</div>
-		</div>
-	);
-}
+

components/topups-table.tsx

@@ -27,7 +27,9 @@ export async function TopupsTable({
 	}>;
 }) {
 	const resolvedParams = await searchParams;
-
+	const page = Number.parseInt(resolvedParams.page as string) || 1;
+	const limit = 10;
+	const offset = (page - 1) * limit;
 	// Build params object
 	const apiParams: Record<string, string | number | undefined> = {};
 	for (const [key, value] of Object.entries(resolvedParams)) {
@@ -35,7 +37,8 @@ export async function TopupsTable({
 			apiParams[key] = typeof value === "number" ? value : String(value);
 		}
 	}
-
+	apiParams.limit = limit;
+	apiParams.offset = offset;
 	const [error, topups] = await tryCatch(getTopups(apiParams));
 
 	if (error) {
@@ -103,19 +106,6 @@ export async function TopupsTable({
 															View Details
 														</Button>
 													</Link>
-													{!topup.is_expired &&
-														topup.status !== "CANCELLED" && (
-															<Badge
-																className={cn(
-																	topup?.paid
-																		? "text-green-500 bg-green-500/20"
-																		: "text-yellow-500 bg-yellow-500/20",
-																)}
-																variant={topup.paid ? "outline" : "secondary"}
-															>
-																{topup.paid ? "Paid" : "Unpaid"}
-															</Badge>
-														)}
 												</div>
 											</div>
 										</TableCell>
@@ -164,8 +154,8 @@ export async function TopupsTable({
 						))}
 					</div>
 					<Pagination
-						totalPages={meta.total / meta.per_page}
-						currentPage={meta.current_page}
+						totalPages={meta?.last_page}
+						currentPage={meta?.current_page}
 					/>
 				</>
 			)}
@@ -203,18 +193,6 @@ function MobileTopupDetails({ topup }: { topup: Topup }) {
 						View Details
 					</Button>
 				</Link>
-				{!topup.is_expired && topup.status !== "CANCELLED" && (
-					<Badge
-						className={cn(
-							topup?.paid
-								? "text-green-500 bg-green-500/20"
-								: "text-yellow-500 bg-yellow-500/20",
-						)}
-						variant={topup.paid ? "outline" : "secondary"}
-					>
-						{topup.paid ? "Paid" : "Unpaid"}
-					</Badge>
-				)}
 			</div>
 
 			<div className="bg-white dark:bg-black p-2 rounded mt-2 w-full border flex justify-between items-center">

components/ui/floating-label.tsx

@@ -0,0 +1,47 @@
+import * as React from 'react';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { cn } from '@/lib/utils';
+
+export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> { }
+
+const FloatingInput = React.forwardRef<HTMLInputElement, InputProps>(
+  ({ className, ...props }, ref) => {
+    return <Input placeholder=" " className={cn('peer', className)} ref={ref} {...props} />;
+  },
+);
+FloatingInput.displayName = 'FloatingInput';
+
+const FloatingLabel = React.forwardRef<
+  React.ElementRef<typeof Label>,
+  React.ComponentPropsWithoutRef<typeof Label>
+>(({ className, ...props }, ref) => {
+  return (
+    <Label
+      className={cn(
+        'peer-focus:secondary peer-focus:dark:secondary absolute start-2 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-background px-2 text-sm text-gray-500 duration-300 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 dark:bg-background rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4 cursor-text',
+        className,
+      )}
+      ref={ref}
+      {...props}
+    />
+  );
+});
+FloatingLabel.displayName = 'FloatingLabel';
+
+type FloatingLabelInputProps = InputProps & { label?: string };
+
+const FloatingLabelInput = React.forwardRef<
+  React.ElementRef<typeof FloatingInput>,
+  React.PropsWithoutRef<FloatingLabelInputProps>
+>(({ id, label, ...props }, ref) => {
+  return (
+    <div className="relative">
+      <FloatingInput ref={ref} id={id} {...props} />
+      <FloatingLabel htmlFor={id}>{label}</FloatingLabel>
+    </div>
+  );
+});
+FloatingLabelInput.displayName = 'FloatingLabelInput';
+
+export { FloatingInput, FloatingLabel, FloatingLabelInput };

lib/backend-types.ts

@@ -81,9 +81,12 @@ export interface Payment {
 	paid: boolean;
 	paid_at: string | null;
 	method: string;
-	expires_at: string | null;
+	expires_at: string;
+	is_expired: boolean;
 	created_at: string;
 	updated_at: string;
+	status: "CANCELLED" | "PENDING" | "PAID";
+	mib_reference: string | null;
 	user: number;
 }
 

lib/person.ts

@@ -1,6 +1,5 @@
 "use server";
 import type { TNationalPerson } from "@/lib/types";
-import type { User } from "./types/user";
 
 export async function getNationalPerson({
 	idCard,
@@ -17,28 +16,4 @@ export async function getNationalPerson({
 	return nationalData;
 }
 
-export async function VerifyUserDetails({ user }: { user: User }) {
-	console.log(user);
-	// const phoneNumber = String(user.phoneNumber).slice(4);
-	// console.log({ phoneNumber });
-	// const nationalData = await getNationalPerson({ idCard: user.id_card ?? "" });
-	// const dob = new Date(nationalData.dob);
-	// const age = new Date().getFullYear() - dob.getFullYear();
 
-	// console.log("ID card", user.id_card === nationalData.nic);
-	// console.log("name", user.name === nationalData.name_en);
-	// console.log("house", user.address === nationalData.house_name_en);
-	// console.log("phone", phoneNumber === nationalData.primary_contact);
-	// console.log("db phone", phoneNumber);
-	// console.log("national phone", nationalData.primary_contact);
-
-	// if (
-	// 	user.id_card === nationalData.nic &&
-	// 	user.name === nationalData.name_en &&
-	// 	user.address === nationalData.house_name_en &&
-	// 	age >= 18
-	// ) {
-	// 	return true;
-	// }
-	return false;
-}

lib/types/user.ts

@@ -1,4 +1,5 @@
 import type { ISODateString } from "next-auth";
+import type { Atoll, Island } from "../backend-types";
 
 export interface Permission {
 	id: number;
@@ -30,6 +31,22 @@ export interface User {
 	last_login: string;
 }
 
+export interface UserProfile {
+	id: number;
+	email: string;
+	first_name: string;
+	last_name: string;
+	atoll: Atoll;
+	island: Island;
+	dob: string;
+	verified: boolean;
+	username: string;
+	mobile: string;
+	address: string;
+	acc_no: string;
+	id_card: string;
+}
+
 export interface Session {
 	user?: {
 		token?: string;