temporary fix for build and remove previous auth related code

This commit is contained in:
i701 2025-04-10 22:39:38 +05:00
parent 7e49bf119a
commit e8296ae3f6
Signed by: i701
GPG Key ID: 54A0DA1E26D8E587
10 changed files with 854 additions and 800 deletions

3
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}

View File

@ -1,5 +1,4 @@
import { UsersPaymentsTable } from "@/components/admin/user-payments-table";
import { AdminAuthGuard } from "@/lib/auth-guard";
import React, { Suspense } from "react";
export default async function UserPayments({
@ -12,15 +11,12 @@ export default async function UserPayments({
status: string;
}>;
}) {
await AdminAuthGuard();
const query = (await searchParams)?.query || "";
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">
<h3 className="text-sarLinkOrange text-2xl">
User Payments
</h3>
<h3 className="text-sarLinkOrange text-2xl">User Payments</h3>
</div>
<Suspense key={query} fallback={"loading...."}>
<UsersPaymentsTable searchParams={searchParams} />

View File

@ -1,11 +1,10 @@
import InputReadOnly from '@/components/input-read-only';
import { Badge } from '@/components/ui/badge';
import UserRejectDialog from '@/components/user/user-reject-dialog';
import { UserVerifyDialog } from '@/components/user/user-verify-dialog';
import { getNationalPerson } from '@/lib/person';
import InputReadOnly from "@/components/input-read-only";
import { Badge } from "@/components/ui/badge";
import UserRejectDialog from "@/components/user/user-reject-dialog";
import { UserVerifyDialog } from "@/components/user/user-verify-dialog";
import { getNationalPerson } from "@/lib/person";
import prisma from '@/lib/db';
import Image from 'next/image';
import Image from "next/image";
export default async function VerifyUserPage({
params,
@ -14,82 +13,164 @@ export default async function VerifyUserPage({
userId: string;
}>;
}) {
const userId = (await params).userId
const dbUser = await prisma.user.findUnique({
where: {
id: userId,
},
include: {
island: {
include: {
atoll: true
}
}
}
})
const nationalData = await getNationalPerson({ idCard: dbUser?.id_card ?? "" })
return (
<div>
<div className='flex items-center justify-between text-gray-500 text-2xl font-bold title-bg py-4 px-2 mb-4'>
<h3 className="text-sarLinkOrange text-2xl">
Verify user
</h3>
<div className='flex gap-2'>
{dbUser && !dbUser?.verified && <UserVerifyDialog user={dbUser} />}
{dbUser && !dbUser?.verified && <UserRejectDialog user={dbUser} />}
{dbUser?.verified && <Badge variant={"secondary"} className='bg-lime-500'>Verified</Badge>}
</div>
</div>
<div className='grid grid-cols-1 md:grid-cols-2 gap-4 items-start justify-start'>
<div id="database-information">
<h4 className='p-2 rounded font-semibold'>Database Information</h4>
<div className='shadow p-2 rounded-lg title-bg space-y-1 my-2 grid grid-cols-1 md:grid-cols-2 gap-2'>
<InputReadOnly showCheck checkTrue={dbUser?.id_card === nationalData.nic} labelClassName='text-sarLinkOrange' label="ID Card" value={dbUser?.id_card ?? ""} />
<InputReadOnly showCheck checkTrue={dbUser?.name === nationalData.name_en} labelClassName='text-sarLinkOrange' label="Name" value={dbUser?.name ?? ""} />
<InputReadOnly showCheck checkTrue={dbUser?.address === nationalData.house_name_en} labelClassName='text-sarLinkOrange' label="House Name" value={dbUser?.address ?? ""} />
<InputReadOnly showCheck checkTrue={dbUser?.island?.name === nationalData.island_name_en} labelClassName='text-sarLinkOrange' label="Island" value={dbUser?.island?.name ?? ""} />
<InputReadOnly showCheck checkTrue={dbUser?.island?.atoll.name === nationalData.atoll_en} labelClassName='text-sarLinkOrange' label="Atoll" value={dbUser?.island?.atoll.name ?? ""} />
<InputReadOnly showCheck checkTrue={new Date(dbUser?.dob ?? "") === new Date(nationalData.dob)} labelClassName='text-sarLinkOrange' label="DOB" value={new Date(dbUser?.dob ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})} />
<InputReadOnly showCheck checkTrue={dbUser?.phoneNumber === nationalData.primary_contact} labelClassName='text-sarLinkOrange' label="Phone Number" value={dbUser?.phoneNumber ?? ""} />
</div>
</div>
<div id="national-information">
<h4 className='p-2 rounded font-semibold'>National Information</h4>
<div className='shadow p-2 rounded-md title-bg space-y-1 my-2 grid grid-cols-1 md:grid-cols-2 gap-2'>
<InputReadOnly showCheck={false} labelClassName='text-green-500' label="ID Card" value={nationalData?.nic ?? ""} />
<InputReadOnly showCheck={false} labelClassName='text-green-500' label="Name" value={nationalData?.name_en ?? ""} />
<InputReadOnly showCheck={false} labelClassName='text-green-500' label="House Name" value={nationalData?.house_name_en ?? ""} />
<InputReadOnly showCheck={false} labelClassName='text-green-500' label="Island" value={nationalData?.island_name_en ?? ""} />
<InputReadOnly showCheck={false} labelClassName='text-green-500' label="Atoll" value={nationalData?.atoll_en ?? ""} />
<InputReadOnly showCheck={false} labelClassName='text-green-500' label="DOB" value={new Date(nationalData?.dob ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})} />
<InputReadOnly showCheck={false} labelClassName='text-green-500' label="Phone Number" value={nationalData?.primary_contact ?? ""} />
<div className='flex flex-col col-span-2 items-center justify-center'>
<Image
src={nationalData.image_url || "https://i.pravatar.cc/300"}
height={100}
width={100}
className='object-fit aspect-square rounded-full'
alt='id photo'
/>
</div>
</div>
</div>
</div>
</div>
)
const userId = (await params).userId;
// const dbUser = await prisma.user.findUnique({
// where: {
// id: userId,
// },
// include: {
// island: {
// include: {
// atoll: true
// }
// }
// }
// })
// const nationalData = await getNationalPerson({ idCard: dbUser?.id_card ?? "" })
return null;
// return (
// <div>
// <div className="flex items-center justify-between text-gray-500 text-2xl font-bold title-bg py-4 px-2 mb-4">
// <h3 className="text-sarLinkOrange text-2xl">Verify user</h3>
// <div className="flex gap-2">
// {dbUser && !dbUser?.verified && <UserVerifyDialog user={dbUser} />}
// {dbUser && !dbUser?.verified && <UserRejectDialog user={dbUser} />}
// {dbUser?.verified && (
// <Badge variant={"secondary"} className="bg-lime-500">
// Verified
// </Badge>
// )}
// </div>
// </div>
// <div className="grid grid-cols-1 md:grid-cols-2 gap-4 items-start justify-start">
// <div id="database-information">
// <h4 className="p-2 rounded font-semibold">Database Information</h4>
// <div className="shadow p-2 rounded-lg title-bg space-y-1 my-2 grid grid-cols-1 md:grid-cols-2 gap-2">
// <InputReadOnly
// showCheck
// checkTrue={dbUser?.id_card === nationalData.nic}
// labelClassName="text-sarLinkOrange"
// label="ID Card"
// value={dbUser?.id_card ?? ""}
// />
// <InputReadOnly
// showCheck
// checkTrue={dbUser?.name === nationalData.name_en}
// labelClassName="text-sarLinkOrange"
// label="Name"
// value={dbUser?.name ?? ""}
// />
// <InputReadOnly
// showCheck
// checkTrue={dbUser?.address === nationalData.house_name_en}
// labelClassName="text-sarLinkOrange"
// label="House Name"
// value={dbUser?.address ?? ""}
// />
// <InputReadOnly
// showCheck
// checkTrue={dbUser?.island?.name === nationalData.island_name_en}
// labelClassName="text-sarLinkOrange"
// label="Island"
// value={dbUser?.island?.name ?? ""}
// />
// <InputReadOnly
// showCheck
// checkTrue={dbUser?.island?.atoll.name === nationalData.atoll_en}
// labelClassName="text-sarLinkOrange"
// label="Atoll"
// value={dbUser?.island?.atoll.name ?? ""}
// />
// <InputReadOnly
// showCheck
// checkTrue={
// new Date(dbUser?.dob ?? "") === new Date(nationalData.dob)
// }
// labelClassName="text-sarLinkOrange"
// label="DOB"
// value={new Date(dbUser?.dob ?? "").toLocaleDateString("en-US", {
// month: "short",
// day: "2-digit",
// year: "numeric",
// })}
// />
// <InputReadOnly
// showCheck
// checkTrue={dbUser?.phoneNumber === nationalData.primary_contact}
// labelClassName="text-sarLinkOrange"
// label="Phone Number"
// value={dbUser?.phoneNumber ?? ""}
// />
// </div>
// </div>
// <div id="national-information">
// <h4 className="p-2 rounded font-semibold">National Information</h4>
// <div className="shadow p-2 rounded-md title-bg space-y-1 my-2 grid grid-cols-1 md:grid-cols-2 gap-2">
// <InputReadOnly
// showCheck={false}
// labelClassName="text-green-500"
// label="ID Card"
// value={nationalData?.nic ?? ""}
// />
// <InputReadOnly
// showCheck={false}
// labelClassName="text-green-500"
// label="Name"
// value={nationalData?.name_en ?? ""}
// />
// <InputReadOnly
// showCheck={false}
// labelClassName="text-green-500"
// label="House Name"
// value={nationalData?.house_name_en ?? ""}
// />
// <InputReadOnly
// showCheck={false}
// labelClassName="text-green-500"
// label="Island"
// value={nationalData?.island_name_en ?? ""}
// />
// <InputReadOnly
// showCheck={false}
// labelClassName="text-green-500"
// label="Atoll"
// value={nationalData?.atoll_en ?? ""}
// />
// <InputReadOnly
// showCheck={false}
// labelClassName="text-green-500"
// label="DOB"
// value={new Date(nationalData?.dob ?? "").toLocaleDateString(
// "en-US",
// {
// month: "short",
// day: "2-digit",
// year: "numeric",
// },
// )}
// />
// <InputReadOnly
// showCheck={false}
// labelClassName="text-green-500"
// label="Phone Number"
// value={nationalData?.primary_contact ?? ""}
// />
// <div className="flex flex-col col-span-2 items-center justify-center">
// <Image
// src={nationalData.image_url || "https://i.pravatar.cc/300"}
// height={100}
// width={100}
// className="object-fit aspect-square rounded-full"
// alt="id photo"
// />
// </div>
// </div>
// </div>
// </div>
// </div>
// );
}

View File

@ -2,7 +2,6 @@ import { Rejectuser } from "@/actions/user-actions";
import Filter from "@/components/filter";
import Search from "@/components/search";
import { UsersTable } from "@/components/user-table";
import { AdminAuthGuard } from "@/lib/auth-guard";
import {
AArrowDown,
AArrowUp,
@ -36,15 +35,10 @@ export default async function AdminUsers({
status: string;
}>;
}) {
await AdminAuthGuard();
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">
<h3 className="text-sarLinkOrange text-2xl">
Users
</h3>
<h3 className="text-sarLinkOrange text-2xl">Users</h3>
</div>
<div

View File

@ -1,151 +1,151 @@
import { blockDevice } from "@/actions/omada-actions";
import prisma from "@/lib/db";
import { validateApiKey } from "@/lib/utils";
import { addDays, addMonths, isAfter, isWithinInterval } from "date-fns";
const lastRunTime = new Date();
export async function GET(request: Request) {
try {
// Validate API key before proceeding
validateApiKey(request);
return Response.json({ message: "Request received" });
// try {
// // Validate API key before proceeding
// validateApiKey(request);
const currentTime = new Date();
const hoursSinceLastRun =
(currentTime.getTime() - lastRunTime.getTime()) / (1000 * 60 * 60);
// const currentTime = new Date();
// const hoursSinceLastRun =
// (currentTime.getTime() - lastRunTime.getTime()) / (1000 * 60 * 60);
// Get all active and unblocked devices with their latest payment
const devices = await prisma.device.findMany({
where: {
isActive: true,
blocked: false,
},
include: {
payments: true,
User: {
include: {
devices: true,
},
},
},
});
let devicesNeedingNotification = 0;
let devicesBlocked = 0;
// // Get all active and unblocked devices with their latest payment
// const devices = await prisma.device.findMany({
// where: {
// isActive: true,
// blocked: false,
// },
// include: {
// payments: true,
// User: {
// include: {
// devices: true,
// },
// },
// },
// });
// let devicesNeedingNotification = 0;
// let devicesBlocked = 0;
for (const device of devices) {
let expiryDate = new Date();
// for (const device of devices) {
// let expiryDate = new Date();
const payment = device.payments[0];
expiryDate = addMonths(
payment?.paidAt || new Date(),
payment?.numberOfMonths || 0,
);
// const payment = device.payments[0];
// expiryDate = addMonths(
// payment?.paidAt || new Date(),
// payment?.numberOfMonths || 0,
// );
// Calculate notification threshold (5 days before expiry)
const notificationThreshold = addDays(expiryDate, -5);
// // Calculate notification threshold (5 days before expiry)
// const notificationThreshold = addDays(expiryDate, -5);
const currentDate = new Date();
// const currentDate = new Date();
console.log("device name -> ", device.name);
console.log("paid date -> ", device.payments[0]?.paidAt);
console.log("no of months paid -> ", device.payments[0]?.numberOfMonths);
console.log("calculated expire date -> ", expiryDate);
console.log("notification threshold -> ", notificationThreshold);
console.log("current date -> ", currentDate);
// console.log("device name -> ", device.name);
// console.log("paid date -> ", device.payments[0]?.paidAt);
// console.log("no of months paid -> ", device.payments[0]?.numberOfMonths);
// console.log("calculated expire date -> ", expiryDate);
// console.log("notification threshold -> ", notificationThreshold);
// console.log("current date -> ", currentDate);
// Check if device is within notification period
if (
isWithinInterval(currentDate, {
start: notificationThreshold,
end: expiryDate,
})
) {
// Device is within 5 days of expiring
if (device.User?.phoneNumber) {
await sendNotifySms(
new Date(expiryDate),
device.User?.phoneNumber ?? "",
device.name,
);
devicesNeedingNotification++;
}
}
// Check if device has expired
if (isAfter(currentDate, expiryDate)) {
// Device has expired, block it
// TODO: add a reason for blocking
await blockDevice({
macAddress: device.mac,
type: "block",
});
await prisma.device.update({
where: { id: device.id },
data: {
isActive: false,
blocked: true,
},
});
devicesBlocked++;
}
}
if (hoursSinceLastRun < 24) {
return Response.json({
totalActiveDevices: devices.length,
devicesChecked: {
notified: devicesNeedingNotification,
blocked: devicesBlocked,
},
message: "Check was run recently",
nextCheckIn: `${Math.round(24 - hoursSinceLastRun)} hours`,
});
}
return Response.json({
success: true,
totalActiveDevices: devices.length,
devicesChecked: {
notified: devicesNeedingNotification,
blocked: devicesBlocked,
},
runAt: currentTime,
});
} catch (error) {
if (error instanceof Error) {
if (error.message === "API key is missing") {
return Response.json({ error: "API key is required" }, { status: 401 });
}
if (error.message === "Invalid API key") {
return Response.json({ error: "Invalid API key" }, { status: 403 });
}
}
console.error("Error in device check:", error);
return Response.json({ error: "Failed to check devices" }, { status: 500 });
}
}
// Mock function - replace with your actual SMS implementation
async function sendNotifySms(
expireDate: Date,
phoneNumber: string,
deviceName?: string,
) {
const respose = await fetch(`${process.env.SMS_API_BASE_URL}/api/sms`, {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${process.env.SMS_API_KEY}`,
},
body: JSON.stringify({
check_delivery: false,
number: phoneNumber,
message: `REMINDER! Your device [${deviceName}] will expire on ${new Date(expireDate)}.`,
}),
});
const data = await respose.json();
console.log(data);
return data;
// Implement your SMS logic here
// // Check if device is within notification period
// if (
// isWithinInterval(currentDate, {
// start: notificationThreshold,
// end: expiryDate,
// })
// ) {
// // Device is within 5 days of expiring
// if (device.User?.phoneNumber) {
// await sendNotifySms(
// new Date(expiryDate),
// device.User?.phoneNumber ?? "",
// device.name,
// );
// devicesNeedingNotification++;
// }
// }
// // Check if device has expired
// if (isAfter(currentDate, expiryDate)) {
// // Device has expired, block it
// // TODO: add a reason for blocking
// await blockDevice({
// macAddress: device.mac,
// type: "block",
// });
// await prisma.device.update({
// where: { id: device.id },
// data: {
// isActive: false,
// blocked: true,
// },
// });
// devicesBlocked++;
// }
// }
// if (hoursSinceLastRun < 24) {
// return Response.json({
// totalActiveDevices: devices.length,
// devicesChecked: {
// notified: devicesNeedingNotification,
// blocked: devicesBlocked,
// },
// message: "Check was run recently",
// nextCheckIn: `${Math.round(24 - hoursSinceLastRun)} hours`,
// });
// }
// return Response.json({
// success: true,
// totalActiveDevices: devices.length,
// devicesChecked: {
// notified: devicesNeedingNotification,
// blocked: devicesBlocked,
// },
// runAt: currentTime,
// });
// } catch (error) {
// if (error instanceof Error) {
// if (error.message === "API key is missing") {
// return Response.json({ error: "API key is required" }, { status: 401 });
// }
// if (error.message === "Invalid API key") {
// return Response.json({ error: "Invalid API key" }, { status: 403 });
// }
// }
// console.error("Error in device check:", error);
// return Response.json({ error: "Failed to check devices" }, { status: 500 });
// }
// }
// // Mock function - replace with your actual SMS implementation
// async function sendNotifySms(
// expireDate: Date,
// phoneNumber: string,
// deviceName?: string,
// ) {
// const respose = await fetch(`${process.env.SMS_API_BASE_URL}/api/sms`, {
// method: "POST",
// headers: {
// "Content-Type": "application/json",
// Authorization: `Bearer ${process.env.SMS_API_KEY}`,
// },
// body: JSON.stringify({
// check_delivery: false,
// number: phoneNumber,
// message: `REMINDER! Your device [${deviceName}] will expire on ${new Date(expireDate)}.`,
// }),
// });
// const data = await respose.json();
// console.log(data);
// return data;
//
}

View File

@ -8,8 +8,6 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
import { auth } from "@/app/auth";
import prisma from "@/lib/db";
import { headers } from "next/headers";
import Link from "next/link";
import BlockDeviceDialog from "../block-device-dialog";
@ -27,178 +25,178 @@ export async function AdminDevicesTable({
}>;
parentalControl?: boolean;
}) {
const session = await auth.api.getSession({
headers: await headers(),
});
const isAdmin = session?.user.role === "ADMIN";
const query = (await searchParams)?.query || "";
const page = (await searchParams)?.page;
const sortBy = (await searchParams)?.sortBy || "asc";
const totalDevices = await prisma.device.count({
where: {
OR: [
{
name: {
contains: query || "",
mode: "insensitive",
},
},
{
mac: {
contains: query || "",
mode: "insensitive",
},
},
],
},
});
// const session = await auth.api.getSession({
// headers: await headers(),
// });
// const isAdmin = session?.user.role === "ADMIN";
// const query = (await searchParams)?.query || "";
// const page = (await searchParams)?.page;
// const sortBy = (await searchParams)?.sortBy || "asc";
// const totalDevices = await prisma.device.count({
// where: {
// OR: [
// {
// name: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// mac: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// ],
// },
// });
const totalPages = Math.ceil(totalDevices / 10);
const limit = 10;
const offset = (Number(page) - 1) * limit || 0;
// const totalPages = Math.ceil(totalDevices / 10);
// const limit = 10;
// const offset = (Number(page) - 1) * limit || 0;
const devices = await prisma.device.findMany({
where: {
OR: [
{
name: {
contains: query || "",
mode: "insensitive",
},
},
{
mac: {
contains: query || "",
mode: "insensitive",
},
},
],
},
include: {
User: true,
payments: true,
},
skip: offset,
take: limit,
orderBy: {
name: `${sortBy}` as "asc" | "desc",
},
});
// const devices = await prisma.device.findMany({
// where: {
// OR: [
// {
// name: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// mac: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// ],
// },
// include: {
// User: true,
// payments: true,
// },
// skip: offset,
// take: limit,
// orderBy: {
// name: `${sortBy}` as "asc" | "desc",
// },
// });
return null;
// return (
// <div>
// {devices.length === 0 ? (
// <div className="h-[calc(100svh-400px)] flex flex-col items-center justify-center my-4">
// <h3>No devices yet.</h3>
// </div>
// ) : (
// <>
// <div className="hidden sm:block">
// <Table className="overflow-scroll">
// <TableCaption>Table of all devices.</TableCaption>
// <TableHeader>
// <TableRow>
// <TableHead>Device Name</TableHead>
// <TableHead>User</TableHead>
// <TableHead>MAC Address</TableHead>
// <TableHead>isActive</TableHead>
// <TableHead>blocked</TableHead>
// <TableHead>blockedBy</TableHead>
// <TableHead>expiryDate</TableHead>
// </TableRow>
// </TableHeader>
// <TableBody className="overflow-scroll">
// {devices.map((device) => (
// <TableRow key={device.id}>
// <TableCell>
// <div className="flex flex-col items-start">
// <Link
// className="font-medium hover:underline"
// href={`/devices/${device.id}`}
// >
// {device.name}
// </Link>
// {device.isActive && (
// <span className="text-muted-foreground">
// Active until{" "}
// {new Date().toLocaleDateString("en-US", {
// month: "short",
// day: "2-digit",
// year: "numeric",
// })}
// </span>
// )}
return (
<div>
{devices.length === 0 ? (
<div className="h-[calc(100svh-400px)] flex flex-col items-center justify-center my-4">
<h3>No devices yet.</h3>
</div>
) : (
<>
<div className="hidden sm:block">
<Table className="overflow-scroll">
<TableCaption>Table of all devices.</TableCaption>
<TableHeader>
<TableRow>
<TableHead>Device Name</TableHead>
<TableHead>User</TableHead>
<TableHead>MAC Address</TableHead>
<TableHead>isActive</TableHead>
<TableHead>blocked</TableHead>
<TableHead>blockedBy</TableHead>
<TableHead>expiryDate</TableHead>
</TableRow>
</TableHeader>
<TableBody className="overflow-scroll">
{devices.map((device) => (
<TableRow key={device.id}>
<TableCell>
<div className="flex flex-col items-start">
<Link
className="font-medium hover:underline"
href={`/devices/${device.id}`}
>
{device.name}
</Link>
{device.isActive && (
<span className="text-muted-foreground">
Active until{" "}
{new Date().toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}
</span>
)}
// {device.blocked && (
// <div className="p-2 rounded border my-2">
// <span>Comment: </span>
// <p className="text-neutral-500">
// blocked because he was watching youtube
// </p>
// </div>
// )}
// </div>
// </TableCell>
// <TableCell className="font-medium">
// {device.User?.name}
// </TableCell>
{device.blocked && (
<div className="p-2 rounded border my-2">
<span>Comment: </span>
<p className="text-neutral-500">
blocked because he was watching youtube
</p>
</div>
)}
</div>
</TableCell>
<TableCell className="font-medium">
{device.User?.name}
</TableCell>
<TableCell className="font-medium">{device.mac}</TableCell>
<TableCell>
{device.isActive ? "Active" : "Inactive"}
</TableCell>
<TableCell>
{device.blocked ? "Blocked" : "Not Blocked"}
</TableCell>
<TableCell>
{device.blocked ? device.blockedBy : ""}
</TableCell>
<TableCell>
{new Date().toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}
</TableCell>
<TableCell>
<BlockDeviceDialog
admin={isAdmin}
type={device.blocked ? "unblock" : "block"}
device={device}
/>
</TableCell>
</TableRow>
))}
</TableBody>
<TableFooter>
<TableRow>
<TableCell colSpan={7}>
{query.length > 0 && (
<p className="text-sm text-muted-foreground">
Showing {devices.length} locations for &quot;{query}
&quot;
</p>
)}
</TableCell>
<TableCell className="text-muted-foreground">
{totalDevices} devices
</TableCell>
</TableRow>
</TableFooter>
</Table>
<Pagination totalPages={totalPages} currentPage={page} />
</div>
<div className="sm:hidden my-4">
{devices.map((device) => (
<DeviceCard
parentalControl={parentalControl}
key={device.id}
device={device}
/>
))}
</div>
</>
)}
</div>
);
// <TableCell className="font-medium">{device.mac}</TableCell>
// <TableCell>
// {device.isActive ? "Active" : "Inactive"}
// </TableCell>
// <TableCell>
// {device.blocked ? "Blocked" : "Not Blocked"}
// </TableCell>
// <TableCell>
// {device.blocked ? device.blockedBy : ""}
// </TableCell>
// <TableCell>
// {new Date().toLocaleDateString("en-US", {
// month: "short",
// day: "2-digit",
// year: "numeric",
// })}
// </TableCell>
// <TableCell>
// <BlockDeviceDialog
// admin={isAdmin}
// type={device.blocked ? "unblock" : "block"}
// device={device}
// />
// </TableCell>
// </TableRow>
// ))}
// </TableBody>
// <TableFooter>
// <TableRow>
// <TableCell colSpan={7}>
// {query.length > 0 && (
// <p className="text-sm text-muted-foreground">
// Showing {devices.length} locations for &quot;{query}
// &quot;
// </p>
// )}
// </TableCell>
// <TableCell className="text-muted-foreground">
// {totalDevices} devices
// </TableCell>
// </TableRow>
// </TableFooter>
// </Table>
// <Pagination totalPages={totalPages} currentPage={page} />
// </div>
// <div className="sm:hidden my-4">
// {devices.map((device) => (
// <DeviceCard
// parentalControl={parentalControl}
// key={device.id}
// device={device}
// />
// ))}
// </div>
// </>
// )}
// </div>
// );
}

View File

@ -11,7 +11,6 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
import prisma from "@/lib/db";
import Link from "next/link";
export async function UsersPaymentsTable({
@ -27,96 +26,96 @@ export async function UsersPaymentsTable({
const query = (await searchParams)?.query || "";
const page = (await searchParams)?.page;
const sortBy = (await searchParams)?.sortBy || "asc";
const totalPayments = await prisma.payment.count({
where: {
OR: [
{
user: {
name: {
contains: query || "",
mode: "insensitive",
}
},
},
{
user: {
phoneNumber: {
contains: query || "",
mode: "insensitive",
}
},
},
{
user: {
address: {
contains: query || "",
mode: "insensitive",
}
},
},
{
user: {
id_card: {
contains: query || "",
mode: "insensitive",
}
},
},
],
},
});
// const totalPayments = await prisma.payment.count({
// where: {
// OR: [
// {
// user: {
// name: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// {
// user: {
// phoneNumber: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// {
// user: {
// address: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// {
// user: {
// id_card: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// ],
// },
// });
const totalPages = Math.ceil(totalPayments / 10);
const limit = 10;
const offset = (Number(page) - 1) * limit || 0;
// const totalPages = Math.ceil(totalPayments / 10);
// const limit = 10;
// const offset = (Number(page) - 1) * limit || 0;
const payments = await prisma.payment.findMany({
where: {
OR: [
{
user: {
name: {
contains: query || "",
mode: "insensitive",
}
},
},
{
user: {
phoneNumber: {
contains: query || "",
mode: "insensitive",
}
},
},
{
user: {
address: {
contains: query || "",
mode: "insensitive",
}
},
},
{
user: {
id_card: {
contains: query || "",
mode: "insensitive",
}
},
},
],
},
include: {
user: true,
devices: true,
},
skip: offset,
take: limit,
orderBy: {
id: `${sortBy}` as "asc" | "desc",
},
});
// const payments = await prisma.payment.findMany({
// where: {
// OR: [
// {
// user: {
// name: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// {
// user: {
// phoneNumber: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// {
// user: {
// address: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// {
// user: {
// id_card: {
// contains: query || "",
// mode: "insensitive",
// }
// },
// },
// ],
// },
// include: {
// user: true,
// devices: true,
// },
// skip: offset,
// take: limit,
// orderBy: {
// id: `${sortBy}` as "asc" | "desc",
// },
// });
// const users = await prisma.user.findMany({
// where: {
@ -127,103 +126,110 @@ export async function UsersPaymentsTable({
// island: true,
// },
// });
return (
<div>
{payments.length === 0 ? (
<div className="h-[calc(100svh-400px)] flex flex-col items-center justify-center my-4">
<h3>No user payments yet.</h3>
</div>
) : (
<>
<Table className="overflow-scroll">
<TableCaption>Table of all users.</TableCaption>
<TableHeader>
<TableRow>
<TableHead>Devices paid</TableHead>
<TableHead>User</TableHead>
<TableHead>Amount</TableHead>
<TableHead>Duration</TableHead>
<TableHead>Payment Status</TableHead>
<TableHead>Payment Method</TableHead>
<TableHead>Paid At</TableHead>
<TableHead>Action</TableHead>
</TableRow>
</TableHeader>
<TableBody className="overflow-scroll">
{payments.map((payment) => (
<TableRow
className={`${payment.paid && "title-bg dark:bg-black"}`}
key={payment.id}
>
<TableCell className="font-medium">
<ol className="list-disc list-inside text-sm">
{payment.devices.map((device) => (
<li key={device.id} className="text-sm text-muted-foreground">
{device.name}
</li>
))}
</ol>
</TableCell>
<TableCell className="font-medium">{payment.user.id_card}</TableCell>
<TableCell>{payment.user?.name}</TableCell>
<TableCell>{payment.user?.name}</TableCell>
<TableCell>{payment.id}</TableCell>
return null;
// return (
// <div>
// {payments.length === 0 ? (
// <div className="h-[calc(100svh-400px)] flex flex-col items-center justify-center my-4">
// <h3>No user payments yet.</h3>
// </div>
// ) : (
// <>
// <Table className="overflow-scroll">
// <TableCaption>Table of all users.</TableCaption>
// <TableHeader>
// <TableRow>
// <TableHead>Devices paid</TableHead>
// <TableHead>User</TableHead>
// <TableHead>Amount</TableHead>
// <TableHead>Duration</TableHead>
// <TableHead>Payment Status</TableHead>
// <TableHead>Payment Method</TableHead>
// <TableHead>Paid At</TableHead>
// <TableHead>Action</TableHead>
// </TableRow>
// </TableHeader>
// <TableBody className="overflow-scroll">
// {payments.map((payment) => (
// <TableRow
// className={`${payment.paid && "title-bg dark:bg-black"}`}
// key={payment.id}
// >
// <TableCell className="font-medium">
// <ol className="list-disc list-inside text-sm">
// {payment.devices.map((device) => (
// <li
// key={device.id}
// className="text-sm text-muted-foreground"
// >
// {device.name}
// </li>
// ))}
// </ol>
// </TableCell>
// <TableCell className="font-medium">
// {payment.user.id_card}
// </TableCell>
// <TableCell>{payment.user?.name}</TableCell>
// <TableCell>{payment.user?.name}</TableCell>
// <TableCell>{payment.id}</TableCell>
<TableCell>
{payment.paid ? (
<Badge
variant="outline"
className="bg-lime-100 text-black"
>
Verified
</Badge>
) : (
<Badge
variant="outline"
className="bg-yellow-100 text-black"
>
Unverified
</Badge>
)}
</TableCell>
<TableCell>
{new Date(payment.paidAt ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}
</TableCell>
// <TableCell>
// {payment.paid ? (
// <Badge
// variant="outline"
// className="bg-lime-100 text-black"
// >
// Verified
// </Badge>
// ) : (
// <Badge
// variant="outline"
// className="bg-yellow-100 text-black"
// >
// Unverified
// </Badge>
// )}
// </TableCell>
// <TableCell>
// {new Date(payment.paidAt ?? "").toLocaleDateString(
// "en-US",
// {
// month: "short",
// day: "2-digit",
// year: "numeric",
// },
// )}
// </TableCell>
<TableCell>{payment.id}</TableCell>
<TableCell>
<Link href={`/payments/${payment.id}/verify`}>
<Button>
Details
</Button>
</Link>
</TableCell>
</TableRow>
))}
</TableBody>
<TableFooter>
<TableRow>
<TableCell colSpan={8}>
{query.length > 0 && (
<p className="text-sm text-muted-foreground">
Showing {payments.length} locations for &quot;{query}
&quot;
</p>
)}
</TableCell>
<TableCell className="text-muted-foreground">
{totalPayments} payments
</TableCell>
</TableRow>
</TableFooter>
</Table>
<Pagination totalPages={totalPages} currentPage={page} />
</>
)}
</div>
);
// <TableCell>{payment.id}</TableCell>
// <TableCell>
// <Link href={`/payments/${payment.id}/verify`}>
// <Button>Details</Button>
// </Link>
// </TableCell>
// </TableRow>
// ))}
// </TableBody>
// <TableFooter>
// <TableRow>
// <TableCell colSpan={8}>
// {query.length > 0 && (
// <p className="text-sm text-muted-foreground">
// Showing {payments.length} locations for &quot;{query}
// &quot;
// </p>
// )}
// </TableCell>
// <TableCell className="text-muted-foreground">
// {totalPayments} payments
// </TableCell>
// </TableRow>
// </TableFooter>
// </Table>
// <Pagination totalPages={totalPages} currentPage={page} />
// </>
// )}
// </div>
// );
}

View File

@ -8,7 +8,6 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
import prisma from "@/lib/db";
import Link from "next/link";
import Pagination from "./pagination";
import { Badge } from "./ui/badge";
@ -28,84 +27,84 @@ export async function UsersTable({
const page = (await searchParams)?.page;
const sortBy = (await searchParams)?.sortBy || "asc";
const verified = (await searchParams)?.status || "all";
const totalUsers = await prisma.user.count({
where: {
OR: [
{
name: {
contains: query || "",
mode: "insensitive",
},
},
{
phoneNumber: {
contains: query || "",
mode: "insensitive",
},
},
{
address: {
contains: query || "",
mode: "insensitive",
},
},
{
id_card: {
contains: query || "",
mode: "insensitive",
},
},
],
verified: verified === "all" ? undefined : verified === "verified",
},
// const totalUsers = await prisma.user.count({
// where: {
// OR: [
// {
// name: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// phoneNumber: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// address: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// id_card: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// ],
// verified: verified === "all" ? undefined : verified === "verified",
// },
});
// });
const totalPages = Math.ceil(totalUsers / 10);
const limit = 10;
const offset = (Number(page) - 1) * limit || 0;
// const totalPages = Math.ceil(totalUsers / 10);
// const limit = 10;
// const offset = (Number(page) - 1) * limit || 0;
const users = await prisma.user.findMany({
where: {
OR: [
{
name: {
contains: query || "",
mode: "insensitive",
},
},
{
phoneNumber: {
contains: query || "",
mode: "insensitive",
},
},
{
address: {
contains: query || "",
mode: "insensitive",
},
},
{
id_card: {
contains: query || "",
mode: "insensitive",
},
},
],
verified: verified === "all" ? undefined : verified === "verified",
// const users = await prisma.user.findMany({
// where: {
// OR: [
// {
// name: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// phoneNumber: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// address: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// {
// id_card: {
// contains: query || "",
// mode: "insensitive",
// },
// },
// ],
// verified: verified === "all" ? undefined : verified === "verified",
},
include: {
island: true,
atoll: true,
},
skip: offset,
take: limit,
orderBy: {
id: `${sortBy}` as "asc" | "desc",
},
});
// },
// include: {
// island: true,
// atoll: true,
// },
// skip: offset,
// take: limit,
// orderBy: {
// id: `${sortBy}` as "asc" | "desc",
// },
// });
// const users = await prisma.user.findMany({
// where: {
@ -116,96 +115,95 @@ export async function UsersTable({
// island: true,
// },
// });
return (
<div>
{users.length === 0 ? (
<div className="h-[calc(100svh-400px)] flex flex-col items-center justify-center my-4">
<h3>No Users yet.</h3>
</div>
) : (
<>
<Table className="overflow-scroll">
<TableCaption>Table of all users.</TableCaption>
<TableHeader>
<TableRow>
<TableHead>Name</TableHead>
<TableHead>ID Card</TableHead>
<TableHead>Atoll</TableHead>
<TableHead>Island</TableHead>
<TableHead>House Name</TableHead>
<TableHead>Status</TableHead>
<TableHead>Dob</TableHead>
<TableHead>Phone Number</TableHead>
<TableHead>Action</TableHead>
</TableRow>
</TableHeader>
<TableBody className="overflow-scroll">
{users.map((user) => (
<TableRow
className={`${user.verified && "title-bg dark:bg-black"}`}
key={user.id}
>
<TableCell className="font-medium">{user.name}</TableCell>
<TableCell className="font-medium">{user.id_card}</TableCell>
<TableCell>{user.atoll?.name}</TableCell>
<TableCell>{user.island?.name}</TableCell>
<TableCell>{user.address}</TableCell>
return null;
// return (
// <div>
// {users.length === 0 ? (
// <div className="h-[calc(100svh-400px)] flex flex-col items-center justify-center my-4">
// <h3>No Users yet.</h3>
// </div>
// ) : (
// <>
// <Table className="overflow-scroll">
// <TableCaption>Table of all users.</TableCaption>
// <TableHeader>
// <TableRow>
// <TableHead>Name</TableHead>
// <TableHead>ID Card</TableHead>
// <TableHead>Atoll</TableHead>
// <TableHead>Island</TableHead>
// <TableHead>House Name</TableHead>
// <TableHead>Status</TableHead>
// <TableHead>Dob</TableHead>
// <TableHead>Phone Number</TableHead>
// <TableHead>Action</TableHead>
// </TableRow>
// </TableHeader>
// <TableBody className="overflow-scroll">
// {users.map((user) => (
// <TableRow
// className={`${user.verified && "title-bg dark:bg-black"}`}
// key={user.id}
// >
// <TableCell className="font-medium">{user.name}</TableCell>
// <TableCell className="font-medium">{user.id_card}</TableCell>
// <TableCell>{user.atoll?.name}</TableCell>
// <TableCell>{user.island?.name}</TableCell>
// <TableCell>{user.address}</TableCell>
<TableCell>
{user.verified ? (
<Badge
variant="outline"
className="bg-lime-100 text-black"
>
Verified
</Badge>
) : (
<Badge
variant="outline"
className="bg-yellow-100 text-black"
>
Unverified
</Badge>
)}
</TableCell>
<TableCell>
{new Date(user.dob ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}
</TableCell>
// <TableCell>
// {user.verified ? (
// <Badge
// variant="outline"
// className="bg-lime-100 text-black"
// >
// Verified
// </Badge>
// ) : (
// <Badge
// variant="outline"
// className="bg-yellow-100 text-black"
// >
// Unverified
// </Badge>
// )}
// </TableCell>
// <TableCell>
// {new Date(user.dob ?? "").toLocaleDateString("en-US", {
// month: "short",
// day: "2-digit",
// year: "numeric",
// })}
// </TableCell>
<TableCell>{user.phoneNumber}</TableCell>
<TableCell>
<Link href={`/users/${user.id}/verify`}>
<Button>
Details
</Button>
</Link>
</TableCell>
</TableRow>
))}
</TableBody>
<TableFooter>
<TableRow>
<TableCell colSpan={8}>
{query.length > 0 && (
<p className="text-sm text-muted-foreground">
Showing {users.length} locations for &quot;{query}
&quot;
</p>
)}
</TableCell>
<TableCell className="text-muted-foreground">
{totalUsers} users
</TableCell>
</TableRow>
</TableFooter>
</Table>
<Pagination totalPages={totalPages} currentPage={page} />
</>
)}
</div>
);
// <TableCell>{user.phoneNumber}</TableCell>
// <TableCell>
// <Link href={`/users/${user.id}/verify`}>
// <Button>Details</Button>
// </Link>
// </TableCell>
// </TableRow>
// ))}
// </TableBody>
// <TableFooter>
// <TableRow>
// <TableCell colSpan={8}>
// {query.length > 0 && (
// <p className="text-sm text-muted-foreground">
// Showing {users.length} locations for &quot;{query}
// &quot;
// </p>
// )}
// </TableCell>
// <TableCell className="text-muted-foreground">
// {totalUsers} users
// </TableCell>
// </TableRow>
// </TableFooter>
// </Table>
// <Pagination totalPages={totalPages} currentPage={page} />
// </>
// )}
// </div>
// );
}

View File

@ -1,8 +0,0 @@
"use server";
import prisma from "@/lib/db";
export async function useFormula() {
const formula = await prisma.billFormula.findFirst();
return formula;
}

View File

@ -1,14 +0,0 @@
"use server";
import { auth } from "@/app/auth";
import { headers } from "next/headers";
import { redirect } from "next/navigation";
export async function AdminAuthGuard() {
const session = await auth.api.getSession({
headers: await headers(),
});
if (session?.user.role !== "ADMIN") {
return redirect("/login");
}
return true;
}