diff --git a/Client/src/Components/Inputs/Autocomplete/index.jsx b/Client/src/Components/Inputs/Autocomplete/index.jsx
deleted file mode 100644
index 5256efccc..000000000
--- a/Client/src/Components/Inputs/Autocomplete/index.jsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Autocomplete, TextField } from "@mui/material";
-import React from "react";
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-
-/**
- * @example
- *
- * const options = [
- * { _id: "66d6119ef959cbc681e034f0", name: "Googler" },
- * { _id: "66d6119ef959cbc681e034f0", name: "CNN" },
- * { _id: "66d61a1bf959cbc681e0353f", name: "X Corp." },
- * ];
- *
- *
- *
- */
-
-/**
- * AutoCompleteField component.
- *
- * @component
- * @param {Object} props - The component props.
- * @param {string} props.id - The ID of the autocomplete field.
- * @param {string} props.type - The type of the input field (text or number).
- * @param {Array} props.options - The options for the autocomplete field.
- * @param {string} props.placeholder - The placeholder text for the input field.
- * @param {boolean} props.disabled - Indicates if the field is disabled.
- * @returns {JSX.Element} The AutoCompleteField component.
- */
-
-const AutoCompleteField = ({
- id,
- type,
- options,
- placeholder = "Type to search",
- disabled,
-}) => {
- const [value, setValue] = React.useState();
- const [inputValue, setInputValue] = React.useState("");
- const theme = useTheme();
-
- return (
- {
- setValue(newValue);
- }}
- inputValue={inputValue}
- onInputChange={(event, newInputValue) => {
- setInputValue(newInputValue);
- }}
- options={options}
- getOptionLabel={(option) => option.name}
- renderInput={(params) => (
-
- )}
- renderOption={(props, option) => {
- const { key, ...optionProps } = props;
- return (
-
- {{option.name}}
-
- );
- }}
- slotProps={{
- popper: {
- sx: {
- "& ul": { p: 0 },
- "& li": { borderRadius: theme.shape.borderRadius },
- },
- },
- paper: {
- sx: {
- p: 2,
- fontSize: 13,
- },
- },
- }}
- />
- );
-};
-
-AutoCompleteField.displayName = "AutoCompleteField";
-
-AutoCompleteField.propTypes = {
- id: PropTypes.string,
- type: PropTypes.oneOf(["text", "number"]),
- options: PropTypes.array,
- placeholder: PropTypes.string,
- disabled: PropTypes.bool,
- setWidth: PropTypes.string,
-};
-
-export default AutoCompleteField;
diff --git a/Client/src/Components/Inputs/Search/index.jsx b/Client/src/Components/Inputs/Search/index.jsx
new file mode 100644
index 000000000..ab6586119
--- /dev/null
+++ b/Client/src/Components/Inputs/Search/index.jsx
@@ -0,0 +1,121 @@
+import PropTypes from "prop-types";
+import { Box, ListItem, Autocomplete, TextField } from "@mui/material";
+import { useTheme } from "@emotion/react";
+import SearchIcon from "../../../assets/icons/search.svg?react";
+
+const options = [
+ "Google",
+ "Material UI",
+ "Alias",
+ "Twitter",
+ "Discord",
+ "YouTube",
+];
+
+const Search = ({ id, sx }) => {
+ const theme = useTheme();
+
+ return (
+ (
+
+
+
+ ),
+ }}
+ sx={{
+ "& fieldset": {
+ borderColor: theme.palette.border.light,
+ borderRadius: theme.shape.borderRadius,
+ },
+ "& .MuiOutlinedInput-root:hover:not(:has(input:focus)):not(:has(textarea:focus)) fieldset":
+ {
+ borderColor: theme.palette.border.light,
+ },
+ }}
+ />
+ )}
+ filterOptions={(options, { inputValue }) => {
+ const filtered = options.filter((option) =>
+ option.toLowerCase().includes(inputValue.toLowerCase())
+ );
+
+ if (filtered.length === 0) {
+ return [{ label: "No monitors found", noOptions: true }];
+ }
+ return filtered;
+ }}
+ renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
+ return (
+
+ {option.noOptions ? option.label : option}
+
+ );
+ }}
+ slotProps={{
+ popper: {
+ keepMounted: true,
+ sx: {
+ "& ul": { p: 2 },
+ "& li.MuiAutocomplete-option": {
+ color: theme.palette.text.secondary,
+ px: 4,
+ borderRadius: theme.shape.borderRadius,
+ },
+ "& .MuiAutocomplete-listbox .MuiAutocomplete-option[aria-selected='true'], & .MuiAutocomplete-listbox .MuiAutocomplete-option[aria-selected='true'].Mui-focused, & .MuiAutocomplete-listbox .MuiAutocomplete-option[aria-selected='true']:hover":
+ {
+ backgroundColor: theme.palette.background.fill,
+ },
+ "& .MuiAutocomplete-noOptions": {
+ px: theme.spacing(6),
+ py: theme.spacing(5),
+ },
+ },
+ },
+ }}
+ sx={{
+ height: 34,
+ "&.MuiAutocomplete-root .MuiAutocomplete-input": { p: 0 },
+ ...sx,
+ }}
+ />
+ );
+};
+
+export default Search;
diff --git a/Client/src/Pages/Monitors/Details/styled.jsx b/Client/src/Pages/Monitors/Details/styled.jsx
index 42cc3560d..1e34fbbc9 100644
--- a/Client/src/Pages/Monitors/Details/styled.jsx
+++ b/Client/src/Pages/Monitors/Details/styled.jsx
@@ -40,8 +40,7 @@ export const ChartBox = styled(Stack)(({ theme }) => ({
fill: theme.palette.text.tertiary,
},
"& path": {
- transition: "fill 300ms ease",
- transition: "stroke-width 400ms ease",
+ transition: "fill 300ms ease, stroke-width 400ms ease",
},
}));
diff --git a/Client/src/Pages/Monitors/Home/index.jsx b/Client/src/Pages/Monitors/Home/index.jsx
index b66076387..a6518f56b 100644
--- a/Client/src/Pages/Monitors/Home/index.jsx
+++ b/Client/src/Pages/Monitors/Home/index.jsx
@@ -12,6 +12,7 @@ import StatusBox from "./StatusBox";
import Breadcrumbs from "../../../Components/Breadcrumbs";
import Greeting from "../../../Utils/greeting";
import MonitorTable from "./MonitorTable";
+import Search from "../../../Components/Inputs/Search";
const Monitors = ({ isAdmin }) => {
const theme = useTheme();
@@ -26,6 +27,8 @@ const Monitors = ({ isAdmin }) => {
let loading =
monitorState?.isLoading &&
monitorState?.monitorsSummary?.monitors?.length === 0;
+
+ console.log(monitorState.monitorsSummary.monitors);
return (
{loading ? (
@@ -85,7 +88,8 @@ const Monitors = ({ isAdmin }) => {
{
>
{monitorState?.monitorsSummary?.monitorCounts?.total || 0}
- {/* TODO - add search bar */}
+
+
+
diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js
index c80633a20..5d8d76cde 100644
--- a/Client/src/Utils/Theme/lightTheme.js
+++ b/Client/src/Utils/Theme/lightTheme.js
@@ -151,12 +151,14 @@ const lightTheme = createTheme({
styleOverrides: {
root: {
marginTop: 4,
+ padding: 0,
border: 1,
borderStyle: "solid",
borderColor: border.light,
borderRadius: 4,
boxShadow: shadow,
backgroundColor: background.main,
+ backgroundImage: "none",
},
},
},
@@ -183,7 +185,6 @@ const lightTheme = createTheme({
color: text.secondary,
fontSize: 13,
margin: 2,
- marginBottom: 0,
minWidth: 100,
"&:hover, &.Mui-selected, &.Mui-selected:hover, &.Mui-selected.Mui-focusVisible":
{