Merge pull request #244 from bluewave-labs/feat/picture-validation

Added validation to picture uploads, resolves #213
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-07-02 12:58:12 -07:00
commit 65d55c239f
6 files changed
+224 -121

No files matched your search

+20 -7
View File
@@ -1,6 +1,6 @@
.progress-bar-container{ .progress-bar-container {
background-color: #fafafa; background-color: #fafafa;
padding: var(--env-var-spacing-1-plus); padding: var(--env-var-spacing-1-plus);
} }
.progress-bar-container h2.MuiTypography-root, .progress-bar-container h2.MuiTypography-root,
.progress-bar-container p.MuiTypography-root { .progress-bar-container p.MuiTypography-root {
@@ -10,9 +10,22 @@
.progress-bar-container p.MuiTypography-root { .progress-bar-container p.MuiTypography-root {
opacity: 0.6; opacity: 0.6;
} }
.progress-bar-container p.MuiTypography-root:has(span){ .progress-bar-container p.MuiTypography-root:has(span) {
font-size: 12px; font-size: 12px;
} }
.progress-bar-container p.MuiTypography-root span { .progress-bar-container p.MuiTypography-root span {
padding-left: 2px; padding-left: 2px;
} }
.progress-bar-container:has(p.input-error){
border-color: var(--env-var-color-24);
padding: 8px var(--env-var-spacing-1-plus);
}
.progress-bar-container p.input-error{
color: var(--env-var-color-24);
opacity: 0.8;
}
.progress-bar-container:has(p.input-error)>.MuiStack-root>svg{
fill: var(--env-var-color-24);
width: 20px;
height: 20px;
}
+70 -39
View File
@@ -9,6 +9,7 @@ import {
Typography, Typography,
} from "@mui/material"; } from "@mui/material";
import CloseIcon from "@mui/icons-material/Close"; import CloseIcon from "@mui/icons-material/Close";
import ErrorOutlineOutlinedIcon from "@mui/icons-material/ErrorOutlineOutlined";
import "./index.css"; import "./index.css";
/** /**
@@ -18,10 +19,18 @@ import "./index.css";
* @param {string} props.size - The size information for the progress item. * @param {string} props.size - The size information for the progress item.
* @param {number} props.progress - The current progress value (0-100). * @param {number} props.progress - The current progress value (0-100).
* @param {function} props.onClick - The function to handle click events on the remove button. * @param {function} props.onClick - The function to handle click events on the remove button.
* @param {string} props.error - Error message to display if there's an error (optional).
* @returns {JSX.Element} The rendered component. * @returns {JSX.Element} The rendered component.
*/ */
const ProgressUpload = ({ icon, label, size, progress = 0, onClick }) => { const ProgressUpload = ({
icon,
label,
size,
progress = 0,
onClick,
error,
}) => {
const theme = useTheme(); const theme = useTheme();
return ( return (
<Box <Box
@@ -34,8 +43,15 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick }) => {
border: `solid 1px ${theme.palette.otherColors.graishWhite}`, border: `solid 1px ${theme.palette.otherColors.graishWhite}`,
}} }}
> >
<Stack direction="row" mb="10px" gap="10px" alignItems="flex-end"> <Stack
{icon ? ( direction="row"
mb={error ? "0" : "10px"}
gap="10px"
alignItems={error ? "center" : "flex-end"}
>
{error ? (
<ErrorOutlineOutlinedIcon />
) : icon ? (
<IconButton <IconButton
sx={{ sx={{
backgroundColor: theme.palette.otherColors.white, backgroundColor: theme.palette.otherColors.white,
@@ -50,26 +66,36 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick }) => {
) : ( ) : (
"" ""
)} )}
<Box> {error ? (
<Typography variant="h4" component="h2" mb="5px"> <Typography component="p" className="input-error">
{label} {error}
</Typography> </Typography>
<Typography variant="h4" component="p"> ) : (
{size} <Box>
</Typography> <Typography component="h2" mb="5px">
</Box> {error ? error : label}
</Typography>
<Typography component="p">{!error && size}</Typography>
</Box>
)}
<IconButton <IconButton
onClick={onClick} onClick={onClick}
sx={{ sx={
alignSelf: "flex-start", !error
ml: "auto", ? {
mr: "-5px", alignSelf: "flex-start",
mt: "-5px", ml: "auto",
padding: "5px", mr: "-5px",
"&:focus": { mt: "-5px",
outline: "none", padding: "5px",
}, "&:focus": {
}} outline: "none",
},
}
: {
ml: "auto",
}
}
> >
<CloseIcon <CloseIcon
sx={{ sx={{
@@ -78,25 +104,29 @@ const ProgressUpload = ({ icon, label, size, progress = 0, onClick }) => {
/> />
</IconButton> </IconButton>
</Stack> </Stack>
<Stack direction="row" alignItems="center"> {!error ? (
<Box sx={{ width: "100%", mr: "10px" }}> <Stack direction="row" alignItems="center">
<LinearProgress <Box sx={{ width: "100%", mr: "10px" }}>
variant="determinate" <LinearProgress
value={progress} variant="determinate"
sx={{ value={progress}
width: "100%", sx={{
height: "10px", width: "100%",
borderRadius: theme.shape.borderRadius, height: "10px",
maxWidth: "500px", borderRadius: `${theme.shape.borderRadius}px`,
backgroundColor: theme.palette.otherColors.graishWhite, maxWidth: "500px",
}} backgroundColor: theme.palette.otherColors.graishWhite,
/> }}
</Box> />
<Typography variant="h4" component="p" sx={{ minWidth: "max-content" }}> </Box>
{progress} <Typography component="p" sx={{ minWidth: "max-content" }}>
<span>%</span> {progress}
</Typography> <span>%</span>
</Stack> </Typography>
</Stack>
) : (
""
)}
</Box> </Box>
); );
}; };
@@ -107,6 +137,7 @@ ProgressUpload.propTypes = {
size: PropTypes.string.isRequired, // Size information for the progress item size: PropTypes.string.isRequired, // Size information for the progress item
progress: PropTypes.number.isRequired, // Current progress value (0-100) progress: PropTypes.number.isRequired, // Current progress value (0-100)
onClick: PropTypes.func.isRequired, // Function to handle click events on the remove button onClick: PropTypes.func.isRequired, // Function to handle click events on the remove button
error: PropTypes.string, // Error message to display if there's an error (optional)
}; };
export default ProgressUpload; export default ProgressUpload;
@@ -7,7 +7,10 @@ import Button from "../../Button";
import EmailTextField from "../../TextFields/Email/EmailTextField"; import EmailTextField from "../../TextFields/Email/EmailTextField";
import StringTextField from "../../TextFields/Text/TextField"; import StringTextField from "../../TextFields/Text/TextField";
import Avatar from "../../Avatar"; import Avatar from "../../Avatar";
import { editProfileValidation } from "../../../Validation/validation"; import {
editProfileValidation,
imageValidation,
} from "../../../Validation/validation";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { update } from "../../../Features/Auth/authSlice"; import { update } from "../../../Features/Auth/authSlice";
import ImageField from "../../TextFields/Image"; import ImageField from "../../TextFields/Image";
@@ -76,12 +79,30 @@ const ProfilePanel = () => {
const [uploadProgress, setUploadProgress] = useState(0); const [uploadProgress, setUploadProgress] = useState(0);
const [isUploading, setIsUploading] = useState(false); const [isUploading, setIsUploading] = useState(false);
const handlePicture = (event) => { const handlePicture = (event) => {
clearError("picture");
const pic = event.target.files[0]; const pic = event.target.files[0];
console.log(pic); console.log(pic);
//TODO - add setPicture state to localData //TODO - add setPicture state to localData
setPicture({ name: pic.name, type: pic.type, size: formatBytes(pic.size) }); setPicture({ name: pic.name, type: pic.type, size: formatBytes(pic.size) });
setIsUploading(true); setIsUploading(true);
const { error } = imageValidation.validate(
{
type: pic.type,
size: pic.size,
},
{ abortEarly: false }
);
if (error) {
setErrors((prev) => {
const updatedErrors = { ...prev };
updatedErrors["picture"] = error.details[0].message;
return updatedErrors;
});
return;
}
setTimeout(() => { setTimeout(() => {
//TODO - add setPicture state to localData //TODO - add setPicture state to localData
setPicture((prev) => ({ ...prev, src: URL.createObjectURL(pic) })); setPicture((prev) => ({ ...prev, src: URL.createObjectURL(pic) }));
@@ -98,20 +119,28 @@ const ProfilePanel = () => {
}; };
const formatBytes = (bytes) => { const formatBytes = (bytes) => {
if (bytes === 0) return "0 Bytes"; if (bytes === 0) return "0 Bytes";
const k = 1024; const megabytes = bytes / (1024 * 1024);
const i = Math.floor(Math.log(bytes) / Math.log(k)); return megabytes.toFixed(2) + " MB";
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " MB"; };
const clearError = (err) => {
setErrors((prev) => {
const updatedErrors = { ...prev };
if (updatedErrors[err]) delete updatedErrors[err];
return updatedErrors;
});
}; };
const handleCancelUpload = () => { const handleCancelUpload = () => {
//TODO - add setPicture state to localData //TODO - add setPicture state to localData
setPicture(null); setPicture();
setUploadProgress(0); setUploadProgress(0);
setIsUploading(false); setIsUploading(false);
clearError("picture");
}; };
const handleClosePictureModal = () => { const handleClosePictureModal = () => {
setIsOpen(""); setIsOpen("");
setUploadProgress(0); setUploadProgress(0);
setIsUploading(false); setIsUploading(false);
clearError("picture");
}; };
//TODO - revisit once localData is set up properly //TODO - revisit once localData is set up properly
@@ -353,7 +382,6 @@ const ProfilePanel = () => {
aria-describedby="update-profile-picture" aria-describedby="update-profile-picture"
open={isModalOpen("picture")} open={isModalOpen("picture")}
onClose={handleClosePictureModal} onClose={handleClosePictureModal}
disablePortal
> >
<Stack <Stack
sx={{ sx={{
@@ -387,6 +415,7 @@ const ProfilePanel = () => {
size={picture?.size} size={picture?.size}
progress={uploadProgress} progress={uploadProgress}
onClick={handleCancelUpload} onClick={handleCancelUpload}
error={errors["picture"]}
/> />
) : ( ) : (
"" ""
@@ -1,13 +1,27 @@
.image-field-wrapper h2.MuiTypography-root, .image-field-wrapper h2.MuiTypography-root,
.image-field-wrapper p.MuiTypography-root { .image-field-wrapper p.MuiTypography-root,
.image-field-wrapper + p.MuiTypography-root,
.MuiStack-root:has(#modal-update-picture) h1.MuiTypography-root {
color: var(--env-var-color-2); color: var(--env-var-color-2);
}
.MuiStack-root:has(#modal-update-picture) h1.MuiTypography-root {
font-weight: 600;
}
.image-field-wrapper h2.MuiTypography-root,
.MuiStack-root:has(#modal-update-picture) button,
.MuiStack-root:has(#modal-update-picture) h1.MuiTypography-root {
font-size: var(--env-var-font-size-medium); font-size: var(--env-var-font-size-medium);
} }
.image-field-wrapper h2.MuiTypography-root { .image-field-wrapper h2.MuiTypography-root {
margin-top: 10px; margin-top: 10px;
} }
.image-field-wrapper + p.MuiTypography-root {
margin-top: 8px;
}
.image-field-wrapper + p.MuiTypography-root,
.image-field-wrapper p.MuiTypography-root { .image-field-wrapper p.MuiTypography-root {
opacity: 0.8; opacity: 0.6;
font-size: var(--env-var-font-size-small-plus);
} }
.image-field-wrapper h2.MuiTypography-root span { .image-field-wrapper h2.MuiTypography-root span {
color: var(--env-var-color-3); color: var(--env-var-color-3);
@@ -27,77 +27,78 @@ const ImageField = ({ id, picture, onChange }) => {
return ( return (
<> <>
{!picture ? ( {!picture ? (
<Box <>
className="image-field-wrapper" <Box
mt="20px" className="image-field-wrapper"
sx={{ mt="20px"
position: "relative",
height: "fit-content",
border: "dashed",
borderRadius: `${theme.shape.borderRadius}px`,
borderColor: isDragging
? theme.palette.primary.main
: theme.palette.otherColors.graishWhite,
borderWidth: "2px",
transition: "0.2s",
"&:hover": {
borderColor: theme.palette.primary.main,
backgroundColor: "hsl(215, 87%, 51%, 0.05)",
},
}}
onDragEnter={handleDragEnter}
onDragLeave={handleDragLeave}
onDrop={handleDragLeave}
>
<TextField
id={id}
type="file"
onChange={onChange}
sx={{ sx={{
width: "100%", position: "relative",
"& .MuiInputBase-input[type='file']": { height: "fit-content",
opacity: 0, border: "dashed",
cursor: "pointer", borderRadius: `${theme.shape.borderRadius}px`,
maxWidth: "500px", borderColor: isDragging
minHeight: "175px" ? theme.palette.primary.main
}, : theme.palette.otherColors.graishWhite,
"& fieldset": { borderWidth: "2px",
padding: 0, transition: "0.2s",
border: "none", "&:hover": {
borderColor: theme.palette.primary.main,
backgroundColor: "hsl(215, 87%, 51%, 0.05)",
}, },
}} }}
/> onDragEnter={handleDragEnter}
<Stack onDragLeave={handleDragLeave}
className="custom-file-text" onDrop={handleDragLeave}
alignItems="center"
gap="10px"
sx={{
position: "absolute",
top: "50%",
left: "50%",
transform: "translate(-50%, -50%)",
zIndex: "-1",
width: "100%",
}}
> >
<IconButton <TextField
id={id}
type="file"
onChange={onChange}
sx={{ sx={{
pointerEvents: "none", width: "100%",
borderRadius: `${theme.shape.borderRadius}px`, "& .MuiInputBase-input[type='file']": {
border: `solid ${theme.shape.borderThick}px ${theme.palette.otherColors.graishWhite}`, opacity: 0,
boxShadow: theme.shape.boxShadow, cursor: "pointer",
maxWidth: "500px",
minHeight: "175px",
},
"& fieldset": {
padding: 0,
border: "none",
},
}}
/>
<Stack
className="custom-file-text"
alignItems="center"
gap="4px"
sx={{
position: "absolute",
top: "50%",
left: "50%",
transform: "translate(-50%, -50%)",
zIndex: "-1",
width: "100%",
}} }}
> >
<CloudUploadIcon /> <IconButton
</IconButton> sx={{
<Typography variant="h4" component="h2"> pointerEvents: "none",
<span>Click to upload</span> or drag and drop borderRadius: `${theme.shape.borderRadius}px`,
</Typography> border: `solid ${theme.shape.borderThick}px ${theme.palette.otherColors.graishWhite}`,
<Typography variant="h4" component="p"> boxShadow: theme.shape.boxShadow,
(max. 800x400px) }}
</Typography> >
</Stack> <CloudUploadIcon />
</Box> </IconButton>
<Typography component="h2">
<span>Click to upload</span> or drag and drop
</Typography>
<Typography component="p">(maximum size: 3MB)</Typography>
</Stack>
</Box>
<Typography component="p">Supported formats: JPG, PNG</Typography>
</>
) : ( ) : (
<Stack direction="row" justifyContent="center"> <Stack direction="row" justifyContent="center">
<Box <Box
@@ -107,10 +108,9 @@ const ImageField = ({ id, picture, onChange }) => {
borderRadius: "50%", borderRadius: "50%",
overflow: "hidden", overflow: "hidden",
backgroundImage: `url(${picture})`, backgroundImage: `url(${picture})`,
backgroundSize: "cover" backgroundSize: "cover",
}} }}
> ></Box>
</Box>
</Stack> </Stack>
)} )}
</> </>
+16
View File
@@ -150,7 +150,23 @@ const createMonitorValidation = joi.object({
}), }),
}); });
const imageValidation = joi.object({
type: joi.string().valid("image/jpeg", "image/png").messages({
"any.only": "Invalid file format.",
"string.empty": "File type required.",
}),
size: joi
.number()
.max(3 * 1024 * 1024)
.messages({
"number.base": "File size must be a number.",
"number.max": "File size must be less than 3 MB.",
"number.empty": "File size required.",
}),
});
export { export {
imageValidation,
createMonitorValidation, createMonitorValidation,
registerValidation, registerValidation,
loginValidation, loginValidation,