7x31
/
ChatGPT-Next-Web
mirror of https://github.com/Yidadaa/ChatGPT-Next-Web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web

This commit is contained in:
GH Action - Upstream Sync 2023-09-20 01:05:58 +00:00
parent 3cb190c22c 26e50cefea
commit 7b941cc10c
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README_CN.md
View File

@ -114,7 +114,7 @@ OpenAI 接口代理 URL，如果你手动配置了 openai 接口代理，请填
OPENAI_API_KEY=<your api key here> OPENAI_API_KEY=<your api key here>
# 中国大陆用户，可以使用本项目自带的代理进行开发，你也可以自由选择其他代理地址 # 中国大陆用户，可以使用本项目自带的代理进行开发，你也可以自由选择其他代理地址
BASE_URL=https://chatgpt2.nextweb.fun/api/proxy BASE_URL=https://nb.nextweb.fun/api/proxy
``` ```
### 本地开发 ### 本地开发

2
app/components/chat.tsx
View File

@ -937,7 +937,7 @@ function _Chat() {
const isTouchTopEdge = e.scrollTop <= edgeThreshold; const isTouchTopEdge = e.scrollTop <= edgeThreshold;
const isTouchBottomEdge = bottomHeight >= e.scrollHeight - edgeThreshold; const isTouchBottomEdge = bottomHeight >= e.scrollHeight - edgeThreshold;
const isHitBottom = const isHitBottom =
bottomHeight >= e.scrollHeight - (isMobileScreen ? 0 : 10); bottomHeight >= e.scrollHeight - (isMobileScreen ? 4 : 10);
const prevPageMsgIndex = msgRenderIndex - CHAT_PAGE_SIZE; const prevPageMsgIndex = msgRenderIndex - CHAT_PAGE_SIZE;
const nextPageMsgIndex = msgRenderIndex + CHAT_PAGE_SIZE; const nextPageMsgIndex = msgRenderIndex + CHAT_PAGE_SIZE;

15
app/components/home.tsx
View File

@ -115,7 +115,10 @@ const loadAsyncGoogleFont = () => {
getClientConfig()?.buildMode === "export" ? remoteFontUrl : proxyFontUrl; getClientConfig()?.buildMode === "export" ? remoteFontUrl : proxyFontUrl;
linkEl.rel = "stylesheet"; linkEl.rel = "stylesheet";
linkEl.href = linkEl.href =
googleFontUrl + "/css2?family=" + encodeURIComponent("Noto Sans:wght@300;400;700;900") + "&display=swap"; googleFontUrl +
"/css2?family=" +
encodeURIComponent("Noto Sans:wght@300;400;700;900") +
"&display=swap";
document.head.appendChild(linkEl); document.head.appendChild(linkEl);
}; };
@ -125,6 +128,8 @@ function Screen() {
const isHome = location.pathname === Path.Home; const isHome = location.pathname === Path.Home;
const isAuth = location.pathname === Path.Auth; const isAuth = location.pathname === Path.Auth;
const isMobileScreen = useMobileScreen(); const isMobileScreen = useMobileScreen();
const shouldTightBorder =
config.tightBorder && !isMobileScreen && !getClientConfig()?.isApp;
useEffect(() => { useEffect(() => {
loadAsyncGoogleFont(); loadAsyncGoogleFont();
@ -134,11 +139,9 @@ function Screen() {
<div <div
className={ className={
styles.container + styles.container +
` ${ ` ${shouldTightBorder ? styles["tight-container"] : styles.container} ${
config.tightBorder && !isMobileScreen getLang() === "ar" ? styles["rtl-screen"] : ""
? styles["tight-container"] }`
: styles.container
} ${getLang() === "ar" ? styles["rtl-screen"] : ""}`
} }
> >
{isAuth ? ( {isAuth ? (

2
app/constant.ts
View File

@ -8,7 +8,7 @@ export const FETCH_COMMIT_URL = `https://api.github.com/repos/${OWNER}/${REPO}/c
export const FETCH_TAG_URL = `https://api.github.com/repos/${OWNER}/${REPO}/tags?per_page=1`; export const FETCH_TAG_URL = `https://api.github.com/repos/${OWNER}/${REPO}/tags?per_page=1`;
export const RUNTIME_CONFIG_DOM = "danger-runtime-config"; export const RUNTIME_CONFIG_DOM = "danger-runtime-config";
export const DEFAULT_CORS_HOST = "https://chatgpt2.nextweb.fun"; export const DEFAULT_CORS_HOST = "https://nb.nextweb.fun";
export const DEFAULT_API_HOST = `${DEFAULT_CORS_HOST}/api/proxy`; export const DEFAULT_API_HOST = `${DEFAULT_CORS_HOST}/api/proxy`;
export enum Path { export enum Path {

2
src-tauri/tauri.conf.json
View File

@ -9,7 +9,7 @@
}, },
"package": { "package": {
"productName": "ChatGPT Next Web", "productName": "ChatGPT Next Web",
"version": "2.9.6" "version": "2.9.7"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {