fix: image upload

GZTimeWalker · May 7, 2023 · 4bc9e94 · 4bc9e94
1 parent 593760b
commit 4bc9e94
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 18 deletions.
diff --git a/src/GZCTF/ClientApp/pnpm-lock.yaml b/src/GZCTF/ClientApp/pnpm-lock.yaml
diff --git a/src/GZCTF/ClientApp/src/components/TeamEditModal.tsx b/src/GZCTF/ClientApp/src/components/TeamEditModal.tsx
@@ -229,11 +229,18 @@ const TeamEditModal: FC<TeamEditModalProps> = (props) => {
           mutateTeams((teams) => teams?.map((x) => (x.id === teamInfo.id ? newTeamInfo : x)), {
             revalidate: false,
           })
-          setDisabled(false)
-          setDropzoneOpened(false)
         })
-        .catch((err) => {
-          showErrorNotification(err)
+        .catch(() => {
+          updateNotification({
+            id: 'upload-avatar',
+            color: 'red',
+            message: '头像更新失败',
+            icon: <Icon path={mdiClose} size={1} />,
+            autoClose: true,
+          })
+        })
+        .finally(() => {
+          setDisabled(false)
           setDropzoneOpened(false)
         })
     }

diff --git a/src/GZCTF/ClientApp/src/pages/account/Profile.tsx b/src/GZCTF/ClientApp/src/pages/account/Profile.tsx
@@ -89,10 +89,18 @@ const Profile: FC = () => {
           setDisabled(false)
           mutate({ ...user }, { revalidate: false })
           setAvatarFile(null)
-          setDropzoneOpened(false)
         })
-        .catch((err) => {
-          showErrorNotification(err)
+        .catch(() => {
+          updateNotification({
+            id: 'upload-avatar',
+            color: 'red',
+            message: '头像更新失败',
+            icon: <Icon path={mdiClose} size={1} />,
+            autoClose: true,
+          })
+        })
+        .finally(() => {
+          setDisabled(false)
           setDropzoneOpened(false)
         })
     }

diff --git a/src/GZCTF/ClientApp/src/pages/admin/games/[id]/Info.tsx b/src/GZCTF/ClientApp/src/pages/admin/games/[id]/Info.tsx
@@ -110,10 +110,20 @@ const GameInfoEdit: FC = () => {
             icon: <Icon path={mdiCheck} size={1} />,
             autoClose: true,
           })
-          setDisabled(false)
           mutate({ ...game, poster: res.data })
         })
-        .catch(showErrorNotification)
+        .catch(() => {
+          updateNotification({
+            id: 'upload-poster',
+            color: 'red',
+            message: '比赛海报更新失败',
+            icon: <Icon path={mdiClose} size={1} />,
+            autoClose: true,
+          })
+        })
+        .finally(() => {
+          setDisabled(false)
+        })
     }
   }
 

diff --git a/src/GZCTF/ClientApp/src/utils/ThemeOverride.ts b/src/GZCTF/ClientApp/src/utils/ThemeOverride.ts
@@ -143,9 +143,15 @@ export const useIsMobile = (limit?: number) => {
   return isMobile
 }
 
-export const ACCEPT_IMAGE_MIME_TYPE = {
-  'image/*': ['.png', '.gif', '.jpeg', '.jpg', '.webp'],
-}
+export const ACCEPT_IMAGE_MIME_TYPE = [
+  'image/png',
+  'image/gif',
+  'image/jpeg',
+  'image/gif',
+  'image/webp',
+  'image/bmp',
+  'image/tiff',
+]
 
 interface FixedButtonProps {
   right?: string