Skip to content

Commit c75eb4f

Browse files
agmmtooagmmtoo
committed
feat: return edit
1 parent 9617a66 commit c75eb4f

File tree

11 files changed

+239
-159
lines changed

11 files changed

+239
-159
lines changed

‎app/(protected)/borrows/[id]/layout.tsx‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,45 @@ export default async function BorrowDetailsLayout({
3232
}
3333
return (
3434
<div className="space-y-4">
35-
<h1 className="text-2xl font-semibold">{borrowRes.data.book.title}</h1>
36-
<div className="flex justify-between items-center">
37-
<Breadcrumb>
38-
<BreadcrumbList>
39-
<BreadcrumbItem>
40-
<Link href="/" passHref legacyBehavior>
41-
<BreadcrumbLink>Home</BreadcrumbLink>
42-
</Link>
43-
</BreadcrumbItem>
44-
<BreadcrumbSeparator />
45-
<BreadcrumbItem>
46-
<Link href="/borrows" passHref legacyBehavior>
47-
<BreadcrumbLink>Borrows</BreadcrumbLink>
48-
</Link>
49-
</BreadcrumbItem>
50-
<BreadcrumbSeparator />
51-
<BreadcrumbItem>
52-
<Link href={`/borrows/${id}`} passHref legacyBehavior>
53-
<BreadcrumbLink>{borrowRes.data.book.title}</BreadcrumbLink>
54-
</Link>
55-
</BreadcrumbItem>
56-
</BreadcrumbList>
57-
</Breadcrumb>
35+
<nav className="backdrop-blur-sm sticky top-0 z-10">
36+
<h1 className="text-2xl font-semibold">{borrowRes.data.book.title}</h1>
37+
<div className="flex justify-between items-center">
38+
<Breadcrumb>
39+
<BreadcrumbList>
40+
<BreadcrumbItem>
41+
<Link href="/" passHref legacyBehavior>
42+
<BreadcrumbLink>Home</BreadcrumbLink>
43+
</Link>
44+
</BreadcrumbItem>
45+
<BreadcrumbSeparator />
46+
<BreadcrumbItem>
47+
<Link href="/borrows" passHref legacyBehavior>
48+
<BreadcrumbLink>Borrows</BreadcrumbLink>
49+
</Link>
50+
</BreadcrumbItem>
51+
<BreadcrumbSeparator />
52+
<BreadcrumbItem>
53+
<Link href={`/borrows/${id}`} passHref legacyBehavior>
54+
<BreadcrumbLink>{borrowRes.data.book.title}</BreadcrumbLink>
55+
</Link>
56+
</BreadcrumbItem>
57+
</BreadcrumbList>
58+
</Breadcrumb>
5859

59-
<Badge
60-
variant={
61-
getBorrowStatus(borrowRes.data) === 'overdue'
62-
? 'destructive'
63-
: getBorrowStatus(borrowRes.data) === 'returned'
64-
? 'secondary'
65-
: 'default'
66-
}
67-
className="uppercase h-8 min-w-24 justify-center"
68-
>
69-
{getBorrowStatus(borrowRes.data)}
70-
</Badge>
71-
</div>
60+
<Badge
61+
variant={
62+
getBorrowStatus(borrowRes.data) === 'overdue'
63+
? 'destructive'
64+
: getBorrowStatus(borrowRes.data) === 'returned'
65+
? 'secondary'
66+
: 'default'
67+
}
68+
className="uppercase h-8 min-w-24 justify-center"
69+
>
70+
{getBorrowStatus(borrowRes.data)}
71+
</Badge>
72+
</div>
73+
</nav>
7274
{edit}
7375
{children}
7476
</div>

‎app/(protected)/borrows/[id]/page.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export default async function BorrowDetailsPage({
4343
const [borrowRes] = await Promise.all([getBorrow({ id })])
4444

4545
if ('error' in borrowRes) {
46-
console.log({ libRes: borrowRes })
4746
return <div>{JSON.stringify(borrowRes.message)}</div>
4847
}
4948

‎app/(protected)/libraries/page.tsx‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,26 +66,28 @@ export default async function Libraries({
6666

6767
return (
6868
<div>
69-
<h1 className="text-2xl font-semibold">Libraries</h1>
70-
<div className="flex justify-between items-center">
71-
<Breadcrumb>
72-
<BreadcrumbList>
73-
<BreadcrumbItem>
74-
<Link href="/" passHref legacyBehavior>
75-
<BreadcrumbLink>Home</BreadcrumbLink>
76-
</Link>
77-
</BreadcrumbItem>
78-
<BreadcrumbSeparator />
69+
<nav className="backdrop-blur-sm sticky top-0 z-10">
70+
<h1 className="text-2xl font-semibold">Libraries</h1>
71+
<div className="flex justify-between items-center">
72+
<Breadcrumb>
73+
<BreadcrumbList>
74+
<BreadcrumbItem>
75+
<Link href="/" passHref legacyBehavior>
76+
<BreadcrumbLink>Home</BreadcrumbLink>
77+
</Link>
78+
</BreadcrumbItem>
79+
<BreadcrumbSeparator />
7980

80-
<BreadcrumbItem>
81-
<BreadcrumbPage>Libraries</BreadcrumbPage>
82-
</BreadcrumbItem>
83-
</BreadcrumbList>
84-
</Breadcrumb>
85-
<Button asChild>
86-
<Link href="/libraries/new">Create a Library</Link>
87-
</Button>
88-
</div>
81+
<BreadcrumbItem>
82+
<BreadcrumbPage>Libraries</BreadcrumbPage>
83+
</BreadcrumbItem>
84+
</BreadcrumbList>
85+
</Breadcrumb>
86+
<Button asChild>
87+
<Link href="/libraries/new">Create a Library</Link>
88+
</Button>
89+
</div>
90+
</nav>
8991

9092
<Table>
9193
{/* <TableCaption>List of books available in the library.</TableCaption> */}

‎app/(protected)/memberships/page.tsx‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,28 @@ export default async function Memberships({
6464

6565
return (
6666
<div className="space-y-4">
67-
<h1 className="text-2xl font-semibold">Memberships</h1>
68-
<div className="flex justify-between items-center">
69-
<Breadcrumb>
70-
<BreadcrumbList>
71-
<BreadcrumbItem>
72-
<Link href="/" passHref legacyBehavior>
73-
<BreadcrumbLink>Home</BreadcrumbLink>
74-
</Link>
75-
</BreadcrumbItem>
76-
<BreadcrumbSeparator />
67+
<nav className="backdrop-blur-sm sticky top-0 z-10">
68+
<h1 className="text-2xl font-semibold">Memberships</h1>
69+
<div className="flex justify-between items-center">
70+
<Breadcrumb>
71+
<BreadcrumbList>
72+
<BreadcrumbItem>
73+
<Link href="/" passHref legacyBehavior>
74+
<BreadcrumbLink>Home</BreadcrumbLink>
75+
</Link>
76+
</BreadcrumbItem>
77+
<BreadcrumbSeparator />
7778

78-
<BreadcrumbItem>
79-
<BreadcrumbPage>Memberships</BreadcrumbPage>
80-
</BreadcrumbItem>
81-
</BreadcrumbList>
82-
</Breadcrumb>
83-
<Button asChild>
84-
<Link href="/memberships/new">New Membership</Link>
85-
</Button>
86-
</div>
79+
<BreadcrumbItem>
80+
<BreadcrumbPage>Memberships</BreadcrumbPage>
81+
</BreadcrumbItem>
82+
</BreadcrumbList>
83+
</Breadcrumb>
84+
<Button asChild>
85+
<Link href="/memberships/new">New Membership</Link>
86+
</Button>
87+
</div>
88+
</nav>
8789

8890
<Table>
8991
{/* <TableCaption>List of books available in the library.</TableCaption> */}

‎app/(protected)/staffs/page.tsx‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,28 @@ export default async function Staffs({
7676

7777
return (
7878
<div>
79-
<h1 className="text-2xl font-semibold">Staffs</h1>
80-
<div className="flex justify-between items-center">
81-
<Breadcrumb>
82-
<BreadcrumbList>
83-
<BreadcrumbItem>
84-
<Link href="/" passHref legacyBehavior>
85-
<BreadcrumbLink>Home</BreadcrumbLink>
86-
</Link>
87-
</BreadcrumbItem>
88-
<BreadcrumbSeparator />
79+
<nav className="backdrop-blur-sm sticky top-0 z-10">
80+
<h1 className="text-2xl font-semibold">Staffs</h1>
81+
<div className="flex justify-between items-center">
82+
<Breadcrumb>
83+
<BreadcrumbList>
84+
<BreadcrumbItem>
85+
<Link href="/" passHref legacyBehavior>
86+
<BreadcrumbLink>Home</BreadcrumbLink>
87+
</Link>
88+
</BreadcrumbItem>
89+
<BreadcrumbSeparator />
8990

90-
<BreadcrumbItem>
91-
<BreadcrumbPage>Staffs</BreadcrumbPage>
92-
</BreadcrumbItem>
93-
</BreadcrumbList>
94-
</Breadcrumb>
95-
<Button asChild>
96-
<Link href="/staffs/new">Assign a Staff</Link>
97-
</Button>
98-
</div>
91+
<BreadcrumbItem>
92+
<BreadcrumbPage>Staffs</BreadcrumbPage>
93+
</BreadcrumbItem>
94+
</BreadcrumbList>
95+
</Breadcrumb>
96+
<Button asChild>
97+
<Link href="/staffs/new">Assign a Staff</Link>
98+
</Button>
99+
</div>
100+
</nav>
99101

100102
<Table>
101103
{/* <TableCaption>List of books available in the library.</TableCaption> */}

‎app/(protected)/subscriptions/[id]/page.tsx‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,39 +37,41 @@ export default async function SubscriptionDetailsPage({
3737

3838
return (
3939
<div className="space-y-4">
40-
<h1 className="text-2xl font-semibold">{subsRes.data.user.name}</h1>
41-
<div className="flex justify-between items-center">
42-
<Breadcrumb>
43-
<BreadcrumbList>
44-
<BreadcrumbItem>
45-
<Link href="/" passHref legacyBehavior>
46-
<BreadcrumbLink>Home</BreadcrumbLink>
47-
</Link>
48-
</BreadcrumbItem>
49-
<BreadcrumbSeparator />
50-
<BreadcrumbItem>
51-
<Link href="/subscriptions" passHref legacyBehavior>
52-
<BreadcrumbLink>Subscriptions</BreadcrumbLink>
53-
</Link>
54-
</BreadcrumbItem>
55-
<BreadcrumbSeparator />
56-
<BreadcrumbItem>
57-
<BreadcrumbPage>{subsRes.data.user.name}</BreadcrumbPage>
58-
</BreadcrumbItem>
59-
</BreadcrumbList>
60-
</Breadcrumb>
40+
<nav className="backdrop-blur-sm sticky top-0 z-10">
41+
<h1 className="text-2xl font-semibold">{subsRes.data.user.name}</h1>
42+
<div className="flex justify-between items-center">
43+
<Breadcrumb>
44+
<BreadcrumbList>
45+
<BreadcrumbItem>
46+
<Link href="/" passHref legacyBehavior>
47+
<BreadcrumbLink>Home</BreadcrumbLink>
48+
</Link>
49+
</BreadcrumbItem>
50+
<BreadcrumbSeparator />
51+
<BreadcrumbItem>
52+
<Link href="/subscriptions" passHref legacyBehavior>
53+
<BreadcrumbLink>Subscriptions</BreadcrumbLink>
54+
</Link>
55+
</BreadcrumbItem>
56+
<BreadcrumbSeparator />
57+
<BreadcrumbItem>
58+
<BreadcrumbPage>{subsRes.data.user.name}</BreadcrumbPage>
59+
</BreadcrumbItem>
60+
</BreadcrumbList>
61+
</Breadcrumb>
6162

62-
<Badge
63-
variant={
64-
getSubscriptionStatus(subsRes.data) === 'active'
65-
? 'default'
66-
: 'secondary'
67-
}
68-
className="uppercase h-8 min-w-24 justify-center"
69-
>
70-
{getSubscriptionStatus(subsRes.data)}
71-
</Badge>
72-
</div>
63+
<Badge
64+
variant={
65+
getSubscriptionStatus(subsRes.data) === 'active'
66+
? 'default'
67+
: 'secondary'
68+
}
69+
className="uppercase h-8 min-w-24 justify-center"
70+
>
71+
{getSubscriptionStatus(subsRes.data)}
72+
</Badge>
73+
</div>
74+
</nav>
7375

7476
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
7577
<Carduser user={subsRes.data.user} />

‎app/(protected)/users/page.tsx‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,28 @@ export default async function Users({
6262

6363
return (
6464
<div>
65-
<h1 className="text-2xl font-semibold">Users</h1>
66-
<div className="flex justify-between items-center">
67-
<Breadcrumb>
68-
<BreadcrumbList>
69-
<BreadcrumbItem>
70-
<Link href="/" passHref legacyBehavior>
71-
<BreadcrumbLink>Home</BreadcrumbLink>
72-
</Link>
73-
</BreadcrumbItem>
74-
<BreadcrumbSeparator />
65+
<nav className="backdrop-blur-sm sticky top-0 z-10">
66+
<h1 className="text-2xl font-semibold">Users</h1>
67+
<div className="flex justify-between items-center">
68+
<Breadcrumb>
69+
<BreadcrumbList>
70+
<BreadcrumbItem>
71+
<Link href="/" passHref legacyBehavior>
72+
<BreadcrumbLink>Home</BreadcrumbLink>
73+
</Link>
74+
</BreadcrumbItem>
75+
<BreadcrumbSeparator />
7576

76-
<BreadcrumbItem>
77-
<BreadcrumbPage>Users</BreadcrumbPage>
78-
</BreadcrumbItem>
79-
</BreadcrumbList>
80-
</Breadcrumb>
81-
<Button asChild>
82-
<Link href="/users/new">Add User</Link>
83-
</Button>
84-
</div>
77+
<BreadcrumbItem>
78+
<BreadcrumbPage>Users</BreadcrumbPage>
79+
</BreadcrumbItem>
80+
</BreadcrumbList>
81+
</Breadcrumb>
82+
<Button asChild>
83+
<Link href="/users/new">Add User</Link>
84+
</Button>
85+
</div>
86+
</nav>
8587

8688
<Table>
8789
{/* <TableCaption>List of books available in the library.</TableCaption> */}

‎app/layout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const geistMono = Geist_Mono({
1616

1717
export const metadata: Metadata = {
1818
title: SITE_NAME,
19-
description: 'A simple library management system',
19+
description: 'A simple and powerful library management system',
2020
}
2121

2222
export default function RootLayout({

0 commit comments

Comments
 (0)