xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-03 08:36:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'Yidadaa:main' into main

Browse Source
This commit is contained in:
Wakler-Wei 2023-09-26 09:45:45 +08:00 committed by GitHub
commit dfba4ee8a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/utils/cloud/webdav.ts
View File

@ -21,7 +21,7 @@ export function createWebDavClient(store: SyncStore) {
proxyUrl, proxyUrl,
}); });
console.log("[WebDav] check", res.status, res.statusText); console.log("[WebDav] check", res.status, res.statusText);
return [201, 200, 404, 401].includes(res.status); return [201, 200, 404, 301, 302, 307, 308].includes(res.status);
} catch (e) { } catch (e) {
console.error("[WebDav] failed to check", e); console.error("[WebDav] failed to check", e);
} }