From 20871f7e50c57c9a4342bea1d30a7c5d9745bf7d Mon Sep 17 00:00:00 2001 From: sijinhui Date: Tue, 2 Apr 2024 00:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=BD=93=E4=BC=98=E5=8C=96=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/get_voice_token/route.ts | 6 +-- app/api/logs/[...path]/route.ts | 2 +- app/app/(admin)/admin/ana/page.tsx | 11 +----- .../admin/ana/usage-by-model-chart.tsx | 7 +--- app/app/(admin)/admin/ana/user-by-map.tsx | 3 -- app/app/(admin)/admin/layout.tsx | 8 +--- app/app/(admin)/admin/users/page.tsx | 13 ------- app/app/(admin)/components/sidebar.tsx | 10 ++--- app/app/(admin)/components/users-table.tsx | 8 +--- app/app/(auth)/login/login-button.tsx | 9 +---- app/page.tsx | 16 ++++---- lib/auth_client.ts | 13 +++++++ middleware.ts | 38 ++++++------------- 13 files changed, 46 insertions(+), 98 deletions(-) create mode 100644 lib/auth_client.ts diff --git a/app/api/get_voice_token/route.ts b/app/api/get_voice_token/route.ts index 07a8d6b5e..c6fef465b 100644 --- a/app/api/get_voice_token/route.ts +++ b/app/api/get_voice_token/route.ts @@ -1,5 +1,5 @@ import { NextRequest, NextResponse } from "next/server"; -import { VerifiedUser } from "@/lib/auth"; +// import { VerifiedUser } from "@/lib/auth"; import { getServerSideConfig } from "@/app/config/server"; const serverConfig = getServerSideConfig(); // Gets an access token. @@ -21,8 +21,8 @@ async function handle( ) { // 认证 - const isUser = await VerifiedUser(); - if (!isUser) return NextResponse.json({ error: "未认证" }, { status: 401 }); + // const isUser = await VerifiedUser(); + // if (!isUser) return NextResponse.json({ error: "未认证" }, { status: 401 }); const get_access_token = await getAccessToken(); diff --git a/app/api/logs/[...path]/route.ts b/app/api/logs/[...path]/route.ts index 28b0b3fde..ae6eaf654 100644 --- a/app/api/logs/[...path]/route.ts +++ b/app/api/logs/[...path]/route.ts @@ -9,7 +9,7 @@ async function handle( ) { try { const request_data = await req.json(); - console.log("log", request_data); + // console.log("log", request_data); // if (request_data?.userName) { // await insertUser({ // name: request_data?.userName, diff --git a/app/app/(admin)/admin/ana/page.tsx b/app/app/(admin)/admin/ana/page.tsx index f4def8561..bbc2ad274 100644 --- a/app/app/(admin)/admin/ana/page.tsx +++ b/app/app/(admin)/admin/ana/page.tsx @@ -1,18 +1,9 @@ import UsageByModel from "./usage-by-model-chart"; import UserByMap from "./user-by-map"; -// import { getSession } from "@/lib/auth"; -// import { isName, ADMIN_LIST } from "@/lib/auth_list"; -// import { redirect } from "next/navigation"; + import { Flex } from "antd"; export default async function AdminPage() { - // const session = await getSession(); - // const name = session?.user?.email || session?.user?.name; - // if (!(name && ADMIN_LIST.includes(name))) { - // // Replace '/dashboard' with the desired redirect path - // redirect("/"); - // } - return ( <> diff --git a/app/app/(admin)/admin/ana/usage-by-model-chart.tsx b/app/app/(admin)/admin/ana/usage-by-model-chart.tsx index ed137c6c5..dbe591814 100644 --- a/app/app/(admin)/admin/ana/usage-by-model-chart.tsx +++ b/app/app/(admin)/admin/ana/usage-by-model-chart.tsx @@ -9,9 +9,8 @@ import React, { } from "react"; import * as echarts from "echarts"; -// import { DatePicker } from "@tremor/react"; import { DatePicker } from "antd"; -import { Col, Row } from "antd"; +import { Row } from "antd"; import locale from "antd/es/date-picker/locale/zh_CN"; import "dayjs/locale/zh-cn"; @@ -21,10 +20,6 @@ import { EChartsOption } from "echarts"; import { essos } from "@/lib/charts_theme"; import { subDays, addDays } from "date-fns"; -// import customParseFormat from 'dayjs/plugin/customParseFormat'; -// dayjs.extend(customParseFormat); -// const dateFormat = 'YYYY-MM-DD'; - interface ComponentProps { currentDate: Date; setCurrentDate: Dispatch>; diff --git a/app/app/(admin)/admin/ana/user-by-map.tsx b/app/app/(admin)/admin/ana/user-by-map.tsx index 13ce494ad..8f4edc634 100644 --- a/app/app/(admin)/admin/ana/user-by-map.tsx +++ b/app/app/(admin)/admin/ana/user-by-map.tsx @@ -11,10 +11,7 @@ import React, { import Script from "next/script"; import * as echarts from "echarts"; -// var echarts = require('echarts'); import "echarts/extension/bmap/bmap"; -// require("echarts"); -// require("echarts/extension/bmap/bmap"); interface DataItem { name: string; diff --git a/app/app/(admin)/admin/layout.tsx b/app/app/(admin)/admin/layout.tsx index a760b9960..7ec40f4fa 100644 --- a/app/app/(admin)/admin/layout.tsx +++ b/app/app/(admin)/admin/layout.tsx @@ -4,13 +4,7 @@ import { useSession } from "next-auth/react"; import { redirect } from "next/navigation"; import { ADMIN_LIST } from "@/lib/auth_list"; import React, { ReactNode, useEffect, useState } from "react"; -import { - MenuFoldOutlined, - MenuUnfoldOutlined, - UploadOutlined, - UserOutlined, - VideoCameraOutlined, -} from "@ant-design/icons"; +import { MenuFoldOutlined, MenuUnfoldOutlined } from "@ant-design/icons"; import { Layout, Menu, Button, theme, ConfigProvider, ThemeConfig } from "antd"; import SideBar from "../components/sidebar"; diff --git a/app/app/(admin)/admin/users/page.tsx b/app/app/(admin)/admin/users/page.tsx index 6884d7c67..d2afccdec 100644 --- a/app/app/(admin)/admin/users/page.tsx +++ b/app/app/(admin)/admin/users/page.tsx @@ -1,20 +1,7 @@ import { Flex } from "antd"; -import prisma from "@/lib/prisma"; -import { User } from "@prisma/client"; import UsersTablePart from "../../components/users-table"; -// async function getData() { -// return await prisma.user.findMany({ -// orderBy: { -// createdAt: "desc", -// }, -// }); -// } export default async function UsersPage() { - // const users: User[] = await getData(); - - // console.log("data", data); - return ( <> diff --git a/app/app/(admin)/components/sidebar.tsx b/app/app/(admin)/components/sidebar.tsx index 3c037335e..c59ac5770 100644 --- a/app/app/(admin)/components/sidebar.tsx +++ b/app/app/(admin)/components/sidebar.tsx @@ -1,17 +1,17 @@ "use client"; import React, { useEffect, useState } from "react"; -import Link from "next/link"; +// import Link from "next/link"; import { useRouter, usePathname } from "next/navigation"; import { AppstoreOutlined, - MailOutlined, - SettingOutlined, - DashboardTwoTone, + // MailOutlined, + // SettingOutlined, + // DashboardTwoTone, } from "@ant-design/icons"; import type { MenuProps, MenuTheme } from "antd"; -import { Menu, Switch } from "antd"; +import { Menu } from "antd"; type MenuItem = Required["items"][number]; diff --git a/app/app/(admin)/components/users-table.tsx b/app/app/(admin)/components/users-table.tsx index 1f45de1c6..d8fd66d2e 100644 --- a/app/app/(admin)/components/users-table.tsx +++ b/app/app/(admin)/components/users-table.tsx @@ -1,12 +1,6 @@ "use client"; -import React, { - Dispatch, - SetStateAction, - useEffect, - useRef, - useState, -} from "react"; +import React, { Dispatch, SetStateAction, useEffect, useState } from "react"; import { User } from "@prisma/client"; import { Space, Table, Tag, Input, Button, notification } from "antd"; import type { GetRef, TableColumnsType } from "antd"; diff --git a/app/app/(auth)/login/login-button.tsx b/app/app/(auth)/login/login-button.tsx index 89ba7727f..b841c818c 100644 --- a/app/app/(auth)/login/login-button.tsx +++ b/app/app/(auth)/login/login-button.tsx @@ -3,20 +3,13 @@ import LoadingDots from "@/app/components/icons/loading-dots"; import { signIn } from "next-auth/react"; import { useSearchParams } from "next/navigation"; -import { useState, useEffect } from "react"; -// import { toast } from "sonner"; +import { useState } from "react"; export default function LoginButton() { const [loading, setLoading] = useState(false); // Get error message added by next/auth in URL. const searchParams = useSearchParams(); - // const error = searchParams?.get("error"); - // - // useEffect(() => { - // const errorMessage = Array.isArray(error) ? error.pop() : error; - // errorMessage && toast.error(errorMessage); - // }, [error]); return (