Skip to content

Commit

Permalink
fix: remove svg (again) from image mime types
Browse files Browse the repository at this point in the history
  • Loading branch information
GZTimeWalker committed May 12, 2024
1 parent 728cffb commit df449b0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
5 changes: 3 additions & 2 deletions src/GZCTF/ClientApp/src/components/TeamEditModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
Tooltip,
useMantineTheme,
} from '@mantine/core'
import { Dropzone, IMAGE_MIME_TYPE } from '@mantine/dropzone'
import { Dropzone } from '@mantine/dropzone'
import { useClipboard } from '@mantine/hooks'
import { useModals } from '@mantine/modals'
import { notifications, showNotification, updateNotification } from '@mantine/notifications'
Expand All @@ -27,6 +27,7 @@ import { Icon } from '@mdi/react'
import { FC, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { showErrorNotification, tryGetErrorMsg } from '@Utils/ApiHelper'
import { IMAGE_MIME_TYPES } from '@Utils/Shared'
import api, { TeamInfoModel, TeamUserInfoModel } from '@Api'

interface TeamEditModalProps extends ModalProps {
Expand Down Expand Up @@ -467,7 +468,7 @@ const TeamEditModal: FC<TeamEditModalProps> = (props) => {
mih={220}
disabled={disabled}
maxSize={3 * 1024 * 1024}
accept={IMAGE_MIME_TYPE}
accept={IMAGE_MIME_TYPES}
>
<Group justify="center" gap="xl" mih={240} style={{ pointerEvents: 'none' }}>
{avatarFile ? (
Expand Down
5 changes: 3 additions & 2 deletions src/GZCTF/ClientApp/src/pages/account/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
TextInput,
Title,
} from '@mantine/core'
import { Dropzone, IMAGE_MIME_TYPE } from '@mantine/dropzone'
import { Dropzone } from '@mantine/dropzone'
import { notifications, showNotification, updateNotification } from '@mantine/notifications'
import { mdiCheck, mdiClose } from '@mdi/js'
import { Icon } from '@mdi/react'
Expand All @@ -25,6 +25,7 @@ import { Trans, useTranslation } from 'react-i18next'
import PasswordChangeModal from '@Components/PasswordChangeModal'
import WithNavBar from '@Components/WithNavbar'
import { showErrorNotification, tryGetErrorMsg } from '@Utils/ApiHelper'
import { IMAGE_MIME_TYPES } from '@Utils/Shared'
import { useIsMobile } from '@Utils/ThemeOverride'
import { usePageTitle } from '@Utils/usePageTitle'
import { useUser } from '@Utils/useUser'
Expand Down Expand Up @@ -327,7 +328,7 @@ const Profile: FC = () => {
miw={220}
mih={220}
maxSize={3 * 1024 * 1024}
accept={IMAGE_MIME_TYPE}
accept={IMAGE_MIME_TYPES}
>
<Group justify="center" gap="xl" mih={240} style={{ pointerEvents: 'none' }}>
{avatarFile ? (
Expand Down
5 changes: 3 additions & 2 deletions src/GZCTF/ClientApp/src/pages/admin/games/[id]/Info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
TextInput,
} from '@mantine/core'
import { DatePickerInput, TimeInput } from '@mantine/dates'
import { Dropzone, IMAGE_MIME_TYPE } from '@mantine/dropzone'
import { Dropzone } from '@mantine/dropzone'
import { useClipboard, useInputState } from '@mantine/hooks'
import { useModals } from '@mantine/modals'
import { notifications, showNotification, updateNotification } from '@mantine/notifications'
Expand All @@ -36,6 +36,7 @@ import { useNavigate, useParams } from 'react-router-dom'
import { SwitchLabel } from '@Components/admin/SwitchLabel'
import WithGameEditTab from '@Components/admin/WithGameEditTab'
import { showErrorNotification, tryGetErrorMsg } from '@Utils/ApiHelper'
import { IMAGE_MIME_TYPES } from '@Utils/Shared'
import { OnceSWRConfig } from '@Utils/useConfig'
import api, { GameInfoModel } from '@Api'

Expand Down Expand Up @@ -466,7 +467,7 @@ const GameInfoEdit: FC = () => {
})
}}
maxSize={3 * 1024 * 1024}
accept={IMAGE_MIME_TYPE}
accept={IMAGE_MIME_TYPES}
disabled={disabled}
styles={{
root: {
Expand Down
9 changes: 9 additions & 0 deletions src/GZCTF/ClientApp/src/utils/Shared.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,15 @@ export const HunamizeSize = (size: number) => {
}
}

export const IMAGE_MIME_TYPES = [
'image/png',
'image/gif',
'image/jpeg',
'image/webp',
'image/avif',
'image/heic',
]

/** 系统错误信息 */
export const enum ErrorCodes {
/**
Expand Down

0 comments on commit df449b0

Please sign in to comment.