From 5cb57591ab7aa2a4b5ec514bfb71934c9e1c41a9 Mon Sep 17 00:00:00 2001 From: Hugo Gresse Date: Mon, 11 Nov 2024 21:17:14 +0100 Subject: [PATCH 1/2] Allow svg and remove url parsing check which was broken --- .../layouts/sidepanel/upload/SidePanelUploadLayout.jsx | 2 +- src/admin/project/settings/event/ProjectSettingsForm.jsx | 9 --------- src/admin/project/utils/rURLWithLocalhostSupported.js | 3 --- src/admin/translations/languages/en.admin.json | 2 +- src/admin/translations/languages/fr.admin.json | 2 +- src/superAdmin/SuperAdminProjects.tsx | 2 +- 6 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 src/admin/project/utils/rURLWithLocalhostSupported.js diff --git a/src/admin/baseComponents/layouts/sidepanel/upload/SidePanelUploadLayout.jsx b/src/admin/baseComponents/layouts/sidepanel/upload/SidePanelUploadLayout.jsx index e4a19d70e..2d440c7f0 100644 --- a/src/admin/baseComponents/layouts/sidepanel/upload/SidePanelUploadLayout.jsx +++ b/src/admin/baseComponents/layouts/sidepanel/upload/SidePanelUploadLayout.jsx @@ -119,7 +119,7 @@ const SidePanelUploadLayout = ({ multiple: false, noClick: true, noKeyboard: true, - accept: 'image/jpeg, image/png', + accept: 'image/jpeg, image/png, image/svg+xml', maxSize: 10024 * 10024, }) diff --git a/src/admin/project/settings/event/ProjectSettingsForm.jsx b/src/admin/project/settings/event/ProjectSettingsForm.jsx index d84658383..b4aaef0e6 100644 --- a/src/admin/project/settings/event/ProjectSettingsForm.jsx +++ b/src/admin/project/settings/event/ProjectSettingsForm.jsx @@ -18,7 +18,6 @@ import SidePanelUploadLayout from '../../../baseComponents/layouts/sidepanel/upl import { editProject } from '../../core/actions/editProject' import RestrictVoteRangeFields from './RestrictVoteRangeFields.jsx' import { SaveShortcut } from '../../../baseComponents/form/saveShortcut/SaveShortcut' -import { rURLWithLocalhostSupported } from '../../utils/rURLWithLocalhostSupported' const useStyles = makeStyles((theme) => ({ buttonContainer: { @@ -58,16 +57,8 @@ const ProjectSettingsForm = ({ project }) => { t('settingsEvent.fieldScheduleNotValid') ), logoUrl: string() - .matches( - rURLWithLocalhostSupported, - t('settingsEvent.fieldLogoUrlNotValid') - ) .required(t('settingsEvent.fieldLogoUrlRequired')), faviconUrl: string() - .matches( - rURLWithLocalhostSupported, - t('settingsEvent.fieldFaviconUrlNotValid') - ) .required(t('settingsEvent.fieldFaviconUrlRequired')), restrictVoteRange: boolean(), voteStartTime: string(), diff --git a/src/admin/project/utils/rURLWithLocalhostSupported.js b/src/admin/project/utils/rURLWithLocalhostSupported.js deleted file mode 100644 index 0343033b0..000000000 --- a/src/admin/project/utils/rURLWithLocalhostSupported.js +++ /dev/null @@ -1,3 +0,0 @@ -// Regex from https://github.com/jquense/yup/issues/224#issuecomment-497775991 -// yup prevent localhost:3000 to be considered as a valid url -export const rURLWithLocalhostSupported = /^(?:([a-z0-9+.-]+):\/\/)(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*\.?)(?::\d{2,5})?(?:[/?#]\S*)?$/ diff --git a/src/admin/translations/languages/en.admin.json b/src/admin/translations/languages/en.admin.json index 80314a700..23e8bf151 100644 --- a/src/admin/translations/languages/en.admin.json +++ b/src/admin/translations/languages/en.admin.json @@ -9,7 +9,7 @@ "search": "Search", "imageUrl": "Image URL", "uploadImage": "Upload image", - "imageHelp": "Image must be a jpeg or png image, less than 10MB" + "imageHelp": "Image must be a jpeg, png or svg image, less than 20MB" }, "common": { "back": "Back", diff --git a/src/admin/translations/languages/fr.admin.json b/src/admin/translations/languages/fr.admin.json index 4bf6d643c..e3eb025bf 100644 --- a/src/admin/translations/languages/fr.admin.json +++ b/src/admin/translations/languages/fr.admin.json @@ -9,7 +9,7 @@ "search": "Recherche", "imageUrl": "URL de l'image", "uploadImage": "Charger l'image", - "imageHelp": "L'image doit être au format png ou jpeg et faire moins de 10 Mo" + "imageHelp": "L'image doit être au format png, jpeg ou svg et faire moins de 20 Mo" }, "common": { "back": "Retour", diff --git a/src/superAdmin/SuperAdminProjects.tsx b/src/superAdmin/SuperAdminProjects.tsx index 33f9e474b..c12feecaf 100644 --- a/src/superAdmin/SuperAdminProjects.tsx +++ b/src/superAdmin/SuperAdminProjects.tsx @@ -104,7 +104,7 @@ export const SuperAdminProjects = () => { {range.name})} - + Date: Mon, 11 Nov 2024 21:29:40 +0100 Subject: [PATCH 2/2] Reviez --- src/admin/organization/theme/OrganizationTheme.jsx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/admin/organization/theme/OrganizationTheme.jsx b/src/admin/organization/theme/OrganizationTheme.jsx index 71227fc68..b02d2e169 100644 --- a/src/admin/organization/theme/OrganizationTheme.jsx +++ b/src/admin/organization/theme/OrganizationTheme.jsx @@ -6,7 +6,6 @@ import OFFormControl from '../../baseComponents/form/formControl/OFFormControl.j import { Field, Form, Formik } from 'formik' import ChipColorsEditor from '../../project/settings/event/ChipColorsEditor.jsx' import { object, string } from 'yup' -import { rURLWithLocalhostSupported } from '../../project/utils/rURLWithLocalhostSupported' import { useTranslation } from 'react-i18next' import { getSelectedOrganizationSelector } from '../core/organizationSelectors' import { useDispatch, useSelector } from 'react-redux' @@ -33,16 +32,8 @@ export const OrganizationTheme = () => {