Merge pull request #102 from OpenSIST/dev

fix scroll bug in safari

Author: boynextdoor-cze

package.json

@@ -46,7 +46,7 @@
   },
   "scripts": {
     "start_win": "set PORT=61234 && react-scripts start",
-    "start_unix": "export PORT=61234 && react-scripts start",
+    "start_unix": "export PORT=61234 HTTPS=true && react-scripts start",
     "build": "CI=false react-scripts build",
     "test": "react-scripts test",
     "eject": "臭小子别乱碰这个 react-scripts eject"

src/Components/common.jsx

@@ -18,7 +18,7 @@ export function LoadingBackdrop() {
     const loading = navigation.state !== 'idle';
     // const loading = navigation.state === 'loading';
     return (
-        <Backdrop open={loading} sx={{zIndex: 99999}} transitionDuration={1000}>
+        <Backdrop open={loading} sx={{zIndex: 99999}} transitionDuration={1000} style={{pointerEvents: "none"}} >
             <CircularProgress color="inherit"/>
         </Backdrop>
     )

src/Data/UserData.js

@@ -78,6 +78,7 @@ export async function setUserInfo(user_info) {
 export async function logout() {
     const response = await fetch(LOGOUT, {
         method: 'POST',
+        credentials: 'include',
         headers: await headerGenerator(true),
     })
     if (response.status !== 200 && response.status !== 401) {
@@ -136,6 +137,7 @@ export async function getAvatar(avatarId, displayName = null, isRefresh = false)
     if (isRefresh || !avatar || (Date.now() - avatar['Date']) > CACHE_EXPIRATION) {
         const response = await fetch(GET_AVATAR, {
             method: 'POST',
+            credentials: 'include',
             headers: await headerGenerator(true),
             body: JSON.stringify({avatar_id: avatarId})
         })
@@ -212,6 +214,7 @@ export async function getDisplayName(isRefresh = false) {
     if (isRefresh || !displayName || (Date.now() - displayName['Date']) > CACHE_EXPIRATION) {
         const response = await fetch(GET_DISPLAY_NAME, {
             method: 'POST',
+            credentials: 'include',
             headers: await headerGenerator(true),
         })
         await handleErrors(response);
@@ -242,6 +245,7 @@ export async function toggleAnonymous() {
 
     const response = await fetch(TOGGLE_NICKNAME, {
         method: 'POST',
+        credentials: 'include',
         headers: await headerGenerator(true),
     });
     await handleErrors(response);