diff --git a/app/app/(admin)/admin/users/page.tsx b/app/app/(admin)/admin/users/page.tsx index 7f3920222..2e94d5805 100644 --- a/app/app/(admin)/admin/users/page.tsx +++ b/app/app/(admin)/admin/users/page.tsx @@ -4,8 +4,11 @@ import { User } from "@prisma/client"; import UsersTable from "../../components/users-table"; async function getData() { - const users = await prisma.user.findMany(); - return users; + return await prisma.user.findMany({ + orderBy: { + createdAt: "desc", + }, + }); } export default async function UsersPage() { const users: User[] = await getData(); diff --git a/app/app/(admin)/components/sidebar.tsx b/app/app/(admin)/components/sidebar.tsx index 0287214ba..b3081cb2a 100644 --- a/app/app/(admin)/components/sidebar.tsx +++ b/app/app/(admin)/components/sidebar.tsx @@ -36,21 +36,16 @@ const items: MenuItem[] = [ getItem("使用分析", "/admin/ana"), ]), - getItem("Navigation Two", "sub2", , [ - getItem("Option 5", "5"), - getItem("Option 6", "6"), - getItem("Submenu", "sub3", null, [ - getItem("Option 7", "7"), - getItem("Option 8", "8"), - ]), + getItem("管理", "manage", , [ + getItem("用户管理", "/admin/users"), ]), - getItem("Navigation Three", "sub4", , [ - getItem("Option 9", "9"), - getItem("Option 10", "10"), - getItem("Option 11", "11"), - getItem("Option 12", "12"), - ]), + // getItem("Navigation Three", "sub4", , [ + // getItem("Option 9", "9"), + // getItem("Option 10", "10"), + // getItem("Option 11", "11"), + // getItem("Option 12", "12"), + // ]), ]; const SideBar: React.FC = () => { @@ -68,12 +63,12 @@ const SideBar: React.FC = () => { setCurrent(e.key); router.push(e.key); }; - // useEffect(() => { - // // 如果按钮和路径不相等,那其实应该跳转到按钮的网址 - // if (current != pathname) { - // router.push(current); - // } - // }, [current, pathname, router]); + useEffect(() => { + // 如果按钮和路径不相等,那其实应该跳转到按钮的网址 + if (current != pathname) { + router.push(current); + } + }, [current, pathname, router]); return ( <> diff --git a/app/app/(admin)/components/users-table.tsx b/app/app/(admin)/components/users-table.tsx index b7c4a3d8b..6662f5c4e 100644 --- a/app/app/(admin)/components/users-table.tsx +++ b/app/app/(admin)/components/users-table.tsx @@ -118,11 +118,13 @@ function UsersTable({ users }: UserInterface) { }, onFilterDropdownOpenChange: (visible) => { if (visible) { + // @ts-ignore setTimeout(() => searchInput.current?.select(), 100); } }, render: (text) => searchedColumn === dataIndex ? ( + // @ts-ignore + + + + + + + + + + +
+ Sign in to ${escapedHost} +
+ + + + +
Sign + in
+
+ If you did not request this email you can safely ignore it. +
+ +` +} diff --git a/package.json b/package.json index 91d625e44..36135c250 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "@types/bcryptjs": "^2.4.6", "@types/cookie": "^0.6.0", "@types/node": "^20.11.10", + "@types/nodemailer": "^6.4.14", "@types/react": "^18.2.48", "@types/react-dom": "^18.2.7", "@types/react-highlight-words": "^0.16.7",