Updated dashbpard and added sonner

This commit is contained in:
2025-06-26 14:09:10 +02:00
parent da0524a4fc
commit 4381d81710
14 changed files with 628 additions and 12 deletions

View File

@@ -9,8 +9,12 @@ export default function DashboardLayout({
}) {
return (
<SidebarProvider>
<DashboardSidebar />
{children}
<div className="min-h-screen flex w-full">
<DashboardSidebar />
<main className="flex-1 overflow-auto">
{children}
</main>
</div>
</SidebarProvider>
)
}

View File

@@ -1,8 +1,16 @@
export default function DashboardListPage() {
import { UrlsDataTable } from "@/components/dashboard/urls-data-table"
import { getAllUrls } from "@/lib/db/urls"
export default async function DashboardListPage() {
const urls = await getAllUrls()
return (
<div className="p-6">
<h1 className="text-2xl font-bold text-gray-900 mb-4">List</h1>
<p className="text-gray-600">This is the list page where you can view all items.</p>
<div className="mb-6">
<h1 className="text-2xl font-bold text-gray-900 mb-2">URLs</h1>
<p className="text-gray-600">Manage all your shortened URLs.</p>
</div>
<UrlsDataTable data={urls} />
</div>
)
}

View File

@@ -15,11 +15,15 @@ export default async function Dashboard() {
// Determine the most visited URL display value
const mostVisitedDisplay = stats.mostVisitedUrl
? `${stats.mostVisitedUrl.title} (${stats.mostVisitedUrl.visitCount})`
? stats.mostVisitedUrl.visitCount > 0
? `${stats.mostVisitedUrl.title} (${stats.mostVisitedUrl.visitCount})`
: "No visits"
: "No URLs"
const mostVisitedDescription = stats.mostVisitedUrl
? `/${stats.mostVisitedUrl.slug} - ${stats.mostVisitedUrl.visitCount} visits`
? stats.mostVisitedUrl.visitCount > 0
? `/${stats.mostVisitedUrl.slug} - ${stats.mostVisitedUrl.visitCount} visits`
: "No URLs have been visited yet"
: "Create your first shortened URL"
return (

View File

@@ -1,5 +1,6 @@
import { ReactNode } from "react"
import "./globals.css"
import { Toaster } from "@/components/ui/sonner"
export default function RootLayout({
children
@@ -10,6 +11,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<body className="antialiased">
{children}
<Toaster />
</body>
</html>
)

View File

@@ -8,6 +8,7 @@ import { addUrl } from "@/lib/actions/url"
import { urlFormSchema } from "@/lib/schema/url"
import { zodResolver } from "@hookform/resolvers/zod"
import { useForm } from "react-hook-form"
import { toast } from "sonner"
import { z } from "zod"
type UrlFormValues = z.infer<typeof urlFormSchema>
@@ -17,12 +18,19 @@ export function UrlFormCard() {
resolver: zodResolver(urlFormSchema),
defaultValues: {
url: "",
slug: ""
slug: undefined
}
})
async function handleSubmit(data: UrlFormValues) {
const res = await addUrl(data)
if (res.error) {
toast.error(res.message)
} else {
toast.success(res.message)
form.reset()
}
}
return (

View File

@@ -0,0 +1,379 @@
"use client"
import {
ColumnDef,
ColumnFiltersState,
flexRender,
getCoreRowModel,
getFilteredRowModel,
getPaginationRowModel,
getSortedRowModel,
SortingState,
useReactTable,
VisibilityState
} from "@tanstack/react-table"
import { ArrowUpDown, Check, Copy, ExternalLink, MoreHorizontal, Trash2, X } from "lucide-react"
import * as React from "react"
import { Button } from "@/components/ui/button"
import {
DropdownMenu,
DropdownMenuCheckboxItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger
} from "@/components/ui/dropdown-menu"
import { Input } from "@/components/ui/input"
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
import { urls } from "@/lib/drizzle/schema"
import { toast } from "sonner"
type UrlRecord = typeof urls.$inferSelect
function handleCopy(string: string) {
navigator.clipboard.writeText(string).then(() => {
toast.success("URL copied to clipboard")
}).catch(() => {
toast.error("Failed to copy URL")
})
}
export const columns: ColumnDef<UrlRecord>[] = [
{
accessorKey: "slug",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Slug
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => <div className="font-mono text-sm">{row.getValue("slug")}</div>
},
{
accessorKey: "url",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
URL
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => {
const url = row.getValue("url") as string
return (
<div className="max-w-[300px] truncate" title={url}>
{url}
</div>
)
}
},
{
accessorKey: "title",
header: "Title",
cell: ({ row }) => {
const title = row.getValue("title") as string | null
return <div className="max-w-[200px] truncate">{title || "No title"}</div>
}
},
{
accessorKey: "maxVisits",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Max Visits
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => {
const maxVisits = row.getValue("maxVisits") as number | null
return <div>{maxVisits || "Unlimited"}</div>
}
},
{
accessorKey: "expDate",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Expires
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => {
const expDate = row.getValue("expDate") as Date | null
if (!expDate) return <div>Never</div>
return <div>{expDate.toLocaleDateString()}</div>
}
},
{
accessorKey: "createdAt",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Created
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => {
const createdAt = row.getValue("createdAt") as Date
return <div>{createdAt.toLocaleDateString()}</div>
}
},
{
accessorKey: "updatedAt",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Updated
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => {
const updatedAt = row.getValue("updatedAt") as Date
return <div>{updatedAt.toLocaleDateString()}</div>
}
},
{
accessorKey: "crawlable",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Crawlable
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => {
const crawlable = row.getValue("crawlable") as boolean
return (
<div className="flex justify-center">
{crawlable ? <Check className="h-4 w-4 text-green-600" /> : <X className="h-4 w-4 text-red-600" />}
</div>
)
}
},
{
accessorKey: "forwardQueryParams",
header: ({ column }) => {
return (
<Button
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
>
Forward Params
<ArrowUpDown className="ml-2 h-4 w-4" />
</Button>
)
},
cell: ({ row }) => {
const forwardQueryParams = row.getValue("forwardQueryParams") as boolean
return (
<div className="flex justify-center">
{forwardQueryParams ? <Check className="h-4 w-4 text-green-600" /> : <X className="h-4 w-4 text-red-600" />}
</div>
)
}
},
{
id: "actions",
enableHiding: false,
cell: ({ row }) => {
const urlRecord = row.original
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" className="h-8 w-8 p-0">
<span className="sr-only">Open menu</span>
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuLabel>Actions</DropdownMenuLabel>
<DropdownMenuItem
onClick={() => {
handleCopy(`${window.location.origin}/r/${urlRecord.slug}`)
}}
>
<Copy className="mr-2 h-4 w-4" />
Copy URL
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem className="text-red-600">
<Trash2 className="mr-2 h-4 w-4" />
Delete
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
)
}
}
]
interface UrlsDataTableProps {
data: UrlRecord[]
}
export function UrlsDataTable({ data }: UrlsDataTableProps) {
const [sorting, setSorting] = React.useState<SortingState>([])
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
const table = useReactTable({
data,
columns,
onSortingChange: setSorting,
onColumnFiltersChange: setColumnFilters,
getCoreRowModel: getCoreRowModel(),
getPaginationRowModel: getPaginationRowModel(),
getSortedRowModel: getSortedRowModel(),
getFilteredRowModel: getFilteredRowModel(),
onColumnVisibilityChange: setColumnVisibility,
state: {
sorting,
columnFilters,
columnVisibility
}
})
return (
<div className="w-full">
<div className="flex items-center py-4">
<Input
placeholder="Filter URLs by slug..."
value={(table.getColumn("slug")?.getFilterValue() as string) ?? ""}
onChange={(event) => table.getColumn("slug")?.setFilterValue(event.target.value)}
className="max-w-sm"
/>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="outline" className="ml-auto">
Columns
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
{table
.getAllColumns()
.filter((column) => column.getCanHide())
.map((column) => {
return (
<DropdownMenuCheckboxItem
key={column.id}
className="capitalize"
checked={column.getIsVisible()}
onCheckedChange={(value) => column.toggleVisibility(!!value)}
>
{column.id}
</DropdownMenuCheckboxItem>
)
})}
</DropdownMenuContent>
</DropdownMenu>
</div>
<div className="rounded-md border">
<Table>
<TableHeader>
{table.getHeaderGroups().map((headerGroup) => (
<TableRow key={headerGroup.id}>
{headerGroup.headers.map((header) => {
return (
<TableHead key={header.id}>
{header.isPlaceholder
? null
: flexRender(
header.column.columnDef.header,
header.getContext()
)}
</TableHead>
)
})}
</TableRow>
))}
</TableHeader>
<TableBody>
{table.getRowModel().rows?.length ?
(
table.getRowModel().rows.map((row) => (
<TableRow
key={row.id}
data-state={row.getIsSelected() && "selected"}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id}>
{flexRender(
cell.column.columnDef.cell,
cell.getContext()
)}
</TableCell>
))}
</TableRow>
))
) :
(
<TableRow>
<TableCell
colSpan={columns.length}
className="h-24 text-center"
>
No results.
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
<div className="flex items-center justify-end space-x-2 py-4">
<div className="text-sm text-muted-foreground">
{table.getFilteredRowModel().rows.length} row(s) total.
</div>
<div className="space-x-2">
<Button
variant="outline"
size="sm"
onClick={() => table.previousPage()}
disabled={!table.getCanPreviousPage()}
>
Previous
</Button>
<Button
variant="outline"
size="sm"
onClick={() => table.nextPage()}
disabled={!table.getCanNextPage()}
>
Next
</Button>
</div>
</div>
</div>
)
}

View File

@@ -0,0 +1,25 @@
"use client"
import { useTheme } from "next-themes"
import { Toaster as Sonner, ToasterProps } from "sonner"
const Toaster = ({ ...props }: ToasterProps) => {
const { theme = "system" } = useTheme()
return (
<Sonner
theme={theme as ToasterProps["theme"]}
className="toaster group"
style={
{
"--normal-bg": "var(--popover)",
"--normal-text": "var(--popover-foreground)",
"--normal-border": "var(--border)",
} as React.CSSProperties
}
{...props}
/>
)
}
export { Toaster }

116
src/components/ui/table.tsx Normal file
View File

@@ -0,0 +1,116 @@
"use client"
import * as React from "react"
import { cn } from "@/lib/utils"
function Table({ className, ...props }: React.ComponentProps<"table">) {
return (
<div
data-slot="table-container"
className="relative w-full overflow-x-auto"
>
<table
data-slot="table"
className={cn("w-full caption-bottom text-sm", className)}
{...props}
/>
</div>
)
}
function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {
return (
<thead
data-slot="table-header"
className={cn("[&_tr]:border-b", className)}
{...props}
/>
)
}
function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {
return (
<tbody
data-slot="table-body"
className={cn("[&_tr:last-child]:border-0", className)}
{...props}
/>
)
}
function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {
return (
<tfoot
data-slot="table-footer"
className={cn(
"bg-muted/50 border-t font-medium [&>tr]:last:border-b-0",
className
)}
{...props}
/>
)
}
function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
return (
<tr
data-slot="table-row"
className={cn(
"hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",
className
)}
{...props}
/>
)
}
function TableHead({ className, ...props }: React.ComponentProps<"th">) {
return (
<th
data-slot="table-head"
className={cn(
"text-foreground h-10 px-2 text-left align-middle font-medium whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
className
)}
{...props}
/>
)
}
function TableCell({ className, ...props }: React.ComponentProps<"td">) {
return (
<td
data-slot="table-cell"
className={cn(
"p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
className
)}
{...props}
/>
)
}
function TableCaption({
className,
...props
}: React.ComponentProps<"caption">) {
return (
<caption
data-slot="table-caption"
className={cn("text-muted-foreground mt-4 text-sm", className)}
{...props}
/>
)
}
export {
Table,
TableHeader,
TableBody,
TableFooter,
TableHead,
TableRow,
TableCell,
TableCaption,
}

View File

@@ -1,7 +1,13 @@
import { eq } from "drizzle-orm";
import { eq, desc } from "drizzle-orm";
import { db } from "../drizzle/db";
import { urls } from "../drizzle/schema";
export function getAllUrls() {
return db.query.urls.findMany({
orderBy: desc(urls.createdAt)
})
}
export function insertUrl(data: typeof urls.$inferInsert) {
return db.insert(urls).values(data)
}

View File

@@ -2,6 +2,7 @@ export { account, session, user, verification } from "./auth-schema"
import { relations } from "drizzle-orm"
import { boolean, index, integer, pgTable, timestamp, uuid, varchar } from "drizzle-orm/pg-core"
import { generateRandomSlug } from "../randomSlug"
const createdAt = timestamp("created_at", { withTimezone: true }).defaultNow()
const updatedAt = timestamp("updated_at", { withTimezone: true }).defaultNow().$onUpdate(() => new Date())
@@ -9,7 +10,7 @@ const updatedAt = timestamp("updated_at", { withTimezone: true }).defaultNow().$
export const urls = pgTable("urls", {
id: uuid("id").primaryKey().notNull().defaultRandom(),
url: varchar("url").notNull(),
slug: varchar("slug").unique().notNull(),
slug: varchar("slug").unique().notNull().$defaultFn(() => generateRandomSlug()),
title: varchar("title"),
maxVisits: integer("max_visits"),
expDate: timestamp("exp_date", { withTimezone: true }),

10
src/lib/randomSlug.ts Normal file
View File

@@ -0,0 +1,10 @@
export function generateRandomSlug(): string {
const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
let result = '';
for (let i = 0; i < 5; i++) {
result += characters.charAt(Math.floor(Math.random() * characters.length));
}
return result;
}

View File

@@ -4,10 +4,10 @@ export const urlFormSchema = z.object({
url: z.string().url("Please enter a valid URL"),
slug: z
.string()
.min(1, "Slug is required")
.min(1, "Slug must be at least 1 character long")
.max(50, "Slug must be 50 characters or less")
.regex(
/^[a-zA-Z0-9-_]+$/,
"Slug can only contain letters, numbers, hyphens, and underscores"
)
).optional(),
})