diff --git a/Client/package-lock.json b/Client/package-lock.json index 8090e52b1..8e84d7a57 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -15,8 +15,8 @@ "@mui/lab": "6.0.0-beta.20", "@mui/material": "6.2.1", "@mui/x-charts": "^7.5.1", - "@mui/x-data-grid": "7.23.2", - "@mui/x-date-pickers": "7.23.2", + "@mui/x-data-grid": "7.23.3", + "@mui/x-date-pickers": "7.23.3", "@reduxjs/toolkit": "2.5.0", "axios": "^1.7.4", "dayjs": "1.11.13", @@ -1448,9 +1448,9 @@ } }, "node_modules/@mui/x-data-grid": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.23.2.tgz", - "integrity": "sha512-Xhm4Bh+WiU5MSLFIZ8mE1egHoS0xPEVlwvjYvairPIkxNPubB7f+gtLkuAJ2+m+BYbgO7yDte+Pp7dfjkU+vOA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.23.3.tgz", + "integrity": "sha512-EiM5kut6N/0o0iEYx8A7M3fJqknAa1kcPvGhlX3hH50ERLDeuJaqoKzvRYLBbYKWydHIc+0hHIFcK5oQTXLenw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.25.7", @@ -1485,9 +1485,9 @@ } }, "node_modules/@mui/x-date-pickers": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.23.2.tgz", - "integrity": "sha512-Kt9VsEnShaBKiaastTYku66UIWptgc9UMA16d0G/0TkfIsvZrAD3iacQR6HHAXWspaFshdfsRmW2JAoFhzKZsg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.23.3.tgz", + "integrity": "sha512-bjTYX/QzD5ZhVZNNnastMUS3j2Hy4p4IXmJgPJ0vKvQBvUdfEO+ZF42r3PJNNde0FVT1MmTzkmdTlz0JZ6ukdw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.25.7", diff --git a/Client/package.json b/Client/package.json index 882ecfd38..1e22e76d3 100644 --- a/Client/package.json +++ b/Client/package.json @@ -18,8 +18,8 @@ "@mui/lab": "6.0.0-beta.20", "@mui/material": "6.2.1", "@mui/x-charts": "^7.5.1", - "@mui/x-data-grid": "7.23.2", - "@mui/x-date-pickers": "7.23.2", + "@mui/x-data-grid": "7.23.3", + "@mui/x-date-pickers": "7.23.3", "@reduxjs/toolkit": "2.5.0", "axios": "^1.7.4", "dayjs": "1.11.13", diff --git a/Client/src/Pages/Settings/styled.jsx b/Client/src/Components/ConfigBox/index.jsx similarity index 91% rename from Client/src/Pages/Settings/styled.jsx rename to Client/src/Components/ConfigBox/index.jsx index aeefdaebb..7650dd47f 100644 --- a/Client/src/Pages/Settings/styled.jsx +++ b/Client/src/Components/ConfigBox/index.jsx @@ -1,6 +1,6 @@ import { Stack, styled } from "@mui/material"; -export const ConfigBox = styled(Stack)(({ theme }) => ({ +const ConfigBox = styled(Stack)(({ theme }) => ({ display: "flex", flexDirection: "row", justifyContent: "space-between", @@ -34,3 +34,5 @@ export const ConfigBox = styled(Stack)(({ theme }) => ({ color: theme.palette.text.tertiary, }, })); + +export default ConfigBox; diff --git a/Client/src/Components/IconBox/index.jsx b/Client/src/Components/IconBox/index.jsx new file mode 100644 index 000000000..8000fbd64 --- /dev/null +++ b/Client/src/Components/IconBox/index.jsx @@ -0,0 +1,77 @@ +import { Box, styled } from "@mui/material"; +import PropTypes from "prop-types"; + +/** + * IconBox - A styled box component for rendering icons with consistent sizing and styling + * + * @component + * @param {Object} [props] - Configuration options for the IconBox + * @param {number} [props.height=34] - Height of the icon box + * @param {number} [props.width=34] - Width of the icon box + * @param {number} [props.minWidth=34] - Minimum width of the icon box + * @param {number} [props.borderRadius=4] - Border radius of the icon box + * @param {number} [props.svgWidth=20] - Width of the SVG icon + * @param {number} [props.svgHeight=20] - Height of the SVG icon + * + * @example + * // Basic usage + * + * + * + * + * @example + * // Customized usage + * + * + * + * + * @returns {React.ReactElement} A styled box containing an icon + */ +const IconBox = styled(Box)( + ({ + theme, + height = 34, + width = 34, + minWidth = 34, + borderRadius = 4, + svgWidth = 20, + svgHeight = 20, + }) => ({ + height: height, + minWidth: minWidth, + width: width, + position: "relative", + border: 1, + borderStyle: "solid", + borderColor: theme.palette.border.dark, + borderRadius: borderRadius, + backgroundColor: theme.palette.background.accent, + "& svg": { + position: "absolute", + top: "50%", + left: "50%", + transform: "translate(-50%, -50%)", + width: svgWidth, + height: svgHeight, + "& path": { + stroke: theme.palette.text.tertiary, + }, + }, + }) +); + +IconBox.propTypes = { + height: PropTypes.number, + width: PropTypes.number, + minWidth: PropTypes.number, + borderRadius: PropTypes.number, + svgWidth: PropTypes.number, + svgHeight: PropTypes.number, +}; + +export default IconBox; diff --git a/Client/src/Components/Inputs/Search/index.jsx b/Client/src/Components/Inputs/Search/index.jsx index c944955b9..9a1995726 100644 --- a/Client/src/Components/Inputs/Search/index.jsx +++ b/Client/src/Components/Inputs/Search/index.jsx @@ -40,6 +40,7 @@ const SearchAdornment = () => { //TODO keep search state inside of component const Search = ({ + label, id, options, filteredBy, @@ -76,6 +77,14 @@ const Search = ({ getOptionLabel={(option) => option[filteredBy]} renderInput={(params) => ( + + {label} + { }; ProtectedRoute.propTypes = { - children: PropTypes.elementType.isRequired, + children: PropTypes.element.isRequired, }; export default ProtectedRoute; diff --git a/Client/src/Pages/Auth/CheckEmail.jsx b/Client/src/Pages/Auth/CheckEmail.jsx index b36cca7b0..70acbe72d 100644 --- a/Client/src/Pages/Auth/CheckEmail.jsx +++ b/Client/src/Pages/Auth/CheckEmail.jsx @@ -5,10 +5,10 @@ import { useDispatch } from "react-redux"; import { useNavigate } from "react-router"; import { createToast } from "../../Utils/toastUtils"; import { forgotPassword } from "../../Features/Auth/authSlice"; -import { IconBox } from "./styled"; import Background from "../../assets/Images/background-grid.svg?react"; import EmailIcon from "../../assets/icons/email.svg?react"; import Logo from "../../assets/icons/bwu-icon.svg?react"; +import IconBox from "../../Components/IconBox"; import "./index.css"; const CheckEmail = () => { @@ -144,9 +144,22 @@ const CheckEmail = () => { textAlign="center" > - - - + + + + + Check your email We sent a password reset link to{" "} diff --git a/Client/src/Pages/Auth/ForgotPassword.jsx b/Client/src/Pages/Auth/ForgotPassword.jsx index 1fd5f1b2f..7fcc19531 100644 --- a/Client/src/Pages/Auth/ForgotPassword.jsx +++ b/Client/src/Pages/Auth/ForgotPassword.jsx @@ -6,12 +6,12 @@ import { forgotPassword } from "../../Features/Auth/authSlice"; import { useEffect, useState } from "react"; import { credentials } from "../../Validation/validation"; import { useNavigate } from "react-router-dom"; -import { IconBox } from "./styled"; import TextInput from "../../Components/Inputs/TextInput"; import Logo from "../../assets/icons/bwu-icon.svg?react"; import Key from "../../assets/icons/key.svg?react"; import Background from "../../assets/Images/background-grid.svg?react"; import LoadingButton from "@mui/lab/LoadingButton"; +import IconBox from "../../Components/IconBox"; import "./index.css"; const ForgotPassword = () => { @@ -146,9 +146,22 @@ const ForgotPassword = () => { textAlign="center" > - - - + + + + + Forgot password? No worries, we'll send you reset instructions. diff --git a/Client/src/Pages/Auth/NewPasswordConfirmed.jsx b/Client/src/Pages/Auth/NewPasswordConfirmed.jsx index c380425c9..2c4ef0106 100644 --- a/Client/src/Pages/Auth/NewPasswordConfirmed.jsx +++ b/Client/src/Pages/Auth/NewPasswordConfirmed.jsx @@ -4,10 +4,10 @@ import { useNavigate } from "react-router"; import { useDispatch } from "react-redux"; import { clearAuthState } from "../../Features/Auth/authSlice"; import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice"; -import { IconBox } from "./styled"; import Background from "../../assets/Images/background-grid.svg?react"; import ConfirmIcon from "../../assets/icons/check-outlined.svg?react"; import Logo from "../../assets/icons/bwu-icon.svg?react"; +import IconBox from "../../Components/IconBox"; import "./index.css"; const NewPasswordConfirmed = () => { @@ -80,9 +80,22 @@ const NewPasswordConfirmed = () => { textAlign="center" > - - - + + + + + Password reset Your password has been successfully reset. Click below to log in magically. @@ -91,7 +104,7 @@ const NewPasswordConfirmed = () => {