mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-02 08:06:38 +08:00
Merge remote-tracking branch 'origin/dev'
# Conflicts: # app/components/chat.tsx
This commit is contained in:
commit
ca83896805
@ -21,6 +21,7 @@ import {
|
|||||||
import type { FormProps, TabsProps } from "antd";
|
import type { FormProps, TabsProps } from "antd";
|
||||||
import { SignInOptions } from "next-auth/react";
|
import { SignInOptions } from "next-auth/react";
|
||||||
import { getSession } from "next-auth/react";
|
import { getSession } from "next-auth/react";
|
||||||
|
import { FieldData } from "rc-field-form/es/interface";
|
||||||
|
|
||||||
export default function UserLoginCore() {
|
export default function UserLoginCore() {
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
@ -153,7 +154,7 @@ export default function UserLoginCore() {
|
|||||||
<span>
|
<span>
|
||||||
无权限,请确认用户名正确并等待审批
|
无权限,请确认用户名正确并等待审批
|
||||||
<br />
|
<br />
|
||||||
<span style={{ color: "red" }}>或联系管理员</span>
|
<span style={{ color: "red" }}>或联系管理员 小司</span>
|
||||||
</span>
|
</span>
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
@ -172,7 +173,7 @@ export default function UserLoginCore() {
|
|||||||
name: "password",
|
name: "password",
|
||||||
errors: [result.error],
|
errors: [result.error],
|
||||||
},
|
},
|
||||||
]);
|
] as FieldData[]);
|
||||||
}
|
}
|
||||||
if (loginProvider === "email") {
|
if (loginProvider === "email") {
|
||||||
loginForm.setFields([
|
loginForm.setFields([
|
||||||
@ -180,7 +181,7 @@ export default function UserLoginCore() {
|
|||||||
name: "email",
|
name: "email",
|
||||||
errors: [result.error],
|
errors: [result.error],
|
||||||
},
|
},
|
||||||
]);
|
] as FieldData[]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log("response,", result);
|
console.log("response,", result);
|
||||||
|
@ -651,11 +651,11 @@ export function ChatActions(props: {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<ChatAction
|
{/*<ChatAction*/}
|
||||||
onClick={() => setShowPluginSelector(true)}
|
{/* onClick={() => setShowPluginSelector(true)}*/}
|
||||||
text={Locale.Plugin.Name}
|
{/* text={Locale.Plugin.Name}*/}
|
||||||
icon={<PluginIcon />}
|
{/* icon={<PluginIcon />}*/}
|
||||||
/>
|
{/*/>*/}
|
||||||
{showPluginSelector && (
|
{showPluginSelector && (
|
||||||
<Selector
|
<Selector
|
||||||
multiple
|
multiple
|
||||||
|
@ -541,7 +541,7 @@ export function ImagePreviewer(props: {
|
|||||||
<div>
|
<div>
|
||||||
<div className={styles["main-title"]}>NextChat</div>
|
<div className={styles["main-title"]}>NextChat</div>
|
||||||
<div className={styles["sub-title"]}>
|
<div className={styles["sub-title"]}>
|
||||||
github.com/Yidadaa/ChatGPT-Next-Web
|
github.com/ChatGPTNextWeb/ChatGPT-Next-Web
|
||||||
</div>
|
</div>
|
||||||
<div className={styles["icons"]}>
|
<div className={styles["icons"]}>
|
||||||
<ExportAvatar avatar={config.avatar} />
|
<ExportAvatar avatar={config.avatar} />
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
export const OWNER = "Yidadaa";
|
export const OWNER = "ChatGPTNextWeb";
|
||||||
export const REPO = "ChatGPT-Next-Web";
|
export const REPO = "ChatGPT-Next-Web";
|
||||||
export const REPO_URL = `https://github.com/${OWNER}/${REPO}`;
|
export const REPO_URL = `https://github.com/${OWNER}/${REPO}`;
|
||||||
export const ISSUE_URL = `https://github.com/${OWNER}/${REPO}/issues`;
|
export const ISSUE_URL = `https://github.com/${OWNER}/${REPO}/issues`;
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
},
|
},
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "NextChat",
|
"productName": "NextChat",
|
||||||
"version": "2.13.1"
|
"version": "2.14.0"
|
||||||
},
|
},
|
||||||
"tauri": {
|
"tauri": {
|
||||||
"allowlist": {
|
"allowlist": {
|
||||||
|
Loading…
Reference in New Issue
Block a user