TEMPORARY FIX TO TEST BUILD
Some checks failed
Build and Push Docker Images / Build and Push Docker Images (push) Failing after 1m15s

This commit is contained in:
2025-04-10 23:18:19 +05:00
parent e8296ae3f6
commit b932fcf03c
49 changed files with 8314 additions and 8858 deletions

View File

@ -1,18 +1,18 @@
import {
Table,
TableBody,
TableCaption,
TableCell,
TableFooter,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import { headers } from "next/headers";
import Link from "next/link";
import BlockDeviceDialog from "../block-device-dialog";
import DeviceCard from "../device-card";
import Pagination from "../pagination";
// import {
// Table,
// TableBody,
// TableCaption,
// TableCell,
// TableFooter,
// TableHead,
// TableHeader,
// TableRow,
// } from "@/components/ui/table";
// import { headers } from "next/headers";
// import Link from "next/link";
// import BlockDeviceDialog from "../block-device-dialog";
// import DeviceCard from "../device-card";
// import Pagination from "../pagination";
export async function AdminDevicesTable({
searchParams,
@ -25,12 +25,14 @@ export async function AdminDevicesTable({
}>;
parentalControl?: boolean;
}) {
console.log(parentalControl);
// 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 query = (await searchParams)?.query || "";
const page = (await searchParams)?.page;
console.log(query, page);
// const sortBy = (await searchParams)?.sortBy || "asc";
// const totalDevices = await prisma.device.count({
// where: {

View File

@ -1,17 +1,17 @@
import Pagination from "@/components/pagination";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
Table,
TableBody,
TableCaption,
TableCell,
TableFooter,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import Link from "next/link";
// import Pagination from "@/components/pagination";
// import { Badge } from "@/components/ui/badge";
// import { Button } from "@/components/ui/button";
// import {
// Table,
// TableBody,
// TableCaption,
// TableCell,
// TableFooter,
// TableHead,
// TableHeader,
// TableRow,
// } from "@/components/ui/table";
// import Link from "next/link";
export async function UsersPaymentsTable({
searchParams,
@ -24,8 +24,9 @@ export async function UsersPaymentsTable({
}>;
}) {
const query = (await searchParams)?.query || "";
const page = (await searchParams)?.page;
const sortBy = (await searchParams)?.sortBy || "asc";
console.log(query);
// const page = (await searchParams)?.page;
// const sortBy = (await searchParams)?.sortBy || "asc";
// const totalPayments = await prisma.payment.count({
// where: {
// OR: [

View File

@ -7,13 +7,11 @@ import {
} from "@/components/ui/popover";
import { Loader2, User as UserIcon } from "lucide-react";
import { signOut, useSession } from "next-auth/react";
import { useRouter } from "next/navigation";
import { useState } from "react";
export function AccountPopover() {
const session = useSession();
const [loading, setLoading] = useState(false);
const router = useRouter();
if (session.status === "loading") {
<Button variant={"outline"} disabled>

View File

@ -23,7 +23,7 @@ import { getAtolls } from "@/queries/islands";
import { keepPreviousData, useQuery } from "@tanstack/react-query";
export default function SignUpForm() {
const { data: atolls, isFetching } = useQuery<ApiResponse<Atoll>>({
const { data: atolls } = useQuery<ApiResponse<Atoll>>({
queryKey: ["ATOLLS"],
queryFn: () => getAtolls(),
placeholderData: keepPreviousData,

View File

@ -17,7 +17,8 @@ export default function CancelPaymentButton({
<Button
onClick={async () => {
setLoading(true);
const [error, _] = await tryCatch(cancelPayment({ id: paymentId }));
const [error, x] = await tryCatch(cancelPayment({ id: paymentId }));
console.log(x);
if (error) {
toast.error(error.message);
setLoading(false);

View File

@ -3,7 +3,6 @@ import { TableCell, TableRow } from "@/components/ui/table";
import { deviceCartAtom } from "@/lib/atoms";
import type { Device } from "@/lib/backend-types";
import { cn } from "@/lib/utils";
import { pl } from "date-fns/locale";
import { useAtom } from "jotai";
import { Hourglass } from "lucide-react";
import Link from "next/link";

View File

@ -5,18 +5,16 @@ import DeviceCard from "@/components/device-card";
import NumberInput from "@/components/number-input";
import { Button } from "@/components/ui/button";
import { deviceCartAtom, numberOfMonths } from "@/lib/atoms";
import type { NewPayment, Payment } from "@/lib/backend-types";
import type { NewPayment } from "@/lib/backend-types";
import { tryCatch } from "@/utils/tryCatch";
import { useAtom, useAtomValue, useSetAtom } from "jotai";
import { CircleDollarSign, Loader2 } from "lucide-react";
import { useSession } from "next-auth/react";
import { redirect, usePathname } from "next/navigation";
import { useEffect, useState } from "react";
import { toast } from "sonner";
export default function DevicesForPayment() {
const baseAmount = 100;
const discountPercentage = 75;
const session = useSession();
const pathname = usePathname();
const devices = useAtomValue(deviceCartAtom);
const setDeviceCart = useSetAtom(deviceCartAtom);
@ -24,6 +22,7 @@ export default function DevicesForPayment() {
const [message, setMessage] = useState("");
const [disabled, setDisabled] = useState(false);
const [total, setTotal] = useState(0);
console.log(total);
useEffect(() => {
if (months === 7) {
setMessage("You will get 1 month free.");

View File

@ -35,7 +35,7 @@ export async function DevicesTable({
if (error) {
return <pre>{JSON.stringify(error, null, 2)}</pre>;
}
const { meta, links, data } = devices;
const { meta, data } = devices;
return (
<div>
{data.length === 0 ? (

View File

@ -9,7 +9,6 @@ import {
TableRow,
} from "@/components/ui/table";
import type { Payment } from "@/lib/backend-types";
import { formatDate } from "@/lib/utils";
import {
BadgeDollarSign,
Clipboard,
@ -26,6 +25,7 @@ export default function DevicesToPay({
payment,
user,
}: { payment?: Payment; user?: User }) {
console.log(user);
const [verifying, setVerifying] = useState(false);
const devices = payment?.devices;

View File

@ -93,7 +93,7 @@ export async function PaymentsTable({
return <pre>{JSON.stringify(error, null, 2)}</pre>;
}
}
const { data, meta, links } = payments;
const { data, meta } = payments;
return (
<div>
{data?.length === 0 ? (

View File

@ -55,7 +55,6 @@ type Categories = {
}[];
export async function AppSidebar({
role,
...props
}: React.ComponentProps<typeof Sidebar>) {
const categories = [

View File

@ -1,71 +1,72 @@
"use client"
"use client";
import { ChevronLeft, ChevronRight } from "lucide-react"
import { DayPicker } from "react-day-picker"
import { ChevronLeft, ChevronRight } from "lucide-react";
import { DayPicker } from "react-day-picker";
import { buttonVariants } from "@/components/ui/button"
import { cn } from "@/lib/utils"
import { buttonVariants } from "@/components/ui/button";
import { cn } from "@/lib/utils";
export type CalendarProps = React.ComponentProps<typeof DayPicker>
export type CalendarProps = React.ComponentProps<typeof DayPicker>;
function Calendar({
className,
classNames,
showOutsideDays = true,
...props
className,
classNames,
showOutsideDays = true,
...props
}: CalendarProps) {
return (
<DayPicker
showOutsideDays={showOutsideDays}
className={cn("p-3", className)}
classNames={{
months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
month: "space-y-4",
caption: "flex justify-center pt-1 relative items-center",
caption_label: "text-sm font-medium",
nav: "space-x-1 flex items-center",
nav_button: cn(
buttonVariants({ variant: "outline" }),
"h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100"
),
nav_button_previous: "absolute left-1",
nav_button_next: "absolute right-1",
table: "w-full border-collapse space-y-1",
head_row: "flex",
head_cell:
"text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
row: "flex w-full mt-2",
cell: cn(
"relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md",
props.mode === "range"
? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
: "[&:has([aria-selected])]:rounded-md"
),
day: cn(
buttonVariants({ variant: "ghost" }),
"h-8 w-8 p-0 font-normal aria-selected:opacity-100"
),
day_range_start: "day-range-start",
day_range_end: "day-range-end",
day_selected:
"bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
day_today: "bg-accent text-accent-foreground",
day_outside:
"day-outside text-muted-foreground aria-selected:bg-accent/50 aria-selected:text-muted-foreground",
day_disabled: "text-muted-foreground opacity-50",
day_range_middle:
"aria-selected:bg-accent aria-selected:text-accent-foreground",
day_hidden: "invisible",
...classNames,
}}
components={{
IconLeft: () => <ChevronLeft className="h-4 w-4" />,
IconRight: () => <ChevronRight className="h-4 w-4" />,
}}
{...props}
/>
)
return (
<DayPicker
showOutsideDays={showOutsideDays}
className={cn("p-3", className)}
classNames={{
months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
month: "space-y-4",
caption: "flex justify-center pt-1 relative items-center",
caption_label: "text-sm font-medium",
nav: "space-x-1 flex items-center",
nav_button: cn(
buttonVariants({ variant: "outline" }),
"h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
),
nav_button_previous: "absolute left-1",
nav_button_next: "absolute right-1",
table: "w-full border-collapse space-y-1",
head_row: "flex",
head_cell:
"text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
row: "flex w-full mt-2",
cell: cn(
"relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md",
props.mode === "range"
? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
: "[&:has([aria-selected])]:rounded-md",
),
day: cn(
buttonVariants({ variant: "ghost" }),
"h-8 w-8 p-0 font-normal aria-selected:opacity-100",
),
day_range_start: "day-range-start",
day_range_end: "day-range-end",
day_selected:
"bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
day_today: "bg-accent text-accent-foreground",
day_outside:
"day-outside text-muted-foreground aria-selected:bg-accent/50 aria-selected:text-muted-foreground",
day_disabled: "text-muted-foreground opacity-50",
day_range_middle:
"aria-selected:bg-accent aria-selected:text-accent-foreground",
day_hidden: "invisible",
...classNames,
}}
components={{
// @ts-expect-error this works but types are not correct
IconLeft: () => <ChevronLeft className="h-4 w-4" />,
IconRight: () => <ChevronRight className="h-4 w-4" />,
}}
{...props}
/>
);
}
Calendar.displayName = "Calendar"
Calendar.displayName = "Calendar";
export { Calendar }
export { Calendar };

View File

@ -1,17 +1,17 @@
import {
Table,
TableBody,
TableCaption,
TableCell,
TableFooter,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import Link from "next/link";
import Pagination from "./pagination";
import { Badge } from "./ui/badge";
import { Button } from "./ui/button";
// import {
// Table,
// TableBody,
// TableCaption,
// TableCell,
// TableFooter,
// TableHead,
// TableHeader,
// TableRow,
// } from "@/components/ui/table";
// import Link from "next/link";
// import Pagination from "./pagination";
// import { Badge } from "./ui/badge";
// import { Button } from "./ui/button";
export async function UsersTable({
searchParams,
@ -24,9 +24,10 @@ export async function UsersTable({
}>;
}) {
const query = (await searchParams)?.query || "";
const page = (await searchParams)?.page;
const sortBy = (await searchParams)?.sortBy || "asc";
const verified = (await searchParams)?.status || "all";
console.log(query);
// 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: [

View File

@ -62,6 +62,7 @@ export default function AddDeviceDialogForm({ user_id }: { user_id?: string }) {
toast.error(error.message || "Something went wrong.");
setDisabled(false);
} else {
console.log(response);
setOpen(false);
setDisabled(false);
toast.success("Device successfully added!");

View File

@ -1,7 +1,7 @@
"use client"
"use client";
import { Rejectuser } from "@/actions/user-actions"
import { Button } from "@/components/ui/button"
import { Rejectuser } from "@/actions/user-actions";
import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
@ -10,56 +10,56 @@ import {
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@/components/ui/dialog"
import { Label } from "@/components/ui/label"
import { cn } from "@/lib/utils"
import { zodResolver } from "@hookform/resolvers/zod"
import type { User } from "@prisma/client"
import { UserX } from "lucide-react"
import { useState } from "react"
import { type SubmitHandler, useForm } from "react-hook-form"
import { toast } from "sonner"
import { z } from "zod"
import { Textarea } from "../ui/textarea"
} from "@/components/ui/dialog";
import { Label } from "@/components/ui/label";
import type { User } from "@/lib/types/user";
import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { UserX } from "lucide-react";
import { useState } from "react";
import { type SubmitHandler, useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import { Textarea } from "../ui/textarea";
const validationSchema = z.object({
reason: z.string().min(5, { message: "Reason is required" }),
})
});
export default function UserRejectDialog({ user }: { user: User }) {
const [disabled, setDisabled] = useState(false)
const [open, setOpen] = useState(false)
const [disabled, setDisabled] = useState(false);
const [open, setOpen] = useState(false);
const {
register,
handleSubmit,
formState: { errors },
} = useForm<z.infer<typeof validationSchema>>({
resolver: zodResolver(validationSchema),
})
});
const onSubmit: SubmitHandler<z.infer<typeof validationSchema>> = (data) => {
setDisabled(true)
console.log(data)
toast.promise(Rejectuser({
userId: user.id,
reason: data.reason,
}), {
loading: "Rejecting...",
success: () => {
setDisabled(false)
setOpen((prev) => !prev)
return "Rejected!"
setDisabled(true);
console.log(data);
toast.promise(
Rejectuser({
userId: String(user.id),
reason: data.reason,
}),
{
loading: "Rejecting...",
success: () => {
setDisabled(false);
setOpen((prev) => !prev);
return "Rejected!";
},
error: (error) => {
setDisabled(false);
return error.message || "Something went wrong";
},
},
error: (error) => {
setDisabled(false)
return error.message || "Something went wrong"
},
})
setDisabled(false)
}
);
setDisabled(false);
};
return (
<Dialog open={open} onOpenChange={setOpen}>
@ -71,20 +71,25 @@ export default function UserRejectDialog({ user }: { user: User }) {
</DialogTrigger>
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle>Are you sure you want to {" "}
<span className="text-red-500">reject</span>{" "}
this user?</DialogTitle>
<DialogTitle>
Are you sure you want to{" "}
<span className="text-red-500">reject</span> this user?
</DialogTitle>
<DialogDescription className="py-2">
<li>Name: {user.name}</li>
<li>
Name: {user.first_name} {user.last_name}
</li>
<li>ID Card: {user.id_card}</li>
<li>Address: {user.address}</li>
<li>DOB: {new Date(user.dob ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}
<li>
DOB:{" "}
{new Date(user.dob ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}
</li>
<li>Phone Number: {user.phoneNumber}</li>
<li>Phone Number: {user.mobile}</li>
</DialogDescription>
</DialogHeader>
<form onSubmit={handleSubmit(onSubmit)}>
@ -93,7 +98,15 @@ export default function UserRejectDialog({ user }: { user: User }) {
<Label htmlFor="reason" className="text-right">
Rejection details
</Label>
<Textarea rows={10} {...register("reason")} id="reason" className={cn("col-span-5", errors.reason && "ring-2 ring-red-500")} />
<Textarea
rows={10}
{...register("reason")}
id="reason"
className={cn(
"col-span-5",
errors.reason && "ring-2 ring-red-500",
)}
/>
<span className="text-sm text-red-500">
{errors.reason?.message}
</span>
@ -107,5 +120,5 @@ export default function UserRejectDialog({ user }: { user: User }) {
</form>
</DialogContent>
</Dialog>
)
}
);
}

View File

@ -12,7 +12,7 @@ import {
AlertDialogTrigger,
} from "@/components/ui/alert-dialog";
import { Button } from "@/components/ui/button";
import type { User } from "@prisma/client";
import type { User } from "@/lib/types/user";
import { Check, CheckCheck } from "lucide-react";
import { useState } from "react";
import { toast } from "sonner";
@ -37,15 +37,20 @@ export function UserVerifyDialog({ user }: { user: User }) {
<AlertDialogDescription>
Are you sure you want to verify the following user?
<span className="inline-block my-4">
<li>Name: {user.name}</li>
<li>
Name: {user.first_name} {user.last_name}
</li>
<li>ID Card: {user.id_card}</li>
<li>Address: {user.address}</li>
<li>DOB: {new Date(user.dob ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}</li>
<li>Phone Number: {user.phoneNumber}</li>
<li>
DOB:{" "}
{new Date(user.dob ?? "").toLocaleDateString("en-US", {
month: "short",
day: "2-digit",
year: "numeric",
})}
</li>
<li>Phone Number: {user.mobile}</li>
</span>
</AlertDialogDescription>
</AlertDialogHeader>
@ -55,7 +60,7 @@ export function UserVerifyDialog({ user }: { user: User }) {
disabled={disabled}
onClick={() => {
setDisabled(true);
toast.promise(VerifyUser(userId), {
toast.promise(VerifyUser(String(userId)), {
loading: "Verifying...",
success: () => {
setDisabled(false);