mirror of
https://github.com/i701/sarlink-portal.git
synced 2025-02-23 06:42:00 +00:00
i701
0a63e4337e
- Updated `package.json` to include a new script for launching Prisma Studio. - Modified `signup` function in `auth-actions.ts` to include account number in user data. - Refactored `createPayment` function in `payment.ts` to improve error handling and return structured responses. - Updated UI components in the dashboard to improve layout and responsiveness, including changes to `UserDevices` and `UserPayments` pages. - Introduced new `AdminDevicesTable` and `UsersPaymentsTable` components for better admin functionalities. - Enhanced `DeviceCartDrawer` to provide user feedback during payment processing. - Added account number input to the signup form and updated validation schema accordingly. - Updated Prisma schema to include a new `ninja_user_id` field for user management. These changes improve the overall functionality, maintainability, and user experience of the application, particularly in user management and payment processing.
57 lines
1.7 KiB
TypeScript
57 lines
1.7 KiB
TypeScript
import { DeviceCartDrawer } from "@/components/device-cart";
|
|
import { Wallet } from "@/components/wallet";
|
|
|
|
import { ModeToggle } from "@/components/theme-toggle";
|
|
import { AppSidebar } from "@/components/ui/app-sidebar";
|
|
|
|
import { Separator } from "@/components/ui/separator";
|
|
import {
|
|
SidebarInset,
|
|
SidebarProvider,
|
|
SidebarTrigger,
|
|
} from "@/components/ui/sidebar";
|
|
import { auth } from "@/lib/auth";
|
|
import prisma from "@/lib/db";
|
|
import { headers } from "next/headers";
|
|
import { AccountPopover } from "./account-popver";
|
|
|
|
export async function ApplicationLayout({
|
|
children,
|
|
}: { children: React.ReactNode }) {
|
|
const session = await auth.api.getSession({
|
|
headers: await headers()
|
|
});
|
|
const billFormula = await prisma.billFormula.findFirst();
|
|
const user = await prisma.user.findFirst({
|
|
where: {
|
|
id: session?.user?.id,
|
|
},
|
|
});
|
|
return (
|
|
<SidebarProvider>
|
|
<AppSidebar role={session?.user?.role || "USER"} />
|
|
<DeviceCartDrawer billFormula={billFormula || null} />
|
|
<SidebarInset>
|
|
<header className="flex justify-between sticky top-0 bg-background h-16 shrink-0 items-center gap-2 border-b px-4 z-10">
|
|
<div className="flex items-center gap-2 ">
|
|
<SidebarTrigger className="-ml-1" />
|
|
<Separator orientation="vertical" className="mr-2 h-4" />
|
|
{session?.user.role === "ADMIN" && (
|
|
<span className="text-sm font-mono px-2 p-1 rounded-md bg-green-500/10 text-green-900 dark:text-green-400">
|
|
Welcome back {session?.user.name}
|
|
</span>
|
|
)}
|
|
</div>
|
|
|
|
<div className="flex items-center gap-2">
|
|
<Wallet walletBalance={user?.walletBalance || 0} />
|
|
<ModeToggle />
|
|
<AccountPopover />
|
|
</div>
|
|
</header>
|
|
<div className="p-4">{children}</div>
|
|
</SidebarInset>
|
|
</SidebarProvider>
|
|
);
|
|
}
|