应用 eslint 规则

This commit is contained in:
wmp
2025-09-23 11:30:06 +08:00
parent ee54aa2465
commit 02fc0676bf
37 changed files with 797 additions and 766 deletions

View File

@@ -1,4 +1,4 @@
import type { NextConfig } from "next"; import type { NextConfig } from 'next'
const nextConfig: NextConfig = { const nextConfig: NextConfig = {
/* config options here */ /* config options here */
@@ -6,6 +6,6 @@ const nextConfig: NextConfig = {
ignoreDuringBuilds: true, ignoreDuringBuilds: true,
}, },
output: 'standalone', output: 'standalone',
}; }
export default nextConfig; export default nextConfig

View File

@@ -1,5 +1,5 @@
const config = { const config = {
plugins: ["@tailwindcss/postcss"], plugins: ['@tailwindcss/postcss'],
}; }
export default config; export default config

View File

@@ -20,7 +20,7 @@ const formSchema = z.object({
export default function LoginPage() { export default function LoginPage() {
const router = useRouter() const router = useRouter()
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const setAuth = useAuthStore((state) => state.setAuth) const setAuth = useAuthStore(state => state.setAuth)
const form = useForm<z.infer<typeof formSchema>>({ const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),
defaultValues: { defaultValues: {
@@ -47,19 +47,21 @@ export default function LoginPage() {
} }
if (data.success) { if (data.success) {
toast.success("登录成功", { toast.success('登录成功', {
description: "正在跳转到仪表盘...", description: '正在跳转到仪表盘...',
}) })
setAuth(true) setAuth(true)
await new Promise(resolve => setTimeout(resolve, 1000)) await new Promise(resolve => setTimeout(resolve, 1000))
router.push('/dashboard') router.push('/dashboard')
router.refresh() router.refresh()
} }
} catch (error) { }
toast.error("登录失败", { catch (error) {
description: error instanceof Error ? error.message : "服务器连接失败,请稍后重试", toast.error('登录失败', {
description: error instanceof Error ? error.message : '服务器连接失败,请稍后重试',
}) })
} finally { }
finally {
setLoading(false) setLoading(false)
} }
} }
@@ -115,12 +117,14 @@ export default function LoginPage() {
disabled={loading} disabled={loading}
size="lg" size="lg"
> >
{loading ? ( {loading
? (
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<div className="h-4 w-4 animate-spin rounded-full border-2 border-current border-t-transparent" /> <div className="h-4 w-4 animate-spin rounded-full border-2 border-current border-t-transparent" />
... ...
</div> </div>
) : ( )
: (
'登录' '登录'
)} )}
</Button> </Button>

View File

@@ -13,21 +13,19 @@ export async function POST(request: Request) {
const body = await request.json() const body = await request.json()
const { account, password } = loginSchema.parse(body) const { account, password } = loginSchema.parse(body)
const user = await prisma.user.findFirst({ const user = await prisma.user.findFirst({
where: { where: {
OR: [ OR: [
{ account: account.trim() }, { account: account.trim() },
{ password: account.trim() } { password: account.trim() },
] ],
}, },
}) })
if (!user) { if (!user) {
return NextResponse.json( return NextResponse.json(
{ success: false, error: '用户不存在' }, { success: false, error: '用户不存在' },
{ status: 401 } { status: 401 },
) )
} }
@@ -37,7 +35,7 @@ export async function POST(request: Request) {
if (!passwordMatch) { if (!passwordMatch) {
return NextResponse.json({ return NextResponse.json({
success: false, success: false,
error: '密码错误' error: '密码错误',
}, { status: 401 }) }, { status: 401 })
} }
@@ -47,8 +45,8 @@ export async function POST(request: Request) {
data: { data: {
id: sessionToken, id: sessionToken,
userId: user.id, userId: user.id,
expires: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000) expires: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000),
} },
}) })
// 设置cookie // 设置cookie
@@ -57,23 +55,23 @@ export async function POST(request: Request) {
user: { user: {
id: user.id, id: user.id,
account: user.account, account: user.account,
name: user.name name: user.name,
} },
}) })
response.cookies.set('session', sessionToken, { response.cookies.set('session', sessionToken, {
httpOnly: true, httpOnly: true,
// secure: process.env.NODE_ENV === 'production', // secure: process.env.NODE_ENV === 'production',
maxAge: 60 * 60 * 24 * 7 maxAge: 60 * 60 * 24 * 7,
}) })
return response return response
}
} catch (error) { catch (error) {
console.error('登录错误:', error) console.error('登录错误:', error)
return NextResponse.json( return NextResponse.json(
{ success: false, error: '服务器错误,请稍后重试' }, { success: false, error: '服务器错误,请稍后重试' },
{ status: 500 } { status: 500 },
) )
} }
} }

View File

@@ -10,7 +10,7 @@ export async function POST() {
// 删除数据库中的session如果存在 // 删除数据库中的session如果存在
if (sessionToken) { if (sessionToken) {
await prisma.session.deleteMany({ await prisma.session.deleteMany({
where: { id: sessionToken } where: { id: sessionToken },
}).catch(() => { }).catch(() => {
// 忽略删除错误确保cookie被清除 // 忽略删除错误确保cookie被清除
}) })
@@ -27,12 +27,12 @@ export async function POST() {
}) })
return response return response
}
} catch (error) { catch (error) {
console.error('退出错误:', error) console.error('退出错误:', error)
return NextResponse.json( return NextResponse.json(
{ success: false, error: '退出失败' }, { success: false, error: '退出失败' },
{ status: 500 } { status: 500 },
) )
} }
} }

View File

@@ -4,7 +4,7 @@ import { prisma } from '@/lib/prisma'
// 处理 BigInt 序列化 // 处理 BigInt 序列化
function safeSerialize(data: unknown) { function safeSerialize(data: unknown) {
return JSON.parse(JSON.stringify(data, (key, value) => return JSON.parse(JSON.stringify(data, (key, value) =>
typeof value === 'bigint' ? value.toString() : value typeof value === 'bigint' ? value.toString() : value,
)) ))
} }
@@ -29,7 +29,8 @@ export async function GET(request: NextRequest) {
default: default:
return NextResponse.json({ error: 'Invalid report type' }, { status: 400 }) return NextResponse.json({ error: 'Invalid report type' }, { status: 400 })
} }
} catch (error) { }
catch (error) {
console.error('API Error:', error) console.error('API Error:', error)
return NextResponse.json({ error: 'Internal server error' }, { status: 500 }) return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
} }
@@ -44,7 +45,8 @@ async function getGatewayInfo() {
ORDER BY macaddr ORDER BY macaddr
` `
return NextResponse.json(safeSerialize(result)) return NextResponse.json(safeSerialize(result))
} catch (error) { }
catch (error) {
console.error('Gateway info query error:', error) console.error('Gateway info query error:', error)
return NextResponse.json({ error: '查询网关信息失败' }, { status: 500 }) return NextResponse.json({ error: '查询网关信息失败' }, { status: 500 })
} }
@@ -60,13 +62,13 @@ async function getGatewayConfig(request: NextRequest) {
// 定义类型接口 // 定义类型接口
interface GatewayRecord { interface GatewayRecord {
edge: string | null; edge: string | null
city: string | null; city: string | null
user: string | null; user: string | null
public: string | null; public: string | null
inner_ip: string | null; inner_ip: string | null
ischange: boolean | number | null; ischange: boolean | number | null
isonline: boolean | number | null; isonline: boolean | number | null
} }
// 获取总数 // 获取总数
@@ -82,7 +84,8 @@ async function getGatewayConfig(request: NextRequest) {
WHERE gateway.macaddr = ? WHERE gateway.macaddr = ?
` `
totalCountParams = [macAddress] totalCountParams = [macAddress]
} else { }
else {
totalCountQuery = ` totalCountQuery = `
SELECT COUNT(*) as total SELECT COUNT(*) as total
FROM gateway FROM gateway
@@ -91,7 +94,7 @@ async function getGatewayConfig(request: NextRequest) {
const totalCountResult = await prisma.$queryRawUnsafe<[{ total: bigint }]>( const totalCountResult = await prisma.$queryRawUnsafe<[{ total: bigint }]>(
totalCountQuery, totalCountQuery,
...totalCountParams ...totalCountParams,
) )
const totalCount = Number(totalCountResult[0]?.total || 0) const totalCount = Number(totalCountResult[0]?.total || 0)
@@ -110,7 +113,8 @@ async function getGatewayConfig(request: NextRequest) {
if (macAddress) { if (macAddress) {
query += ' WHERE gateway.macaddr = ?' query += ' WHERE gateway.macaddr = ?'
params = [macAddress] params = [macAddress]
} else { }
else {
query += ' LIMIT ? OFFSET ?' query += ' LIMIT ? OFFSET ?'
params.push(limit, offset) params.push(limit, offset)
} }
@@ -122,9 +126,10 @@ async function getGatewayConfig(request: NextRequest) {
data: safeSerialize(result), data: safeSerialize(result),
totalCount: totalCount, totalCount: totalCount,
currentPage: Math.floor(offset / limit) + 1, currentPage: Math.floor(offset / limit) + 1,
totalPages: Math.ceil(totalCount / limit) totalPages: Math.ceil(totalCount / limit),
}) })
} catch (error) { }
catch (error) {
console.error('Gateway config query error:', error) console.error('Gateway config query error:', error)
return NextResponse.json({ error: '查询网关配置失败' }, { status: 500 }) return NextResponse.json({ error: '查询网关配置失败' }, { status: 500 })
} }
@@ -140,7 +145,8 @@ async function getCityConfigCount() {
GROUP BY c.city GROUP BY c.city
` `
return NextResponse.json(safeSerialize(result)) return NextResponse.json(safeSerialize(result))
} catch (error) { }
catch (error) {
console.error('City config count query error:', error) console.error('City config count query error:', error)
return NextResponse.json({ error: '查询城市配置失败' }, { status: 500 }) return NextResponse.json({ error: '查询城市配置失败' }, { status: 500 })
} }
@@ -169,7 +175,8 @@ async function getCityNodeCount() {
count desc count desc
` `
return NextResponse.json(safeSerialize(result)) return NextResponse.json(safeSerialize(result))
} catch (error) { }
catch (error) {
console.error('City node count query error:', error) console.error('City node count query error:', error)
return NextResponse.json({ error: '查询城市节点失败' }, { status: 500 }) return NextResponse.json({ error: '查询城市节点失败' }, { status: 500 })
} }
@@ -216,13 +223,13 @@ async function getAllocationStatus(request: NextRequest) {
cityhash.macaddr IS NOT NULL; cityhash.macaddr IS NOT NULL;
` `
return NextResponse.json(safeSerialize(result)) return NextResponse.json(safeSerialize(result))
}
} catch (error) { catch (error) {
console.error('Allocation status query error:', error) console.error('Allocation status query error:', error)
const errorMessage = error instanceof Error ? error.message : 'Unknown error' const errorMessage = error instanceof Error ? error.message : 'Unknown error'
return NextResponse.json( return NextResponse.json(
{ error: '查询分配状态失败: ' + errorMessage }, { error: '查询分配状态失败: ' + errorMessage },
{ status: 500 } { status: 500 },
) )
} }
} }
@@ -254,10 +261,10 @@ async function getEdgeNodes(request: NextRequest) {
data: safeSerialize(result), data: safeSerialize(result),
totalCount: totalCount, totalCount: totalCount,
currentPage: Math.floor(offset / limit) + 1, currentPage: Math.floor(offset / limit) + 1,
totalPages: Math.ceil(totalCount / limit) totalPages: Math.ceil(totalCount / limit),
}) })
}
} catch (error) { catch (error) {
console.error('Edge nodes query error:', error) console.error('Edge nodes query error:', error)
return NextResponse.json({ error: '查询边缘节点失败' }, { status: 500 }) return NextResponse.json({ error: '查询边缘节点失败' }, { status: 500 })
} }

View File

@@ -20,14 +20,14 @@ export async function GET() {
return NextResponse.json({ return NextResponse.json({
success: true, success: true,
users users,
}) })
}
} catch (error) { catch (error) {
console.error('获取用户列表错误:', error) console.error('获取用户列表错误:', error)
return NextResponse.json( return NextResponse.json(
{ success: false, error: '服务器错误,请稍后重试' }, { success: false, error: '服务器错误,请稍后重试' },
{ status: 500 } { status: 500 },
) )
} }
} }
@@ -39,13 +39,13 @@ export async function POST(request: Request) {
// 检查用户是否已存在 // 检查用户是否已存在
const existingUser = await prisma.user.findUnique({ const existingUser = await prisma.user.findUnique({
where: { account } where: { account },
}) })
if (existingUser) { if (existingUser) {
return NextResponse.json( return NextResponse.json(
{ success: false, error: '用户账号已存在' }, { success: false, error: '用户账号已存在' },
{ status: 400 } { status: 400 },
) )
} }
@@ -66,19 +66,18 @@ export async function POST(request: Request) {
return NextResponse.json({ return NextResponse.json({
success: true, success: true,
user: userWithoutPassword user: userWithoutPassword,
}) })
}
} catch (error) { catch (error) {
console.error('创建用户错误:', error) console.error('创建用户错误:', error)
return NextResponse.json( return NextResponse.json(
{ success: false, error: '服务器错误,请稍后重试' }, { success: false, error: '服务器错误,请稍后重试' },
{ status: 500 } { status: 500 },
) )
} }
} }
// 删除用户 // 删除用户
export async function DELETE(request: Request) { export async function DELETE(request: Request) {
try { try {
@@ -89,7 +88,7 @@ export async function DELETE(request: Request) {
if (!id) { if (!id) {
return NextResponse.json( return NextResponse.json(
{ success: false, error: '用户ID不能为空' }, { success: false, error: '用户ID不能为空' },
{ status: 400 } { status: 400 },
) )
} }
@@ -97,36 +96,37 @@ export async function DELETE(request: Request) {
if (isNaN(userId)) { if (isNaN(userId)) {
return NextResponse.json( return NextResponse.json(
{ success: false, error: '无效的用户ID' }, { success: false, error: '无效的用户ID' },
{ status: 400 } { status: 400 },
) )
} }
// 检查用户是否存在 // 检查用户是否存在
const existingUser = await prisma.user.findUnique({ const existingUser = await prisma.user.findUnique({
where: { id: userId } where: { id: userId },
}) })
if (!existingUser) { if (!existingUser) {
return NextResponse.json( return NextResponse.json(
{ success: false, error: '用户不存在' }, { success: false, error: '用户不存在' },
{ status: 404 } { status: 404 },
) )
} }
// 删除用户 // 删除用户
await prisma.user.delete({ await prisma.user.delete({
where: { id: userId } where: { id: userId },
}) })
return NextResponse.json({ return NextResponse.json({
success: true, success: true,
message: '用户删除成功' message: '用户删除成功',
}) })
} catch (error) { }
catch (error) {
console.error('删除用户错误:', error) console.error('删除用户错误:', error)
return NextResponse.json( return NextResponse.json(
{ success: false, error: '服务器错误,请稍后重试' }, { success: false, error: '服务器错误,请稍后重试' },
{ status: 500 } { status: 500 },
) )
} }
} }

View File

@@ -28,7 +28,6 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
// 获取时间参数(小时数) // 获取时间参数(小时数)
const getTimeHours = useCallback(() => { const getTimeHours = useCallback(() => {
if (timeFilter === 'custom' && customHours) { if (timeFilter === 'custom' && customHours) {
const hours = parseInt(customHours) const hours = parseInt(customHours)
return isNaN(hours) ? 24 : Math.max(1, hours) // 默认24小时最少1小时 return isNaN(hours) ? 24 : Math.max(1, hours) // 默认24小时最少1小时
@@ -39,8 +38,8 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
// 计算超额量 // 计算超额量
const calculateOverage = (assigned: number, count: number) => { const calculateOverage = (assigned: number, count: number) => {
const overage = assigned - count; const overage = assigned - count
return Math.max(0, overage); return Math.max(0, overage)
} }
const fetchData = useCallback(async () => { const fetchData = useCallback(async () => {
@@ -57,7 +56,7 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
const result = await response.json() const result = await response.json()
// 数据验证 // 数据验证
const validatedData = (result as ApiAllocationStatus[]).map((item) => ({ const validatedData = (result as ApiAllocationStatus[]).map(item => ({
city: item.city || '未知', city: item.city || '未知',
count: validateNumber(item.count), count: validateNumber(item.count),
assigned: validateNumber(item.assigned), assigned: validateNumber(item.assigned),
@@ -66,10 +65,12 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
const sortedData = validatedData.sort((a, b) => b.count - a.count) const sortedData = validatedData.sort((a, b) => b.count - a.count)
setData(sortedData) setData(sortedData)
} catch (error) { }
catch (error) {
console.error('Failed to fetch allocation status:', error) console.error('Failed to fetch allocation status:', error)
setError(error instanceof Error ? error.message : 'Unknown error') setError(error instanceof Error ? error.message : 'Unknown error')
} finally { }
finally {
setLoading(false) setLoading(false)
} }
}, [getTimeHours]) }, [getTimeHours])
@@ -92,7 +93,7 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
<label className="font-medium">:</label> <label className="font-medium">:</label>
<select <select
value={timeFilter} value={timeFilter}
onChange={(e) => setTimeFilter(e.target.value)} onChange={e => setTimeFilter(e.target.value)}
className="border rounded p-2" className="border rounded p-2"
> >
<option value="1">1</option> <option value="1">1</option>
@@ -110,7 +111,7 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
min="1" min="1"
max="720" max="720"
value={customHours} value={customHours}
onChange={(e) => setCustomHours(e.target.value)} onChange={e => setCustomHours(e.target.value)}
placeholder="输入小时数" placeholder="输入小时数"
className="border rounded p-2 w-24" className="border rounded p-2 w-24"
/> />
@@ -126,7 +127,7 @@ export default function AllocationStatus({ detailed = false }: { detailed?: bool
</button> </button>
</div> </div>
<div className='flex gap-6 overflow-hidden'> <div className="flex gap-6 overflow-hidden">
<div className="flex w-full"> <div className="flex w-full">
<Table> <Table>
<TableHeader> <TableHeader>

View File

@@ -24,9 +24,11 @@ export default function CityNodeStats() {
const response = await fetch('/api/stats?type=city_node_count') const response = await fetch('/api/stats?type=city_node_count')
const result = await response.json() const result = await response.json()
setData(result) setData(result)
} catch (error) { }
catch (error) {
console.error('获取城市节点数据失败:', error) console.error('获取城市节点数据失败:', error)
} finally { }
finally {
setLoading(false) setLoading(false)
} }
} }
@@ -50,7 +52,7 @@ export default function CityNodeStats() {
</div> </div>
<div className="flex overflow-hidden "> <div className="flex overflow-hidden ">
<div className='flex w-full'> <div className="flex w-full">
<Table> <Table>
<TableHeader> <TableHeader>
<TableRow className="bg-gray-50"> <TableRow className="bg-gray-50">
@@ -72,7 +74,8 @@ export default function CityNodeStats() {
<TableCell className="px-4 py-2">{item.hash}</TableCell> <TableCell className="px-4 py-2">{item.hash}</TableCell>
<TableCell className="px-4 py-2"> <TableCell className="px-4 py-2">
<span className="bg-gray-100 px-2 py-1 rounded text-gray-700"> <span className="bg-gray-100 px-2 py-1 rounded text-gray-700">
{item.label}</span> {item.label}
</span>
</TableCell> </TableCell>
<TableCell className="px-4 py-2">{item.offset}</TableCell> <TableCell className="px-4 py-2">{item.offset}</TableCell>
</TableRow> </TableRow>

View File

@@ -55,7 +55,7 @@ export default function Edge() {
online: number online: number
} }
const validatedData = (result.data as ResultEdge[]).map((item) => ({ const validatedData = (result.data as ResultEdge[]).map(item => ({
id: validateNumber(item.id), id: validateNumber(item.id),
macaddr: item.macaddr || '', macaddr: item.macaddr || '',
city: item.city || '', city: item.city || '',
@@ -64,15 +64,17 @@ export default function Edge() {
single: item.single, single: item.single,
sole: item.sole, sole: item.sole,
arch: validateNumber(item.arch), arch: validateNumber(item.arch),
online: validateNumber(item.online) online: validateNumber(item.online),
})) }))
setData(validatedData) setData(validatedData)
setTotalItems(result.totalCount || 0) setTotalItems(result.totalCount || 0)
} catch (error) { }
catch (error) {
console.error('Failed to fetch edge nodes:', error) console.error('Failed to fetch edge nodes:', error)
setError(error instanceof Error ? error.message : '获取边缘节点数据失败') setError(error instanceof Error ? error.message : '获取边缘节点数据失败')
} finally { }
finally {
setLoading(false) setLoading(false)
} }
} }
@@ -186,7 +188,7 @@ const getExclusiveIPColor = (value: number | boolean): string => {
</div> </div>
) : ( ) : (
<> <>
<div className='flex gap-6 overflow-hidden'> <div className="flex gap-6 overflow-hidden">
<div className="flex-3 w-full overflow-y-auto"> <div className="flex-3 w-full overflow-y-auto">
<Table> <Table>
<TableHeader> <TableHeader>
@@ -209,11 +211,15 @@ const getExclusiveIPColor = (value: number | boolean): string => {
<TableCell className="px-4 py-3 text-sm font-mono text-green-600">{item.public}</TableCell> <TableCell className="px-4 py-3 text-sm font-mono text-green-600">{item.public}</TableCell>
<TableCell className="px-4 py-3 text-sm text-gray-700"> <TableCell className="px-4 py-3 text-sm text-gray-700">
<span className={`px-2 py-1 rounded-full text-xs ${ <span className={`px-2 py-1 rounded-full text-xs ${
item.isp === '移动' ? 'bg-blue-100 text-blue-800' : item.isp === '移动'
item.isp === '电信' ? 'bg-purple-100 text-purple-800' : ? 'bg-blue-100 text-blue-800'
item.isp === '联通' ? 'bg-red-100 text-red-800' : : item.isp === '电信'
'bg-gray-100 text-gray-800' ? 'bg-purple-100 text-purple-800'
}`}> : item.isp === '联通'
? 'bg-red-100 text-red-800'
: 'bg-gray-100 text-gray-800'
}`}
>
{item.isp} {item.isp}
</span> </span>
</TableCell> </TableCell>

View File

@@ -43,7 +43,8 @@ function GatewayConfigContent() {
setMacAddress(urlMac) setMacAddress(urlMac)
setCurrentPage(1) // 重置到第一页 setCurrentPage(1) // 重置到第一页
fetchData(urlMac, 1, itemsPerPage) fetchData(urlMac, 1, itemsPerPage)
} else { }
else {
setMacAddress('') setMacAddress('')
setCurrentPage(1) // 重置到第一页 setCurrentPage(1) // 重置到第一页
fetchData('', 1, itemsPerPage) fetchData('', 1, itemsPerPage)
@@ -75,7 +76,8 @@ function GatewayConfigContent() {
if (!result.data || result.data.length === 0) { if (!result.data || result.data.length === 0) {
if (mac.trim()) { if (mac.trim()) {
setError(`未找到MAC地址为 ${mac} 的网关配置信息`) setError(`未找到MAC地址为 ${mac} 的网关配置信息`)
} else { }
else {
setError('未找到任何网关配置信息') setError('未找到任何网关配置信息')
} }
setData([]) setData([])
@@ -86,12 +88,14 @@ function GatewayConfigContent() {
setData(result.data) setData(result.data)
setTotalItems(result.totalCount || 0) setTotalItems(result.totalCount || 0)
} catch (error) { }
catch (error) {
console.error('获取网关配置失败:', error) console.error('获取网关配置失败:', error)
setError(error instanceof Error ? error.message : '获取网关配置失败') setError(error instanceof Error ? error.message : '获取网关配置失败')
setData([]) setData([])
setTotalItems(0) setTotalItems(0)
} finally { }
finally {
setLoading(false) setLoading(false)
} }
} }
@@ -150,7 +154,7 @@ function GatewayConfigContent() {
<input <input
type="text" type="text"
value={macAddress} value={macAddress}
onChange={(e) => setMacAddress(e.target.value)} onChange={e => setMacAddress(e.target.value)}
placeholder="输入MAC地址查询" placeholder="输入MAC地址查询"
className="px-4 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" className="px-4 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
/> />
@@ -181,7 +185,7 @@ function GatewayConfigContent() {
</div> </div>
) : data.length > 0 ? ( ) : data.length > 0 ? (
<> <>
<div className='flex gap-6 overflow-hidden'> <div className="flex gap-6 overflow-hidden">
<div className="flex-3 w-full flex"> <div className="flex-3 w-full flex">
<Table> <Table>
<TableHeader> <TableHeader>
@@ -268,14 +272,14 @@ function GatewayConfigContent() {
export default function GatewayConfig() { export default function GatewayConfig() {
return ( return (
<Suspense fallback={ <Suspense fallback={(
<div className="bg-white shadow rounded-lg p-6"> <div className="bg-white shadow rounded-lg p-6">
<div className="text-center py-12"> <div className="text-center py-12">
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-500 mx-auto"></div> <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-500 mx-auto"></div>
<p className="mt-4 text-gray-600">...</p> <p className="mt-4 text-gray-600">...</p>
</div> </div>
</div> </div>
}> )}>
<GatewayConfigContent /> <GatewayConfigContent />
</Suspense> </Suspense>
) )

View File

@@ -25,11 +25,11 @@ type FilterSchema = z.infer<typeof filterSchema>
// IP地址排序函数 // IP地址排序函数
const sortByIpAddress = (a: string, b: string): number => { const sortByIpAddress = (a: string, b: string): number => {
const ipToNumber = (ip: string): number => { const ipToNumber = (ip: string): number => {
const parts = ip.split('.').map(part => parseInt(part, 10)); const parts = ip.split('.').map(part => parseInt(part, 10))
return (parts[0] << 24) + (parts[1] << 16) + (parts[2] << 8) + parts[3]; return (parts[0] << 24) + (parts[1] << 16) + (parts[2] << 8) + parts[3]
}; }
return ipToNumber(a) - ipToNumber(b); return ipToNumber(a) - ipToNumber(b)
} }
export default function Gatewayinfo() { export default function Gatewayinfo() {
@@ -58,12 +58,14 @@ useEffect(() => {
if (statusFilter === 'all') { if (statusFilter === 'all') {
setFilteredData(data) setFilteredData(data)
} else { }
else {
const enableValue = parseInt(statusFilter) const enableValue = parseInt(statusFilter)
// 添加 NaN 检查 // 添加 NaN 检查
if (isNaN(enableValue)) { if (isNaN(enableValue)) {
setFilteredData(data) setFilteredData(data)
} else { }
else {
setFilteredData(data.filter(item => item.enable === enableValue)) setFilteredData(data.filter(item => item.enable === enableValue))
} }
} }
@@ -80,14 +82,16 @@ useEffect(() => {
const result = await response.json() const result = await response.json()
// const sortedData = result.sort(( a, b) => Number(a.inner_ip) - Number(b.inner_ip)) // const sortedData = result.sort(( a, b) => Number(a.inner_ip) - Number(b.inner_ip))
const sortedData = result.sort((a: GatewayInfo, b: GatewayInfo) => const sortedData = result.sort((a: GatewayInfo, b: GatewayInfo) =>
sortByIpAddress(a.inner_ip, b.inner_ip) sortByIpAddress(a.inner_ip, b.inner_ip),
) )
setData(sortedData) setData(sortedData)
setFilteredData(sortedData) // 初始化时设置filteredData setFilteredData(sortedData) // 初始化时设置filteredData
} catch (error) { }
catch (error) {
console.error('Failed to fetch gateway info:', error) console.error('Failed to fetch gateway info:', error)
setError(error instanceof Error ? error.message : '获取网关信息失败') setError(error instanceof Error ? error.message : '获取网关信息失败')
} finally { }
finally {
setLoading(false) setLoading(false)
} }
} }
@@ -122,8 +126,8 @@ useEffect(() => {
return ( return (
<div className="flex flex-col bg-white shadow rounded-lg p-6 overflow-hidden"> <div className="flex flex-col bg-white shadow rounded-lg p-6 overflow-hidden">
<div className='flex gap-6'> <div className="flex gap-6">
<div className='flex flex-3 justify-between '> <div className="flex flex-3 justify-between ">
<span className="text-lg pt-2 font-semibold mb-4"></span> <span className="text-lg pt-2 font-semibold mb-4"></span>
<Form {...form}> <Form {...form}>
<form className="flex items-center gap-4"> <form className="flex items-center gap-4">
@@ -153,10 +157,10 @@ useEffect(() => {
</form> </form>
</Form> </Form>
</div> </div>
<div className='flex flex-1'></div> <div className="flex flex-1"></div>
</div> </div>
<div className='flex gap-6 overflow-hidden'> <div className="flex gap-6 overflow-hidden">
<div className="flex-3 w-full flex"> <div className="flex-3 w-full flex">
<Table> <Table>
<TableHeader> <TableHeader>
@@ -176,7 +180,7 @@ useEffect(() => {
<TableCell className="px-4 py-2"> <TableCell className="px-4 py-2">
<button <button
onClick={() => { onClick={() => {
router.push(`/dashboard?tab=gateway&mac=${item.macaddr}`); router.push(`/dashboard?tab=gateway&mac=${item.macaddr}`)
}} }}
className="font-mono text-blue-600 hover:text-blue-800 hover:underline cursor-pointer" className="font-mono text-blue-600 hover:text-blue-800 hover:underline cursor-pointer"
> >

View File

@@ -9,7 +9,7 @@ import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/com
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form' import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'
import { User, Lock, Search, Trash2, Plus, X } from 'lucide-react' import { User, Lock, Search, Trash2, Plus, X } from 'lucide-react'
import { toast, Toaster } from 'sonner' import { toast, Toaster } from 'sonner'
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow, } from "@/components/ui/table" import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'
// 用户类型定义 // 用户类型定义
interface UserData { interface UserData {
@@ -22,12 +22,11 @@ const formSchema = z.object({
account: z.string().min(3, '账号至少需要3个字符'), account: z.string().min(3, '账号至少需要3个字符'),
password: z.string().min(6, '密码至少需要6个字符'), password: z.string().min(6, '密码至少需要6个字符'),
confirmPassword: z.string().min(6, '密码至少需要6个字符'), confirmPassword: z.string().min(6, '密码至少需要6个字符'),
}).refine((data) => data.password === data.confirmPassword, { }).refine(data => data.password === data.confirmPassword, {
message: "密码不匹配", message: '密码不匹配',
path: ["confirmPassword"], path: ['confirmPassword'],
}) })
export default function Settings() { export default function Settings() {
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [users, setUsers] = useState<UserData[]>([]) const [users, setUsers] = useState<UserData[]>([])
@@ -43,7 +42,6 @@ export default function Settings() {
}, },
}) })
// 获取用户列表 // 获取用户列表
const fetchUsers = async () => { const fetchUsers = async () => {
try { try {
@@ -57,9 +55,10 @@ export default function Settings() {
if (data.success) { if (data.success) {
setUsers(data.users) setUsers(data.users)
} }
} catch (error) { }
toast.error("获取用户列表失败", { catch (error) {
description: error instanceof Error ? error.message : "服务器连接失败,请稍后重试", toast.error('获取用户列表失败', {
description: error instanceof Error ? error.message : '服务器连接失败,请稍后重试',
}) })
} }
} }
@@ -91,25 +90,26 @@ export default function Settings() {
} }
if (data.success) { if (data.success) {
toast.success("用户创建成功", { toast.success('用户创建成功', {
description: "新账户已成功添加", description: '新账户已成功添加',
}) })
form.reset() form.reset()
setIsCreateMode(false) setIsCreateMode(false)
fetchUsers() // 刷新用户列表 fetchUsers() // 刷新用户列表
} }
} catch (error) { }
toast.error("创建用户失败", { catch (error) {
description: error instanceof Error ? error.message : "服务器连接失败,请稍后重试", toast.error('创建用户失败', {
description: error instanceof Error ? error.message : '服务器连接失败,请稍后重试',
}) })
} finally { }
finally {
setLoading(false) setLoading(false)
} }
} }
// 删除用户 // 删除用户
const handleDeleteUser = async (userId: number) => { const handleDeleteUser = async (userId: number) => {
if (!confirm('确定要删除这个用户吗?此操作不可恢复。')) { if (!confirm('确定要删除这个用户吗?此操作不可恢复。')) {
return return
} }
@@ -127,21 +127,22 @@ const handleDeleteUser = async (userId: number) => {
} }
if (data.success) { if (data.success) {
toast.success("用户删除成功", { toast.success('用户删除成功', {
description: "用户账户已删除", description: '用户账户已删除',
}) })
fetchUsers() // 刷新用户列表 fetchUsers() // 刷新用户列表
} }
} catch (error) { }
toast.error("删除用户失败", { catch (error) {
description: error instanceof Error ? error.message : "服务器连接失败,请稍后重试", toast.error('删除用户失败', {
description: error instanceof Error ? error.message : '服务器连接失败,请稍后重试',
}) })
} }
} }
// 过滤用户列表 // 过滤用户列表
const filteredUsers = users.filter(user => const filteredUsers = users.filter(user =>
user.account.toLowerCase().includes(searchTerm.toLowerCase()) user.account.toLowerCase().includes(searchTerm.toLowerCase()),
) )
return ( return (
@@ -277,7 +278,7 @@ const handleDeleteUser = async (userId: number) => {
placeholder="搜索用户..." placeholder="搜索用户..."
className="pl-8" className="pl-8"
value={searchTerm} value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)} onChange={e => setSearchTerm(e.target.value)}
/> />
</div> </div>
@@ -298,7 +299,7 @@ const handleDeleteUser = async (userId: number) => {
</TableCell> </TableCell>
</TableRow> </TableRow>
) : ( ) : (
filteredUsers.map((user) => ( filteredUsers.map(user => (
<TableRow key={user.id}> <TableRow key={user.id}>
<TableCell className="font-medium">{user.account}</TableCell> <TableCell className="font-medium">{user.account}</TableCell>
<TableCell>{new Date(user.createdAt).toLocaleDateString()}</TableCell> <TableCell>{new Date(user.createdAt).toLocaleDateString()}</TableCell>
@@ -309,7 +310,8 @@ const handleDeleteUser = async (userId: number) => {
size="sm" size="sm"
className="h-5 border-0 hover:bg-transparent" className="h-5 border-0 hover:bg-transparent"
onClick={() => handleDeleteUser(Number(user.id))} onClick={() => handleDeleteUser(Number(user.id))}
><Trash2 className="h-4 w-4" /></Button> ><Trash2 className="h-4 w-4" />
</Button>
</div> </div>
</TableCell> </TableCell>
</TableRow> </TableRow>

View File

@@ -16,7 +16,7 @@ const tabs = [
{ id: 'city', label: '城市信息' }, { id: 'city', label: '城市信息' },
{ id: 'allocation', label: '分配状态' }, { id: 'allocation', label: '分配状态' },
{ id: 'edge', label: '节点信息' }, { id: 'edge', label: '节点信息' },
{ id: 'setting', label: '设置'} { id: 'setting', label: '设置' },
] ]
function DashboardContent() { function DashboardContent() {
@@ -45,12 +45,15 @@ function DashboardContent() {
// 退出成功后跳转到登录页 // 退出成功后跳转到登录页
router.push('/login') router.push('/login')
router.refresh() router.refresh()
} else { }
else {
console.error('退出失败') console.error('退出失败')
} }
} catch (error) { }
catch (error) {
console.error('退出错误:', error) console.error('退出错误:', error)
} finally { }
finally {
setIsLoading(false) setIsLoading(false)
} }
} }
@@ -88,7 +91,7 @@ function DashboardContent() {
<div className="flex flex-3 overflow-hidden px-4 sm:px-6 lg:px-8 py-8"> <div className="flex flex-3 overflow-hidden px-4 sm:px-6 lg:px-8 py-8">
<div className="border-b border-gray-200 mb-6"> <div className="border-b border-gray-200 mb-6">
<nav className="flex flex-col w-64 -mb-px space-x-8"> <nav className="flex flex-col w-64 -mb-px space-x-8">
{tabs.map((tab) => ( {tabs.map(tab => (
<button <button
key={tab.id} key={tab.id}
onClick={() => handleTabClick(tab.id)} onClick={() => handleTabClick(tab.id)}
@@ -119,14 +122,14 @@ function DashboardContent() {
export default function Dashboard() { export default function Dashboard() {
return ( return (
<Suspense fallback={ <Suspense fallback={(
<div className=" bg-gray-100 flex items-center justify-center"> <div className=" bg-gray-100 flex items-center justify-center">
<div className="text-center"> <div className="text-center">
<div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500 mx-auto"></div> <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500 mx-auto"></div>
<p className="mt-4 text-gray-600">...</p> <p className="mt-4 text-gray-600">...</p>
</div> </div>
</div> </div>
}> )}>
<DashboardContent /> <DashboardContent />
</Suspense> </Suspense>
) )

View File

@@ -116,6 +116,7 @@
* { * {
@apply border-border outline-ring/50; @apply border-border outline-ring/50;
} }
body { body {
@apply bg-background text-foreground; @apply bg-background text-foreground;
} }

View File

@@ -1,25 +1,23 @@
import type { Metadata } from "next"; import type { Metadata } from 'next'
import "./globals.css"; import './globals.css'
import { Toaster } from "sonner"; import { Toaster } from 'sonner'
export const metadata: Metadata = { export const metadata: Metadata = {
title: "Create Next App", title: 'Create Next App',
description: "Generated by create next app", description: 'Generated by create next app',
}; }
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
children: React.ReactNode; children: React.ReactNode
}>) { }>) {
return ( return (
<html lang="zh-Hans"> <html lang="zh-Hans">
<body <body className="antialiased">
className={`antialiased`}
>
{children} {children}
<Toaster richColors /> <Toaster richColors />
</body> </body>
</html> </html>
); )
} }

View File

@@ -1,29 +1,29 @@
import * as React from "react" import * as React from 'react'
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from 'class-variance-authority'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
const alertVariants = cva( const alertVariants = cva(
"relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current", 'relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current',
{ {
variants: { variants: {
variant: { variant: {
default: "bg-card text-card-foreground", default: 'bg-card text-card-foreground',
destructive: destructive:
"text-destructive bg-card [&>svg]:text-current *:data-[slot=alert-description]:text-destructive/90", 'text-destructive bg-card [&>svg]:text-current *:data-[slot=alert-description]:text-destructive/90',
}, },
}, },
defaultVariants: { defaultVariants: {
variant: "default", variant: 'default',
},
}, },
}
) )
function Alert({ function Alert({
className, className,
variant, variant,
...props ...props
}: React.ComponentProps<"div"> & VariantProps<typeof alertVariants>) { }: React.ComponentProps<'div'> & VariantProps<typeof alertVariants>) {
return ( return (
<div <div
data-slot="alert" data-slot="alert"
@@ -34,13 +34,13 @@ function Alert({
) )
} }
function AlertTitle({ className, ...props }: React.ComponentProps<"div">) { function AlertTitle({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="alert-title" data-slot="alert-title"
className={cn( className={cn(
"col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight", 'col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight',
className className,
)} )}
{...props} {...props}
/> />
@@ -50,13 +50,13 @@ function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
function AlertDescription({ function AlertDescription({
className, className,
...props ...props
}: React.ComponentProps<"div">) { }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="alert-description" data-slot="alert-description"
className={cn( className={cn(
"text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed", 'text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed',
className className,
)} )}
{...props} {...props}
/> />

View File

@@ -1,28 +1,28 @@
import * as React from "react" import * as React from 'react'
import { Slot } from "@radix-ui/react-slot" import { Slot } from '@radix-ui/react-slot'
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from 'class-variance-authority'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
const badgeVariants = cva( const badgeVariants = cva(
"inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden", 'inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden',
{ {
variants: { variants: {
variant: { variant: {
default: default:
"border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90", 'border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90',
secondary: secondary:
"border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90", 'border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90',
destructive: destructive:
"border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60", 'border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60',
outline: outline:
"text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground", 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground',
}, },
}, },
defaultVariants: { defaultVariants: {
variant: "default", variant: 'default',
},
}, },
}
) )
function Badge({ function Badge({
@@ -30,9 +30,9 @@ function Badge({
variant, variant,
asChild = false, asChild = false,
...props ...props
}: React.ComponentProps<"span"> & }: React.ComponentProps<'span'>
VariantProps<typeof badgeVariants> & { asChild?: boolean }) { & VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
const Comp = asChild ? Slot : "span" const Comp = asChild ? Slot : 'span'
return ( return (
<Comp <Comp

View File

@@ -1,38 +1,38 @@
import * as React from "react" import * as React from 'react'
import { Slot } from "@radix-ui/react-slot" import { Slot } from '@radix-ui/react-slot'
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from 'class-variance-authority'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
const buttonVariants = cva( const buttonVariants = cva(
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*=\'size-\'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
{ {
variants: { variants: {
variant: { variant: {
default: default:
"bg-primary text-primary-foreground shadow-xs hover:bg-primary/90", 'bg-primary text-primary-foreground shadow-xs hover:bg-primary/90',
destructive: destructive:
"bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60", 'bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60',
outline: outline:
"border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50", 'border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
secondary: secondary:
"bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80", 'bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80',
ghost: ghost:
"hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50", 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
link: "text-primary underline-offset-4 hover:underline", link: 'text-primary underline-offset-4 hover:underline',
}, },
size: { size: {
default: "h-9 px-4 py-2 has-[>svg]:px-3", default: 'h-9 px-4 py-2 has-[>svg]:px-3',
sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5", sm: 'h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5',
lg: "h-10 rounded-md px-6 has-[>svg]:px-4", lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
icon: "size-9", icon: 'size-9',
}, },
}, },
defaultVariants: { defaultVariants: {
variant: "default", variant: 'default',
size: "default", size: 'default',
},
}, },
}
) )
function Button({ function Button({
@@ -41,11 +41,11 @@ function Button({
size, size,
asChild = false, asChild = false,
...props ...props
}: React.ComponentProps<"button"> & }: React.ComponentProps<'button'>
VariantProps<typeof buttonVariants> & { & VariantProps<typeof buttonVariants> & {
asChild?: boolean asChild?: boolean
}) { }) {
const Comp = asChild ? Slot : "button" const Comp = asChild ? Slot : 'button'
return ( return (
<Comp <Comp

View File

@@ -1,81 +1,81 @@
import * as React from "react" import * as React from 'react'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
function Card({ className, ...props }: React.ComponentProps<"div">) { function Card({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="card" data-slot="card"
className={cn( className={cn(
"bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm", 'bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm',
className className,
)} )}
{...props} {...props}
/> />
) )
} }
function CardHeader({ className, ...props }: React.ComponentProps<"div">) { function CardHeader({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="card-header" data-slot="card-header"
className={cn( className={cn(
"@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6", '@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6',
className className,
)} )}
{...props} {...props}
/> />
) )
} }
function CardTitle({ className, ...props }: React.ComponentProps<"div">) { function CardTitle({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="card-title" data-slot="card-title"
className={cn("leading-none font-semibold", className)} className={cn('leading-none font-semibold', className)}
{...props} {...props}
/> />
) )
} }
function CardDescription({ className, ...props }: React.ComponentProps<"div">) { function CardDescription({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="card-description" data-slot="card-description"
className={cn("text-muted-foreground text-sm", className)} className={cn('text-muted-foreground text-sm', className)}
{...props} {...props}
/> />
) )
} }
function CardAction({ className, ...props }: React.ComponentProps<"div">) { function CardAction({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="card-action" data-slot="card-action"
className={cn( className={cn(
"col-start-2 row-span-2 row-start-1 self-start justify-self-end", 'col-start-2 row-span-2 row-start-1 self-start justify-self-end',
className className,
)} )}
{...props} {...props}
/> />
) )
} }
function CardContent({ className, ...props }: React.ComponentProps<"div">) { function CardContent({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="card-content" data-slot="card-content"
className={cn("px-6", className)} className={cn('px-6', className)}
{...props} {...props}
/> />
) )
} }
function CardFooter({ className, ...props }: React.ComponentProps<"div">) { function CardFooter({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="card-footer" data-slot="card-footer"
className={cn("flex items-center px-6 [.border-t]:pt-6", className)} className={cn('flex items-center px-6 [.border-t]:pt-6', className)}
{...props} {...props}
/> />
) )

View File

@@ -1,10 +1,10 @@
"use client" 'use client'
import * as React from "react" import * as React from 'react'
import * as DialogPrimitive from "@radix-ui/react-dialog" import * as DialogPrimitive from '@radix-ui/react-dialog'
import { XIcon } from "lucide-react" import { XIcon } from 'lucide-react'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
function Dialog({ function Dialog({
...props ...props
@@ -38,8 +38,8 @@ function DialogOverlay({
<DialogPrimitive.Overlay <DialogPrimitive.Overlay
data-slot="dialog-overlay" data-slot="dialog-overlay"
className={cn( className={cn(
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50", 'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
className className,
)} )}
{...props} {...props}
/> />
@@ -60,8 +60,8 @@ function DialogContent({
<DialogPrimitive.Content <DialogPrimitive.Content
data-slot="dialog-content" data-slot="dialog-content"
className={cn( className={cn(
"bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg", 'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg',
className className,
)} )}
{...props} {...props}
> >
@@ -80,23 +80,23 @@ function DialogContent({
) )
} }
function DialogHeader({ className, ...props }: React.ComponentProps<"div">) { function DialogHeader({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="dialog-header" data-slot="dialog-header"
className={cn("flex flex-col gap-2 text-center sm:text-left", className)} className={cn('flex flex-col gap-2 text-center sm:text-left', className)}
{...props} {...props}
/> />
) )
} }
function DialogFooter({ className, ...props }: React.ComponentProps<"div">) { function DialogFooter({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="dialog-footer" data-slot="dialog-footer"
className={cn( className={cn(
"flex flex-col-reverse gap-2 sm:flex-row sm:justify-end", 'flex flex-col-reverse gap-2 sm:flex-row sm:justify-end',
className className,
)} )}
{...props} {...props}
/> />
@@ -110,7 +110,7 @@ function DialogTitle({
return ( return (
<DialogPrimitive.Title <DialogPrimitive.Title
data-slot="dialog-title" data-slot="dialog-title"
className={cn("text-lg leading-none font-semibold", className)} className={cn('text-lg leading-none font-semibold', className)}
{...props} {...props}
/> />
) )
@@ -123,7 +123,7 @@ function DialogDescription({
return ( return (
<DialogPrimitive.Description <DialogPrimitive.Description
data-slot="dialog-description" data-slot="dialog-description"
className={cn("text-muted-foreground text-sm", className)} className={cn('text-muted-foreground text-sm', className)}
{...props} {...props}
/> />
) )

View File

@@ -1,7 +1,7 @@
export default function ErrorCard({ export default function ErrorCard({
title, title,
error, error,
onRetry onRetry,
}: { }: {
title: string title: string
error: string error: string

View File

@@ -1,8 +1,8 @@
"use client" 'use client'
import * as React from "react" import * as React from 'react'
import * as LabelPrimitive from "@radix-ui/react-label" import * as LabelPrimitive from '@radix-ui/react-label'
import { Slot } from "@radix-ui/react-slot" import { Slot } from '@radix-ui/react-slot'
import { import {
Controller, Controller,
FormProvider, FormProvider,
@@ -11,10 +11,10 @@ import {
type ControllerProps, type ControllerProps,
type FieldPath, type FieldPath,
type FieldValues, type FieldValues,
} from "react-hook-form" } from 'react-hook-form'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
import { Label } from "@/components/ui/label" import { Label } from '@/components/ui/label'
const Form = FormProvider const Form = FormProvider
@@ -26,7 +26,7 @@ type FormFieldContextValue<
} }
const FormFieldContext = React.createContext<FormFieldContextValue>( const FormFieldContext = React.createContext<FormFieldContextValue>(
{} as FormFieldContextValue {} as FormFieldContextValue,
) )
const FormField = < const FormField = <
@@ -50,7 +50,7 @@ const useFormField = () => {
const fieldState = getFieldState(fieldContext.name, formState) const fieldState = getFieldState(fieldContext.name, formState)
if (!fieldContext) { if (!fieldContext) {
throw new Error("useFormField should be used within <FormField>") throw new Error('useFormField should be used within <FormField>')
} }
const { id } = itemContext const { id } = itemContext
@@ -70,17 +70,17 @@ type FormItemContextValue = {
} }
const FormItemContext = React.createContext<FormItemContextValue>( const FormItemContext = React.createContext<FormItemContextValue>(
{} as FormItemContextValue {} as FormItemContextValue,
) )
function FormItem({ className, ...props }: React.ComponentProps<"div">) { function FormItem({ className, ...props }: React.ComponentProps<'div'>) {
const id = React.useId() const id = React.useId()
return ( return (
<FormItemContext.Provider value={{ id }}> <FormItemContext.Provider value={{ id }}>
<div <div
data-slot="form-item" data-slot="form-item"
className={cn("grid gap-2", className)} className={cn('grid gap-2', className)}
{...props} {...props}
/> />
</FormItemContext.Provider> </FormItemContext.Provider>
@@ -97,7 +97,7 @@ function FormLabel({
<Label <Label
data-slot="form-label" data-slot="form-label"
data-error={!!error} data-error={!!error}
className={cn("data-[error=true]:text-destructive", className)} className={cn('data-[error=true]:text-destructive', className)}
htmlFor={formItemId} htmlFor={formItemId}
{...props} {...props}
/> />
@@ -122,22 +122,22 @@ function FormControl({ ...props }: React.ComponentProps<typeof Slot>) {
) )
} }
function FormDescription({ className, ...props }: React.ComponentProps<"p">) { function FormDescription({ className, ...props }: React.ComponentProps<'p'>) {
const { formDescriptionId } = useFormField() const { formDescriptionId } = useFormField()
return ( return (
<p <p
data-slot="form-description" data-slot="form-description"
id={formDescriptionId} id={formDescriptionId}
className={cn("text-muted-foreground text-sm", className)} className={cn('text-muted-foreground text-sm', className)}
{...props} {...props}
/> />
) )
} }
function FormMessage({ className, ...props }: React.ComponentProps<"p">) { function FormMessage({ className, ...props }: React.ComponentProps<'p'>) {
const { error, formMessageId } = useFormField() const { error, formMessageId } = useFormField()
const body = error ? String(error?.message ?? "") : props.children const body = error ? String(error?.message ?? '') : props.children
if (!body) { if (!body) {
return null return null
@@ -147,7 +147,7 @@ function FormMessage({ className, ...props }: React.ComponentProps<"p">) {
<p <p
data-slot="form-message" data-slot="form-message"
id={formMessageId} id={formMessageId}
className={cn("text-destructive text-sm", className)} className={cn('text-destructive text-sm', className)}
{...props} {...props}
> >
{body} {body}

View File

@@ -1,17 +1,17 @@
import * as React from "react" import * as React from 'react'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
function Input({ className, type, ...props }: React.ComponentProps<"input">) { function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
return ( return (
<input <input
type={type} type={type}
data-slot="input" data-slot="input"
className={cn( className={cn(
"file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm", 'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
"focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]", 'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
"aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", 'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
className className,
)} )}
{...props} {...props}
/> />

View File

@@ -1,9 +1,9 @@
"use client" 'use client'
import * as React from "react" import * as React from 'react'
import * as LabelPrimitive from "@radix-ui/react-label" import * as LabelPrimitive from '@radix-ui/react-label'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
function Label({ function Label({
className, className,
@@ -13,8 +13,8 @@ function Label({
<LabelPrimitive.Root <LabelPrimitive.Root
data-slot="label" data-slot="label"
className={cn( className={cn(
"flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50", 'flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50',
className className,
)} )}
{...props} {...props}
/> />

View File

@@ -1,10 +1,10 @@
"use client" 'use client'
import * as React from "react" import * as React from 'react'
import * as SelectPrimitive from "@radix-ui/react-select" import * as SelectPrimitive from '@radix-ui/react-select'
import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react" import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from 'lucide-react'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
function Select({ function Select({
...props ...props
@@ -26,19 +26,19 @@ function SelectValue({
function SelectTrigger({ function SelectTrigger({
className, className,
size = "default", size = 'default',
children, children,
...props ...props
}: React.ComponentProps<typeof SelectPrimitive.Trigger> & { }: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
size?: "sm" | "default" size?: 'sm' | 'default'
}) { }) {
return ( return (
<SelectPrimitive.Trigger <SelectPrimitive.Trigger
data-slot="select-trigger" data-slot="select-trigger"
data-size={size} data-size={size}
className={cn( className={cn(
"border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4", 'border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*=\'text-\'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
className className,
)} )}
{...props} {...props}
> >
@@ -53,7 +53,7 @@ function SelectTrigger({
function SelectContent({ function SelectContent({
className, className,
children, children,
position = "popper", position = 'popper',
...props ...props
}: React.ComponentProps<typeof SelectPrimitive.Content>) { }: React.ComponentProps<typeof SelectPrimitive.Content>) {
return ( return (
@@ -61,10 +61,10 @@ function SelectContent({
<SelectPrimitive.Content <SelectPrimitive.Content
data-slot="select-content" data-slot="select-content"
className={cn( className={cn(
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md", 'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md',
position === "popper" && position === 'popper'
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1", && 'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
className className,
)} )}
position={position} position={position}
{...props} {...props}
@@ -72,9 +72,9 @@ function SelectContent({
<SelectScrollUpButton /> <SelectScrollUpButton />
<SelectPrimitive.Viewport <SelectPrimitive.Viewport
className={cn( className={cn(
"p-1", 'p-1',
position === "popper" && position === 'popper'
"h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1" && 'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1',
)} )}
> >
{children} {children}
@@ -92,7 +92,7 @@ function SelectLabel({
return ( return (
<SelectPrimitive.Label <SelectPrimitive.Label
data-slot="select-label" data-slot="select-label"
className={cn("text-muted-foreground px-2 py-1.5 text-xs", className)} className={cn('text-muted-foreground px-2 py-1.5 text-xs', className)}
{...props} {...props}
/> />
) )
@@ -107,8 +107,8 @@ function SelectItem({
<SelectPrimitive.Item <SelectPrimitive.Item
data-slot="select-item" data-slot="select-item"
className={cn( className={cn(
"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2", 'focus:bg-accent focus:text-accent-foreground [&_svg:not([class*=\'text-\'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2',
className className,
)} )}
{...props} {...props}
> >
@@ -129,7 +129,7 @@ function SelectSeparator({
return ( return (
<SelectPrimitive.Separator <SelectPrimitive.Separator
data-slot="select-separator" data-slot="select-separator"
className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)} className={cn('bg-border pointer-events-none -mx-1 my-1 h-px', className)}
{...props} {...props}
/> />
) )
@@ -143,8 +143,8 @@ function SelectScrollUpButton({
<SelectPrimitive.ScrollUpButton <SelectPrimitive.ScrollUpButton
data-slot="select-scroll-up-button" data-slot="select-scroll-up-button"
className={cn( className={cn(
"flex cursor-default items-center justify-center py-1", 'flex cursor-default items-center justify-center py-1',
className className,
)} )}
{...props} {...props}
> >
@@ -161,8 +161,8 @@ function SelectScrollDownButton({
<SelectPrimitive.ScrollDownButton <SelectPrimitive.ScrollDownButton
data-slot="select-scroll-down-button" data-slot="select-scroll-down-button"
className={cn( className={cn(
"flex cursor-default items-center justify-center py-1", 'flex cursor-default items-center justify-center py-1',
className className,
)} )}
{...props} {...props}
> >

View File

@@ -1,10 +1,10 @@
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
function Skeleton({ className, ...props }: React.ComponentProps<"div">) { function Skeleton({ className, ...props }: React.ComponentProps<'div'>) {
return ( return (
<div <div
data-slot="skeleton" data-slot="skeleton"
className={cn("bg-accent animate-pulse rounded-md", className)} className={cn('bg-accent animate-pulse rounded-md', className)}
{...props} {...props}
/> />
) )

View File

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

View File

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

View File

@@ -1,9 +1,9 @@
"use client" 'use client'
import * as React from "react" import * as React from 'react'
import * as TabsPrimitive from "@radix-ui/react-tabs" import * as TabsPrimitive from '@radix-ui/react-tabs'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
function Tabs({ function Tabs({
className, className,
@@ -12,7 +12,7 @@ function Tabs({
return ( return (
<TabsPrimitive.Root <TabsPrimitive.Root
data-slot="tabs" data-slot="tabs"
className={cn("flex flex-col gap-2", className)} className={cn('flex flex-col gap-2', className)}
{...props} {...props}
/> />
) )
@@ -26,8 +26,8 @@ function TabsList({
<TabsPrimitive.List <TabsPrimitive.List
data-slot="tabs-list" data-slot="tabs-list"
className={cn( className={cn(
"bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-lg p-[3px]", 'bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-lg p-[3px]',
className className,
)} )}
{...props} {...props}
/> />
@@ -42,8 +42,8 @@ function TabsTrigger({
<TabsPrimitive.Trigger <TabsPrimitive.Trigger
data-slot="tabs-trigger" data-slot="tabs-trigger"
className={cn( className={cn(
"data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4", 'data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
className className,
)} )}
{...props} {...props}
/> />
@@ -57,7 +57,7 @@ function TabsContent({
return ( return (
<TabsPrimitive.Content <TabsPrimitive.Content
data-slot="tabs-content" data-slot="tabs-content"
className={cn("flex-1 outline-none", className)} className={cn('flex-1 outline-none', className)}
{...props} {...props}
/> />
) )

View File

@@ -1,4 +1,4 @@
import { PrismaClient } from "@/generated/prisma/client" import { PrismaClient } from '@/generated/prisma/client'
const globalForPrisma = global as unknown as { const globalForPrisma = global as unknown as {
prisma: PrismaClient | undefined prisma: PrismaClient | undefined

View File

@@ -1,5 +1,5 @@
import { clsx, type ClassValue } from "clsx" import { clsx, type ClassValue } from 'clsx'
import { twMerge } from "tailwind-merge" import { twMerge } from 'tailwind-merge'
export function cn(...inputs: ClassValue[]) { export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)) return twMerge(clsx(inputs))

View File

@@ -9,7 +9,7 @@ export const config = {
const isIgnored = [ const isIgnored = [
'/login', '/login',
"/api/auth/login" '/api/auth/login',
] ]
export async function middleware(request: NextRequest) { export async function middleware(request: NextRequest) {

View File

@@ -8,12 +8,12 @@ interface AuthState {
export const useAuthStore = create<AuthState>()( export const useAuthStore = create<AuthState>()(
persist( persist(
(set) => ({ set => ({
isAuthenticated: false, isAuthenticated: false,
setAuth: (state) => set({ isAuthenticated: state }), setAuth: state => set({ isAuthenticated: state }),
}), }),
{ {
name: 'auth-storage', name: 'auth-storage',
} },
) ),
) )