diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 151512701..b7a01c9d9 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -10,6 +10,7 @@ import Register from "./Pages/Auth/Register/Register"; import Account from "./Pages/Account"; import Monitors from "./Pages/Monitors/Home"; import CreateMonitor from "./Pages/Monitors/CreateMonitor"; +import CreateInfrastructureMonitor from "./Pages/Infrastructure/CreateMonitor"; import Incidents from "./Pages/Incidents"; import Status from "./Pages/Status"; import Integrations from "./Pages/Integrations"; @@ -127,7 +128,10 @@ function App() { path="infrastructure" element={} /> - + } + /> } diff --git a/Client/src/Components/Inputs/Checkbox/index.jsx b/Client/src/Components/Inputs/Checkbox/index.jsx index a0348dedf..2f89d86df 100644 --- a/Client/src/Components/Inputs/Checkbox/index.jsx +++ b/Client/src/Components/Inputs/Checkbox/index.jsx @@ -40,7 +40,6 @@ const Checkbox = ({ /* TODO move sizes to theme */ const sizes = { small: "14px", medium: "16px", large: "18px" }; const theme = useTheme(); - return ( } @@ -66,7 +66,6 @@ const Checkbox = ({ sx={{ borderRadius: theme.shape.borderRadius, p: theme.spacing(2.5), - m: theme.spacing(-2.5), "& .MuiButtonBase-root": { width: theme.spacing(10), p: 0, @@ -90,7 +89,7 @@ const Checkbox = ({ Checkbox.propTypes = { id: PropTypes.string.isRequired, - label: PropTypes.string.isRequired, + label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired, size: PropTypes.oneOf(["small", "medium", "large"]), isChecked: PropTypes.bool.isRequired, value: PropTypes.string, diff --git a/Client/src/Components/Inputs/Field/index.css b/Client/src/Components/Inputs/Field/index.css index 2d251e4bf..33196b3b9 100644 --- a/Client/src/Components/Inputs/Field/index.css +++ b/Client/src/Components/Inputs/Field/index.css @@ -1,6 +1,15 @@ .field { - min-width: 250px; + min-width: var(--env-var-width-3); } + +.field-infrastructure-alert { + max-width: var(--env-var-width-4); +} + +.field-infrastructure-alert .MuiInputBase-root:has(input) { + height: var(--env-var-height-2); +} + .field h3.MuiTypography-root, .field h5.MuiTypography-root, .field input, @@ -14,7 +23,7 @@ padding-right: var(--env-var-spacing-1-minus); } .field .MuiInputBase-root:has(input) { - height: 34px; + height: var(--env-var-height-2); } .field .MuiInputBase-root:has(.MuiInputAdornment-root) { padding-right: var(--env-var-spacing-1-minus); diff --git a/Client/src/Components/Inputs/Field/index.jsx b/Client/src/Components/Inputs/Field/index.jsx index 0e558c197..d1eab532d 100644 --- a/Client/src/Components/Inputs/Field/index.jsx +++ b/Client/src/Components/Inputs/Field/index.jsx @@ -46,6 +46,7 @@ const Field = forwardRef( error, disabled, hidden, + className }, ref ) => { @@ -56,7 +57,7 @@ const Field = forwardRef( return ( - {error && ( + { error && (