mirror of
https://github.com/i701/sarlink-portal.git
synced 2025-02-22 09:22:01 +00:00
Refactor authentication components and enhance user session handling
- Updated AccountPopover to utilize session data for user information display. - Modified ApplicationLayout to fetch user details from the database using Prisma. - Replaced Checkbox components with native input elements in SignUpForm for better accessibility. - Enhanced seed script to include default islands and create related data in the database.
This commit is contained in:
parent
b91f34b6b1
commit
3f8bb4e70a
@ -5,29 +5,38 @@ import {
|
|||||||
PopoverContent,
|
PopoverContent,
|
||||||
PopoverTrigger,
|
PopoverTrigger,
|
||||||
} from "@/components/ui/popover"
|
} from "@/components/ui/popover"
|
||||||
import { authClient } from "@/lib/auth-client"
|
import { authClient } from "@/lib/auth-client";
|
||||||
import type { User } from "better-auth"
|
import type { User } from "@prisma/client";
|
||||||
import { Loader, User as UserIcon } from "lucide-react"
|
import { Loader2, User as UserIcon } from "lucide-react"
|
||||||
import { useRouter } from "next/navigation"
|
import { useRouter } from "next/navigation"
|
||||||
import { useState } from "react"
|
import { useState } from "react"
|
||||||
|
|
||||||
export function AccountPopover({ user }: { user?: User }) {
|
export function AccountPopover({ user }: { user?: User }) {
|
||||||
|
const session = authClient.useSession();
|
||||||
const [loading, setLoading] = useState(false)
|
const [loading, setLoading] = useState(false)
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
|
if (session.isPending) {
|
||||||
|
<Button variant={"outline"} disabled>
|
||||||
|
<Loader2 className="animate-spin" />
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
|
|
||||||
<Popover>
|
<Popover>
|
||||||
<PopoverTrigger asChild>
|
<PopoverTrigger asChild>
|
||||||
<Button variant="outline">
|
<Button variant="outline">
|
||||||
<UserIcon />
|
<UserIcon />
|
||||||
</Button>
|
</Button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent className="w-80">
|
<PopoverContent className="w-fit">
|
||||||
<div className="grid gap-4">
|
<div className="grid gap-4">
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<h4 className="font-medium leading-none">{user?.name}</h4>
|
<h4 className="font-medium leading-none">{session.data?.user?.name}</h4>
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
{user?.email}
|
{session.data?.user?.phoneNumber}
|
||||||
</p>
|
</p>
|
||||||
|
<span className="text-xs text-gray-500">{user?.address}</span>
|
||||||
</div>
|
</div>
|
||||||
<Button disabled={loading} onClick={async () => {
|
<Button disabled={loading} onClick={async () => {
|
||||||
setLoading(true)
|
setLoading(true)
|
||||||
@ -40,7 +49,7 @@ export function AccountPopover({ user }: { user?: User }) {
|
|||||||
})
|
})
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
}}>
|
}}>
|
||||||
{loading ? <Loader className="animate-spin" /> : "Logout"}
|
{loading ? <Loader2 className="animate-spin" /> : "Logout"}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</PopoverContent>
|
</PopoverContent>
|
||||||
|
@ -15,6 +15,7 @@ import {
|
|||||||
SidebarTrigger,
|
SidebarTrigger,
|
||||||
} from "@/components/ui/sidebar";
|
} from "@/components/ui/sidebar";
|
||||||
import { auth } from "@/lib/auth";
|
import { auth } from "@/lib/auth";
|
||||||
|
import prisma from "@/lib/db";
|
||||||
import { headers } from "next/headers";
|
import { headers } from "next/headers";
|
||||||
import { AccountPopover } from "./account-popver";
|
import { AccountPopover } from "./account-popver";
|
||||||
|
|
||||||
@ -22,7 +23,12 @@ export async function ApplicationLayout({
|
|||||||
children,
|
children,
|
||||||
}: { children: React.ReactNode }) {
|
}: { children: React.ReactNode }) {
|
||||||
const session = await auth.api.getSession({
|
const session = await auth.api.getSession({
|
||||||
headers: await headers(), // you need to pass the headers object.
|
headers: await headers()
|
||||||
|
});
|
||||||
|
const user = await prisma.user.findUnique({
|
||||||
|
where: {
|
||||||
|
id: session?.user?.id,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
return (
|
return (
|
||||||
<SidebarProvider>
|
<SidebarProvider>
|
||||||
@ -47,7 +53,7 @@ export async function ApplicationLayout({
|
|||||||
|
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<ModeToggle />
|
<ModeToggle />
|
||||||
<AccountPopover user={session?.user} />
|
<AccountPopover user={user || undefined} />
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<div className="p-4">{children}</div>
|
<div className="p-4">{children}</div>
|
||||||
|
@ -20,7 +20,6 @@ import {
|
|||||||
SelectTrigger,
|
SelectTrigger,
|
||||||
SelectValue,
|
SelectValue,
|
||||||
} from "@/components/ui/select";
|
} from "@/components/ui/select";
|
||||||
import { Checkbox } from "../ui/checkbox";
|
|
||||||
|
|
||||||
type AtollWithIslands = Prisma.AtollGetPayload<{
|
type AtollWithIslands = Prisma.AtollGetPayload<{
|
||||||
include: {
|
include: {
|
||||||
@ -241,7 +240,8 @@ export default function SignUpForm({ atolls }: { atolls: AtollWithIslands[] }) {
|
|||||||
)}
|
)}
|
||||||
<div className="flex flex-col gap-2 items-start justify-start py-2">
|
<div className="flex flex-col gap-2 items-start justify-start py-2">
|
||||||
<div className="flex gap-2 items-center">
|
<div className="flex gap-2 items-center">
|
||||||
<Checkbox
|
<input
|
||||||
|
type="checkbox"
|
||||||
defaultChecked={(actionState.payload?.get("terms") || "") as string === 'on'}
|
defaultChecked={(actionState.payload?.get("terms") || "") as string === 'on'}
|
||||||
name="terms" id="terms" />
|
name="terms" id="terms" />
|
||||||
<label
|
<label
|
||||||
@ -263,7 +263,9 @@ export default function SignUpForm({ atolls }: { atolls: AtollWithIslands[] }) {
|
|||||||
)}
|
)}
|
||||||
<div className="flex gap-2 items-center">
|
<div className="flex gap-2 items-center">
|
||||||
|
|
||||||
<Checkbox
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
defaultChecked={(actionState.payload?.get("policy") || "") as string === 'on'}
|
||||||
name="policy" id="terms" />
|
name="policy" id="terms" />
|
||||||
<label
|
<label
|
||||||
htmlFor="terms"
|
htmlFor="terms"
|
||||||
|
@ -3,6 +3,8 @@ import { PrismaClient } from "@prisma/client";
|
|||||||
|
|
||||||
const prisma = new PrismaClient();
|
const prisma = new PrismaClient();
|
||||||
|
|
||||||
|
const DEFAULT_ISLANDS = ["Dharanboodhoo", "Feeali", "Nilandhoo", "Magoodhoo"];
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
const users = Array.from({ length: 25 }, () => ({
|
const users = Array.from({ length: 25 }, () => ({
|
||||||
name: `${faker.person.fullName().split(" ")[1]} House-${crypto
|
name: `${faker.person.fullName().split(" ")[1]} House-${crypto
|
||||||
@ -22,9 +24,23 @@ async function main() {
|
|||||||
phoneNumberVerified: false,
|
phoneNumberVerified: false,
|
||||||
role: "USER",
|
role: "USER",
|
||||||
}));
|
}));
|
||||||
|
|
||||||
await prisma.user.createMany({
|
await prisma.user.createMany({
|
||||||
data: users,
|
data: users,
|
||||||
});
|
});
|
||||||
|
const FAAFU_ATOLL = await prisma.atoll.create({
|
||||||
|
data: {
|
||||||
|
name: "F",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const islands = DEFAULT_ISLANDS.map((name) => ({
|
||||||
|
name,
|
||||||
|
atollId: FAAFU_ATOLL.id,
|
||||||
|
}));
|
||||||
|
await prisma.island.createMany({
|
||||||
|
data: islands,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
main()
|
main()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user