remove dead check

fix: Incident Controller/Service typing

.github/workflows/deploy-images-on-release.yml

@@ -107,6 +107,7 @@ jobs:
           context: .
           file: ./docker/dist-arm/server.Dockerfile
           push: true
+          no-cache: true
           tags: |
             ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:${{ steps.extract_tag.outputs.version }}
           platforms: linux/amd64,linux/arm64

.github/workflows/deploy-images.yml

@@ -102,6 +102,7 @@ jobs:
           context: .
           file: ./docker/dist-arm/server.Dockerfile
           push: true
+          no-cache: true
           tags: |
             ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
           platforms: linux/amd64,linux/arm64

.gitignore

@@ -5,4 +5,6 @@
 mongo
 node_modules/
 docs/architecture
-docs/reviews
+docs/reviews
+docs/todo
+docs/frontend

README.md

@@ -42,15 +42,15 @@ Checkmate has been stress-tested with 1000+ active monitors without any particul
 
 ## Demo
 
-You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is uptimedemo@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
+You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.ca/) in action. The username is demouser@demo.com and the password is Demouser1! (just a note that we update the demo server from time to time, so if it doesn't work for you, please ping us on the Discussions channel).
 
 ## User's guide
 
-Usage instructions can be found [here](https://docs.checkmate.so/checkmate-2.1). It's still WIP and some of the information there might be outdated as we continuously add features weekly. Rest assured, we are doing our best! :)
+Usage instructions can be found [here](https://checkmate.so/docs). 
 
 ## Installation
 
-See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). 
+See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
 
 Alternatively, you can also use [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
 
@@ -157,12 +157,11 @@ Here's how you can contribute:
 
 0. Star this repo :)
 1. Check [Contributor's guideline](https://github.com/bluewave-labs/Checkmate/blob/develop/CONTRIBUTING.md). First timers are encouraged to check `good-first-issue` tag.
-2. Check [project structure](https://docs.checkmate.so/checkmate-2.1/developers-guide/general-project-structure) and [high level overview](https://bluewavelabs.gitbook.io/checkmate/developers-guide/high-level-overview).
-3. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
-4. Open an issue if you believe you've encountered a bug.
-5. Check for good-first-issue's if you are a newcomer.
-6. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
-7. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
+2. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
+3. Open an issue if you believe you've encountered a bug.
+4. Check for good-first-issue's if you are a newcomer.
+5. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
+6. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
 
 <a href="https://github.com/bluewave-labs/checkmate/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
@@ -175,9 +174,3 @@ Here's how you can contribute:
 Thanks to [Gitbook](https://gitbook.io/) for giving us a free tier for their documentation platform, and [Poeditor](https://poeditor.com/) providing us a free account to use their i18n services. If you would like to sponsor Checkmate, please send an email to hello@bluewavelabs.ca
 
 If you would like to sponsor a feature, [see this page](https://checkmate.so/sponsored-features).
-
-Also check other developer and contributor-friendly projects of BlueWave:
-
-- [VerifyWise](https://github.com/bluewave-labs/verifywise), the first open source AI governance platform.
-- [DataRoom](https://github.com/bluewave-labs/bluewave-dataroom), an secure file sharing application, aka dataroom.
-- [Guidefox](https://github.com/bluewave-labs/guidefox), an application that helps new users learn how to use your product via hints, tours, popups and banners.

client/package.json

@@ -13,7 +13,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "npm run format"
+		"**/*": "prettier --write"
 	},
 	"dependencies": {
 		"@emotion/react": "^11.13.3",
@@ -25,6 +25,7 @@
 		"@mui/x-charts": "7.29.1",
 		"@mui/x-date-pickers": "7.29.4",
 		"@reduxjs/toolkit": "2.7.0",
+		"@types/maplibre-gl": "^1.13.2",
 		"axios": "^1.7.4",
 		"dayjs": "1.11.13",
 		"flag-icons": "7.3.2",
@@ -33,6 +34,7 @@
 		"i18next": "25.4.2",
 		"joi": "17.13.3",
 		"lucide-react": "^0.562.0",
+		"maplibre-gl": "^5.19.0",
 		"mui-color-input": "^7.0.0",
 		"pretty-bytes": "^7.1.0",
 		"pretty-ms": "^9.3.0",
@@ -41,6 +43,7 @@
 		"react-hook-form": "^7.63.0",
 		"react-i18next": "^15.4.0",
 		"react-icons": "5.5.0",
+		"react-map-gl": "^8.1.0",
 		"react-redux": "9.2.0",
 		"react-router": "^6.23.0",
 		"react-router-dom": "^6.23.1",
@@ -49,7 +52,7 @@
 		"redux-persist": "6.0.0",
 		"swr": "^2.3.6",
 		"vite-plugin-svgr": "^4.2.0",
-		"zod": "^4.1.11"
+		"zod": "^4.3.6"
 	},
 	"devDependencies": {
 		"@types/node": "24.5.2",
@@ -63,6 +66,6 @@
 		"lint-staged": "^16.2.7",
 		"prettier": "^3.3.3",
 		"typescript": "5.9.3",
-		"vite": "6.3.6"
+		"vite": "6.4.1"
 	}
 }

client/src/App.tsx

@@ -3,43 +3,53 @@ import { useSelector } from "react-redux";
 import "react-toastify/dist/ReactToastify.css";
 import { ToastContainer } from "react-toastify";
 import { ThemeProvider } from "@emotion/react";
-import lightTheme from "./Utils/Theme/lightTheme";
-import darkTheme from "./Utils/Theme/darkTheme";
 import { CssBaseline, GlobalStyles } from "@mui/material";
+import { SWRConfig } from "swr";
 import { Routes } from "./Routes";
-import AppLayout from "@/Components/v2/layout/AppLayout";
+import AppLayout from "@/Components/layout/AppLayout";
 import type { RootState } from "@/Types/state";
+import { lightTheme, darkTheme } from "@/Utils/Theme/Theme";
+
+const swrConfig = {
+	dedupingInterval: 5000,
+	revalidateOnFocus: false,
+	revalidateOnReconnect: true,
+	shouldRetryOnError: false,
+	errorRetryCount: 2,
+	errorRetryInterval: 1000,
+	focusThrottleInterval: 5000,
+};
 
 function App() {
 	const mode = useSelector((state: RootState) => state.ui.mode);
-
 	const theme = mode === "light" ? lightTheme : darkTheme;
 
 	return (
-		<ThemeProvider theme={theme}>
-			<CssBaseline />
-			<GlobalStyles
-				styles={{
-					body: {
-						// @ts-ignore
-						backgroundColor: theme.palette.background.main,
-					},
-				}}
-			/>
-			<AppLayout>
-				<Routes />
-			</AppLayout>
-			<ToastContainer
-				newestOnTop={true}
-				theme={mode}
-				style={
-					{
-						"--toastify-color-progress-light": "#7C8BA1",
-						"--toastify-color-progress-dark": "#7C8BA1",
-					} as CSSProperties
-				}
-			/>
-		</ThemeProvider>
+		<SWRConfig value={swrConfig}>
+			<ThemeProvider theme={theme}>
+				<CssBaseline />
+				<GlobalStyles
+					styles={{
+						body: {
+							backgroundColor: theme.palette.background.default,
+						},
+					}}
+				/>
+				<AppLayout>
+					<Routes />
+				</AppLayout>
+				<ToastContainer
+					newestOnTop={true}
+					theme={mode}
+					style={
+						{
+							"--toastify-color-progress-light": "#7C8BA1",
+							"--toastify-color-progress-dark": "#7C8BA1",
+						} as CSSProperties
+					}
+				/>
+			</ThemeProvider>
+		</SWRConfig>
 	);
 }
 

client/src/Components/common/charts/HeatmapResponseTime.tsx

@@ -2,7 +2,7 @@ import Box from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
 import type { CheckSnapshot } from "@/Types/Check";
 import { getResponseColor } from "@/Utils/DataUtils";
-import { HeatmapResponseTimeTooltip } from "@/Components/v2/common/charts/HeatmapResponseTimeTooltip";
+import { HeatmapResponseTimeTooltip } from "@/Components/common/charts/HeatmapResponseTimeTooltip";
 import type { SxProps } from "@mui/material/styles";
 import type { ResponsiveStyleValue } from "@mui/system";
 
@@ -32,7 +32,7 @@ export const HeatmapResponseTime = ({
 
 	if (!checks || checks.length === 0) return null;
 
-	const latestChecks = checks.slice(-25).reverse();
+	const latestChecks = checks.slice(-25);
 
 	let data: Array<CheckSnapshot | PlaceholderCheck>;
 	if (latestChecks.length !== 25) {

client/src/Components/common/controls/HeaderTimeRange.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
-import { ToggleButtonGroup, ToggleButton } from "@/Components/v2/inputs";
+import { ToggleButtonGroup, ToggleButton } from "@/Components/inputs";
 import { useTheme } from "@mui/material/styles";
 import CircularProgress from "@mui/material/CircularProgress";
 import { useTranslation } from "react-i18next";

client/src/Components/common/index.ts

@@ -0,0 +1,5 @@
+export * from "./charts/HistogramResponseTime";
+export * from "./charts/HeatmapResponseTime";
+export * from "./charts/HeatmapResponseTimeTooltip";
+export * from "./controls/HeaderCreate";
+export * from "./controls/HeaderTimeRange";

client/src/Components/design-elements/BaseChart.tsx

@@ -1,7 +1,8 @@
-import { BaseBox } from "../design-elements";
+import { BaseBox } from ".";
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
+import { LAYOUT } from "@/Utils/Theme/constants";
 import type { ResponsiveStyleValue } from "@mui/system";
 
 import { useTheme } from "@mui/material/styles";
@@ -26,7 +27,7 @@ export const BaseChart = ({
 	return (
 		<BaseBox
 			sx={{
-				padding: padding ?? theme.spacing(8),
+				padding: padding ?? theme.spacing(LAYOUT.MD),
 				display: "flex",
 				flex: 1,
 				width: width,
@@ -34,13 +35,13 @@ export const BaseChart = ({
 			}}
 		>
 			<Stack
-				gap={theme.spacing(8)}
+				gap={theme.spacing(LAYOUT.MD)}
 				flex={1}
 			>
 				<Stack
 					direction="row"
 					alignItems={"center"}
-					gap={theme.spacing(4)}
+					gap={theme.spacing(LAYOUT.XS)}
 				>
 					{icon && (
 						<BaseBox

client/src/Components/design-elements/BasePage.tsx

@@ -3,13 +3,14 @@ import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Alert from "@mui/material/Alert";
 import Link from "@mui/material/Link";
+import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 import {
 	ErrorFallback,
 	EmptyFallback,
 	EmptyMonitorFallback,
 	BaseFallback,
-} from "@/Components/v2/design-elements/Fallback";
-import { Breadcrumb } from "@/Components/v2/design-elements/Breadcrumb";
+} from "@/Components/design-elements/Fallback";
+import { Breadcrumb } from "@/Components/design-elements/Breadcrumb";
 import CircularProgress from "@mui/material/CircularProgress";
 import { HeaderAuthControls } from "@/Pages/Auth/components/HeaderAuthControls";
 
@@ -91,7 +92,7 @@ export const BasePage = ({
 
 	return (
 		<Stack
-			spacing={theme.spacing(10)}
+			spacing={theme.spacing(LAYOUT.LG)}
 			{...props}
 		>
 			<Breadcrumb breadcrumbOverride={breadcrumbOverride} />
@@ -220,7 +221,7 @@ export const BaseAuthPage = ({
 	return (
 		<BasePage
 			breadcrumbOverride={[]}
-			gap={theme.spacing(8)}
+			gap={theme.spacing(LAYOUT.MD)}
 			alignItems={"center"}
 			justifyContent={"center"}
 			minHeight="100vh"
@@ -229,7 +230,7 @@ export const BaseAuthPage = ({
 		>
 			<HeaderAuthControls
 				hideLogo
-				py={theme.spacing(4)}
+				py={theme.spacing(LAYOUT.XS)}
 				position={"absolute"}
 				top={0}
 				left={0}
@@ -243,14 +244,14 @@ export const BaseAuthPage = ({
 			<Stack alignItems={"center"}>
 				<Typography
 					variant="h1"
-					mb={theme.spacing(2)}
+					mb={theme.spacing(SPACING.LG)}
 				>
 					{title}
 				</Typography>
 				<Typography variant="h2">{subtitle}</Typography>
 			</Stack>
 			<Stack
-				gap={theme.spacing(8)}
+				gap={theme.spacing(LAYOUT.MD)}
 				width={{
 					xs: "80%",
 					md: "25%",

client/src/Components/design-elements/BulletPointCheck.tsx

@@ -2,6 +2,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Check } from "lucide-react";
 import { useTheme } from "@mui/material/styles";
+import { LAYOUT } from "@/Utils/Theme/constants";
 
 export const BulletPointCheck = ({
 	text,
@@ -21,7 +22,7 @@ export const BulletPointCheck = ({
 	return (
 		<Stack
 			direction="row"
-			gap={theme.spacing(6)}
+			gap={theme.spacing(LAYOUT.SM)}
 			alignItems="center"
 		>
 			<Check

client/src/Components/design-elements/Fallback.tsx

@@ -1,7 +1,8 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { BulletPointCheck, SkeletonCard } from "@/Components/v2/design-elements";
-import { Button } from "@/Components/v2/inputs";
+import { BulletPointCheck, SkeletonCard } from "@/Components/design-elements";
+import { Button } from "@/Components/inputs";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 
 import { useNavigate } from "react-router";
 import useMediaQuery from "@mui/material/useMediaQuery";
@@ -27,7 +28,7 @@ export const BaseFallback = ({ children, ...props }: BaseFallbackProps) => {
 				lg: "50%",
 				xl: "40%",
 			}}
-			padding={{ xs: theme.spacing(8), md: theme.spacing(16) }}
+			padding={{ xs: theme.spacing(LAYOUT.MD), md: theme.spacing(LAYOUT.XXL) }}
 			bgcolor={theme.palette.background.paper}
 			border={1}
 			borderColor={theme.palette.divider}
@@ -55,7 +56,7 @@ export const ErrorFallback = ({
 		<BaseFallback>
 			<Typography
 				variant="h1"
-				marginY={theme.spacing(4)}
+				marginY={theme.spacing(LAYOUT.XS)}
 				color={theme.palette.text.secondary}
 			>
 				{title}
@@ -81,20 +82,15 @@ export const EmptyFallback = ({
 	return (
 		<BaseFallback>
 			<Stack
-				gap={theme.spacing(10)}
+				gap={theme.spacing(LAYOUT.MD)}
 				zIndex={1}
 				alignItems="center"
 			>
-				<Typography
-					component="h1"
-					color={theme.palette.primary.contrastText}
-				>
-					{title}
-				</Typography>
+				<Typography component="h1">{title}</Typography>
 				<Stack
 					sx={{
 						flexWrap: "wrap",
-						gap: theme.spacing(2),
+						gap: theme.spacing(SPACING.MD),
 						maxWidth: "1100px",
 						width: "100%",
 					}}
@@ -139,7 +135,7 @@ export const EmptyMonitorFallback = ({
 	return (
 		<BaseFallback>
 			<Stack
-				gap={theme.spacing(10)}
+				gap={theme.spacing(LAYOUT.MD)}
 				zIndex={1}
 				alignItems="center"
 			>
@@ -152,7 +148,7 @@ export const EmptyMonitorFallback = ({
 				<Stack
 					sx={{
 						flexWrap: "wrap",
-						gap: theme.spacing(2),
+						gap: theme.spacing(SPACING.MD),
 						maxWidth: "1100px",
 						width: "100%",
 					}}

client/src/Components/design-elements/Gauge.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";

client/src/Components/design-elements/MonitorStatus.tsx

@@ -1,11 +1,11 @@
 import type { Monitor } from "@/Types/Monitor";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { PulseDot, Dot } from "@/Components/v2/design-elements";
+import { PulseDot, Dot } from "@/Components/design-elements";
 import { getStatusColor, formatUrl } from "@/Utils/MonitorUtils";
 import { useTheme } from "@mui/material/styles";
 import prettyMilliseconds from "pretty-ms";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import useMediaQuery from "@mui/material/useMediaQuery";
 export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 	const theme = useTheme();
@@ -19,7 +19,6 @@ export const MonitorStatus = ({ monitor }: { monitor: Monitor }) => {
 			<Typography
 				fontSize={typographyLevels.xl}
 				fontWeight={500}
-				color={theme.palette.primary.contrastText}
 				overflow={"hidden"}
 				textOverflow={"ellipsis"}
 				whiteSpace={"nowrap"}

client/src/Components/design-elements/SplitBox.tsx

@@ -3,6 +3,7 @@ import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
+import { LAYOUT } from "@/Utils/Theme/constants";
 export const SplitBox = ({
 	left,
 	right,
@@ -18,10 +19,10 @@ export const SplitBox = ({
 			bgcolor={theme.palette.background.paper}
 			border={1}
 			borderColor={theme.palette.divider}
-			borderRadius={theme.spacing(2)}
+			borderRadius={theme.shape.borderRadius}
 		>
 			<Box
-				padding={theme.spacing(15)}
+				padding={theme.spacing(LAYOUT.XXL)}
 				borderRight={isSmall ? 0 : 1}
 				borderBottom={isSmall ? 1 : 0}
 				borderColor={theme.palette.divider}
@@ -37,7 +38,7 @@ export const SplitBox = ({
 			</Box>
 			<Box
 				flex={1}
-				padding={theme.spacing(15)}
+				padding={theme.spacing(LAYOUT.XXL)}
 			>
 				{right}
 			</Box>
@@ -60,7 +61,7 @@ export const ConfigBox = ({
 	return (
 		<SplitBox
 			left={
-				<Stack spacing={theme.spacing(4)}>
+				<Stack spacing={theme.spacing(LAYOUT.XS)}>
 					<Typography
 						textTransform={"capitalize"}
 						component="h2"

client/src/Components/design-elements/StatBox.tsx

@@ -4,8 +4,8 @@ import Box from "@mui/material/Box";
 import { useTheme } from "@mui/material/styles";
 import { lighten } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
-import type { PaletteKey } from "@/Utils/Theme/v2Theme";
-import { BaseBox, TooltipWithInfo } from "@/Components/v2/design-elements";
+import type { PaletteKey } from "@/Utils/Theme/Theme";
+import { BaseBox, TooltipWithInfo } from "@/Components/design-elements";
 import type { SxProps } from "@mui/material";
 
 type GradientBox = React.PropsWithChildren<{

client/src/Components/design-elements/StatusBox.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
-import { BaseBox } from "@/Components/v2/design-elements";
+import { BaseBox } from "@/Components/design-elements";
 import { useTranslation } from "react-i18next";
 import type { SxProps } from "@mui/material";
 

client/src/Components/design-elements/StatusLabel.tsx

@@ -1,5 +1,5 @@
 import Box from "@mui/material/Box";
-import { BaseBox } from "@/Components/v2/design-elements";
+import { BaseBox } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
 
 import type { MonitorStatus } from "@/Types/Monitor";

client/src/Components/design-elements/Table.tsx

@@ -29,6 +29,7 @@ import type { TablePaginationOwnProps } from "@mui/material/TablePagination";
 import { useTranslation } from "react-i18next";
 import { useState, Fragment, useEffect } from "react";
 import { useTheme } from "@mui/material/styles";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import type { SxProps, Theme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";
 
@@ -90,20 +91,20 @@ export function DataTable<
 	// Return stack of cards for small screens
 	if (isSmall && cardsOnSmallScreens) {
 		return (
-			<Stack spacing={theme.spacing(4)}>
+			<Stack spacing={theme.spacing(LAYOUT.XS)}>
 				{data.map((row) => {
 					const key = row.id || row._id || Math.random();
 					keys.push(key);
 					return (
 						<Stack
 							onClick={() => (onRowClick ? onRowClick(row) : null)}
-							spacing={theme.spacing(4)}
+							spacing={theme.spacing(LAYOUT.XS)}
 							sx={{
 								borderStyle: "solid",
 								borderWidth: 1,
 								borderColor: theme.palette.divider,
 								borderRadius: theme.shape.borderRadius,
-								padding: theme.spacing(4),
+								padding: theme.spacing(LAYOUT.XS),
 								cursor: onRowClick ? "pointer" : "default",
 							}}
 							key={key}
@@ -155,7 +156,7 @@ export function DataTable<
 			<Table
 				sx={{
 					"&.MuiTable-root  :is(.MuiTableHead-root, .MuiTableBody-root) :is(th, td)": {
-						paddingLeft: theme.spacing(8),
+						paddingLeft: theme.spacing(LAYOUT.MD),
 					},
 					"& .MuiTableCell-root": {
 						borderBottom: `1px solid ${theme.palette.divider}`,
@@ -168,13 +169,13 @@ export function DataTable<
 						color: theme.palette.text.secondary,
 						fontWeight: 500,
 						textTransform: "uppercase",
-						padding: `${theme.spacing(2)} ${theme.spacing(8)}`,
+						padding: `${theme.spacing(SPACING.LG)} ${theme.spacing(LAYOUT.MD)}`,
 						fontSize: theme.typography.fontSize,
 					},
 					"& :is(td)": {
 						backgroundColor: theme.palette.background.paper,
 						color: theme.palette.text.secondary,
-						padding: `${theme.spacing(7)} ${theme.spacing(8)}`,
+						padding: `${theme.spacing(LAYOUT.MD)} ${theme.spacing(LAYOUT.MD)}`,
 						fontSize: theme.typography.fontSize,
 						overflowX: "hidden",
 					},
@@ -514,7 +515,7 @@ export const Pagination = ({ ...props }: PaginationProps) => {
 							display: "grid",
 							gridTemplateColumns: "1fr 1fr",
 							gridAutoRows: "auto",
-							rowGap: theme.spacing(1),
+							rowGap: theme.spacing(SPACING.SM),
 							alignItems: "center",
 							justifyItems: "center",
 							paddingLeft: 0,
@@ -556,8 +557,8 @@ const EmptyView = ({ text, positive }: { text?: string; positive?: boolean }) =>
 			alignItems={"center"}
 			justifyContent={"center"}
 			sx={{
-				py: theme.spacing(12),
-				px: theme.spacing(4),
+				py: theme.spacing(LAYOUT.XL),
+				px: theme.spacing(LAYOUT.XS),
 				borderWidth: 1,
 				borderStyle: "solid",
 				borderColor: theme.palette.divider,
@@ -574,7 +575,7 @@ const EmptyView = ({ text, positive }: { text?: string; positive?: boolean }) =>
 					display: "flex",
 					alignItems: "center",
 					justifyContent: "center",
-					mb: theme.spacing(2),
+					mb: theme.spacing(SPACING.LG),
 				}}
 			>
 				<Icon

client/src/Components/design-elements/TextLink.tsx

@@ -10,7 +10,7 @@ interface TextLinkProps extends StackProps {
 	text: string;
 	linkText: string;
 	href: string;
-	target?: string;
+	target?: "_self" | "_blank" | "_parent" | "_top";
 }
 
 export const TextLink = ({
@@ -34,6 +34,7 @@ export const TextLink = ({
 				to={href}
 				component={RouterLink}
 				target={target}
+				{...(target === "_blank" && { rel: "noopener noreferrer" })}
 			>
 				{linkText}
 			</Link>

client/src/Components/inputs/AutoComplete.tsx

@@ -1,6 +1,6 @@
 import Autocomplete from "@mui/material/Autocomplete";
 import type { AutocompleteProps } from "@mui/material/Autocomplete";
-import { TextField, Checkbox } from "@/Components/v2/inputs";
+import { TextField, Checkbox } from "@/Components/inputs";
 import ListItem from "@mui/material/ListItem";
 import Stack from "@mui/material/Stack";
 import { useTheme } from "@mui/material/styles";

client/src/Components/inputs/ColorPicker.tsx

@@ -1,9 +1,9 @@
 import { MuiColorInput } from "mui-color-input";
 import type { MuiColorInputProps } from "mui-color-input";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTheme } from "@mui/material";
 import Stack from "@mui/material/Stack";
-import { FieldLabel } from "@/Components/v2/inputs/FieldLabel";
+import { FieldLabel } from "@/Components/inputs/FieldLabel";
 
 interface ColorPickerProps extends MuiColorInputProps {
 	fieldLabel?: string;

client/src/Components/inputs/Dialog.tsx

@@ -4,8 +4,8 @@ import DialogActions from "@mui/material/DialogActions";
 import DialogContent from "@mui/material/DialogContent";
 import DialogContentText from "@mui/material/DialogContentText";
 import DialogTitle from "@mui/material/DialogTitle";
-import { Button } from "@/Components/v2/inputs";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { Button } from "@/Components/inputs";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTranslation } from "react-i18next";
 import type { ReactNode } from "react";
 

client/src/Components/inputs/LanguageSelector.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import MenuItem from "@mui/material/MenuItem";
-import { Select } from "@/Components/v2/inputs";
+import { Select } from "@/Components/inputs";
 import "flag-icons/css/flag-icons.min.css";
 
 import { useTranslation } from "react-i18next";

client/src/Components/inputs/Slider.tsx

@@ -11,20 +11,26 @@ import type { ResponsiveStyleValue } from "@mui/system";
 interface SliderInputProps extends SliderProps {
 	sx?: SliderProps["sx"];
 	showValue?: boolean;
+	formatDisplayValue?: (value: number) => string;
 }
 
 export const SliderInput = forwardRef<HTMLSpanElement, SliderInputProps>(
-	({ sx, showValue = false, ...props }, ref) => {
+	({ sx, showValue = false, formatDisplayValue, ...props }, ref) => {
 		const theme = useTheme();
 		const additionalSx = Array.isArray(sx) ? sx : sx ? [sx] : [];
 
+		const displayValue =
+			showValue && formatDisplayValue && typeof props.value === "number"
+				? formatDisplayValue(props.value)
+				: props.value;
+
 		return (
 			<Stack
 				gap={theme.spacing(8)}
 				direction={"row"}
 				alignItems={"center"}
 			>
-				{showValue && <Typography>{props.value}</Typography>}
+				{showValue && <Typography>{displayValue}</Typography>}
 				<Slider
 					{...props}
 					ref={ref}
@@ -63,12 +69,21 @@ interface SliderWithLabelProps extends SliderProps {
 	fieldLabel?: string;
 	required?: boolean;
 	showValue?: boolean;
+	formatDisplayValue?: (value: number) => string;
 	sliderMaxWidth?: ResponsiveStyleValue<number | string>;
 }
 
 export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>(
 	(
-		{ fieldLabel, required, showValue = true, value, sliderMaxWidth = "100%", ...props },
+		{
+			fieldLabel,
+			required,
+			showValue = true,
+			formatDisplayValue,
+			value,
+			sliderMaxWidth = "100%",
+			...props
+		},
 		ref
 	) => {
 		const theme = useTheme();
@@ -82,6 +97,7 @@ export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>
 					<SliderInput
 						{...props}
 						showValue={showValue}
+						formatDisplayValue={formatDisplayValue}
 						value={value}
 						ref={ref}
 					/>

client/src/Components/inputs/TextInput.tsx

@@ -1,7 +1,7 @@
 import { forwardRef } from "react";
 import TextField from "@mui/material/TextField";
 import type { TextFieldProps } from "@mui/material";
-import { typographyLevels } from "@/Utils/Theme/v2Palette";
+import { typographyLevels } from "@/Utils/Theme/Palette";
 import { useTheme } from "@mui/material/styles";
 import Stack from "@mui/material/Stack";
 import { FieldLabel } from "./FieldLabel";

client/src/Components/layout/AppLayout.tsx

@@ -1,11 +1,7 @@
 import Box from "@mui/material/Box";
 import { useState, useEffect, useRef } from "react";
-import { ThemeProvider, useTheme } from "@mui/material/styles";
-import { useSelector } from "react-redux";
-import BackgroundSVG from "@/assets/Images/background.svg";
-import type { RootState } from "@/Types/state";
-import { lightTheme, darkTheme } from "@/Utils/Theme/v2Theme";
-import { OfflineBanner } from "@/Components/v2/design-elements";
+import { useTheme } from "@mui/material/styles";
+import { OfflineBanner } from "@/Components/design-elements";
 import { setServerUnreachableCallback, get } from "@/Utils/ApiClient";
 
 interface AppLayoutProps {
@@ -14,9 +10,6 @@ interface AppLayoutProps {
 
 const AppLayout = ({ children }: AppLayoutProps) => {
 	const theme = useTheme();
-	const mode = useSelector((state: RootState) => state.ui.mode);
-	const v2theme = mode === "dark" ? darkTheme : lightTheme;
-
 	const [serverUnreachable, setServerUnreachable] = useState(false);
 	const retryIntervalRef = useRef<number | null>(null);
 
@@ -49,18 +42,10 @@ const AppLayout = ({ children }: AppLayoutProps) => {
 		<Box
 			sx={{
 				minHeight: "100vh",
-				// @ts-expect-error custom palette property
-				backgroundColor: theme.palette.primaryBackground.main,
-				backgroundImage: mode === "dark" ? `url("${BackgroundSVG}")` : "none",
-				backgroundSize: "100% 100%",
-				backgroundPosition: "center",
-				backgroundRepeat: "no-repeat",
-				color: theme.palette.primary.contrastText,
+				backgroundColor: theme.palette.background.default,
 			}}
 		>
-			<ThemeProvider theme={v2theme}>
-				<OfflineBanner visible={serverUnreachable} />
-			</ThemeProvider>
+			<OfflineBanner visible={serverUnreachable} />
 			{children}
 		</Box>
 	);

client/src/Components/layout/RootLayout.tsx

@@ -1,26 +1,19 @@
-import { Sidebar } from "@/Components/v2/sidebar";
+import { Sidebar } from "@/Components/sidebar";
 import { Outlet } from "react-router";
 import Stack from "@mui/material/Stack";
 import { useMediaQuery } from "@mui/material";
 import { useSidebar } from "@/Hooks/useSidebar";
 
-import { useSelector } from "react-redux";
-import type { RootState } from "@/Types/state";
-import { lightTheme, darkTheme } from "@/Utils/Theme/v2Theme";
-import { ThemeProvider, useTheme } from "@mui/material";
+import { useTheme } from "@mui/material";
 
 const RootLayout = () => {
-	const mode = useSelector((state: RootState) => state.ui.mode);
-	const v2theme = mode === "dark" ? darkTheme : lightTheme;
 	const theme = useTheme();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const { collapsedWidth } = useSidebar();
 
 	return (
 		<Stack flexDirection="row">
-			<ThemeProvider theme={v2theme}>
-				<Sidebar />
-			</ThemeProvider>
+			<Sidebar />
 			<Stack
 				flex={1}
 				padding={6}

client/src/Components/monitors/ControlsFilter.tsx

@@ -1,12 +1,22 @@
 import Stack from "@mui/material/Stack";
-import { Select, Button } from "@/Components/v2/inputs";
+import { Select, Button } from "@/Components/inputs";
 import MenuItem from "@mui/material/MenuItem";
 import useMediaQuery from "@mui/material/useMediaQuery";
 
 import type { MonitorType } from "@/Types/Monitor";
 import { Typography, useTheme } from "@mui/material";
+import { useTranslation } from "react-i18next";
 
-const types = ["http", "ping", "port", "docker", "game"];
+const types = ["http", "ping", "port", "docker", "game", "grpc", "websocket"];
+const typeDisplayNames: Record<string, string> = {
+	http: "HTTP",
+	ping: "Ping",
+	port: "Port",
+	docker: "Docker",
+	game: "Game",
+	grpc: "gRPC",
+	websocket: "WebSocket",
+};
 const statuses = ["up", "down"];
 const states = ["active", "paused"];
 
@@ -30,6 +40,7 @@ export const ControlsFilter = ({
 	onClearFilters: () => void;
 }) => {
 	const theme = useTheme();
+	const { t } = useTranslation();
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isFilterActive =
 		(selectedTypes?.length ?? 0) > 0 || selectedStatus !== "" || selectedState !== "";
@@ -50,7 +61,7 @@ export const ControlsFilter = ({
 							key={type}
 							value={type}
 						>
-							<Typography textTransform={"capitalize"}>{type}</Typography>
+							<Typography>{typeDisplayNames[type] ?? type}</Typography>
 						</MenuItem>
 					))}
 				</Select>
@@ -88,7 +99,7 @@ export const ControlsFilter = ({
 					variant="contained"
 					onClick={onClearFilters}
 				>
-					Clear Filters
+					{t("common.buttons.clearFilters")}
 				</Button>
 			)}
 		</Stack>

client/src/Components/monitors/GeoChecksMap.tsx

@@ -0,0 +1,203 @@
+import { useRef, useEffect, useState } from "react";
+import { Box, Typography, Stack, useTheme, GlobalStyles } from "@mui/material";
+import Map, { Marker, Popup } from "react-map-gl/maplibre";
+import type { MapRef } from "react-map-gl/maplibre";
+import type { FlatGeoCheck } from "@/Types/GeoCheck";
+import "maplibre-gl/dist/maplibre-gl.css";
+
+interface GeoChecksMapProps {
+	geoChecks: FlatGeoCheck[];
+}
+
+export const GeoChecksMap = ({ geoChecks }: GeoChecksMapProps) => {
+	const mapRef = useRef<MapRef>(null);
+	const [selectedCheck, setSelectedCheck] = useState<FlatGeoCheck | null>(null);
+	const theme = useTheme();
+	const isDarkMode = theme.palette.mode === "dark";
+
+	const mapPopupStyles = (
+		<GlobalStyles
+			styles={{
+				".maplibregl-popup-content": {
+					background: "transparent !important",
+					padding: "0 !important",
+					boxShadow: "none !important",
+				},
+				".maplibregl-popup-tip": {
+					display: "none",
+				},
+				".maplibregl-ctrl-attrib": {
+					display: "none",
+				},
+				".maplibregl-ctrl-logo": {
+					display: "none",
+				},
+				".maplibregl-popup-close-button": {
+					color: theme.palette.text.primary,
+					background: "transparent",
+					fontSize: "20px",
+					padding: "4px",
+					"&:hover": {
+						backgroundColor: theme.palette.action.hover,
+					},
+				},
+			}}
+		/>
+	);
+
+	useEffect(() => {
+		if (geoChecks.length === 0 || !mapRef.current) return;
+
+		const bounds = geoChecks.reduce(
+			(acc, check) => {
+				return {
+					minLng: Math.min(acc.minLng, check.location.longitude),
+					maxLng: Math.max(acc.maxLng, check.location.longitude),
+					minLat: Math.min(acc.minLat, check.location.latitude),
+					maxLat: Math.max(acc.maxLat, check.location.latitude),
+				};
+			},
+			{
+				minLng: Infinity,
+				maxLng: -Infinity,
+				minLat: Infinity,
+				maxLat: -Infinity,
+			}
+		);
+
+		if (bounds.minLng !== Infinity) {
+			mapRef.current.fitBounds(
+				[
+					[bounds.minLng, bounds.minLat],
+					[bounds.maxLng, bounds.maxLat],
+				],
+				{ padding: 50, duration: 1000 }
+			);
+		}
+	}, [geoChecks]);
+
+	const getMarkerColor = (status: boolean): string => {
+		return status ? theme.palette.success.main : theme.palette.error.main;
+	};
+
+	const formatResponseTime = (timing: number): string => {
+		return `${timing.toFixed(0)}ms`;
+	};
+
+	return (
+		<>
+			{mapPopupStyles}
+			<Box
+				height={500}
+				width={"100%"}
+				borderRadius={theme.shape.borderRadius}
+				overflow={"hidden"}
+			>
+				<Map
+					ref={mapRef}
+					initialViewState={{
+						longitude: 0,
+						latitude: 20,
+						zoom: 1.5,
+					}}
+					style={{ height: "100%", width: "100%" }}
+					mapStyle={
+						isDarkMode
+							? "https://basemaps.cartocdn.com/gl/dark-matter-gl-style/style.json"
+							: "https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
+					}
+				>
+					{geoChecks.map((check, index) => (
+						<Marker
+							key={`${check.id}-${index}`}
+							longitude={check.location.longitude}
+							latitude={check.location.latitude}
+							anchor="bottom"
+							onClick={(e: any) => {
+								e.originalEvent.stopPropagation();
+								setSelectedCheck(check);
+							}}
+						>
+							<div
+								style={{
+									width: "10px",
+									height: "10px",
+									borderRadius: "50%",
+									backgroundColor: getMarkerColor(check.status),
+									boxShadow: "0 2px 4px rgba(0,0,0,0.3)",
+									cursor: "pointer",
+								}}
+							/>
+						</Marker>
+					))}
+
+					{selectedCheck && (
+						<Popup
+							longitude={selectedCheck.location.longitude}
+							latitude={selectedCheck.location.latitude}
+							anchor="top"
+							onClose={() => setSelectedCheck(null)}
+							closeOnClick={false}
+						>
+							<Box
+								sx={{
+									minWidth: 200,
+									p: theme.spacing(4),
+									bgcolor: theme.palette.background.paper,
+									borderWidth: 1,
+									borderStyle: "solid",
+									borderColor: theme.palette.divider,
+									borderRadius: 1,
+								}}
+							>
+								<Typography
+									variant="subtitle1"
+									fontWeight="bold"
+									gutterBottom
+								>
+									{selectedCheck.location.city}, {selectedCheck.location.country}
+								</Typography>
+								<Stack spacing={0.5}>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Status:
+										</Typography>{" "}
+										{selectedCheck.status ? "Up" : "Down"}
+									</Typography>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Status Code:
+										</Typography>{" "}
+										{selectedCheck.statusCode}
+									</Typography>
+									<Typography variant="body2">
+										<Typography
+											component="span"
+											fontWeight="medium"
+										>
+											Response Time:
+										</Typography>{" "}
+										{formatResponseTime(selectedCheck.timings.total)}
+									</Typography>
+									<Typography
+										variant="caption"
+										color="text.secondary"
+										sx={{ mt: 0.5 }}
+									>
+										{new Date(selectedCheck.createdAt).toLocaleString()}
+									</Typography>
+								</Stack>
+							</Box>
+						</Popup>
+					)}
+				</Map>
+			</Box>
+		</>
+	);
+};

client/src/Components/monitors/HeaderGeoTabs.tsx

@@ -0,0 +1,54 @@
+import Stack from "@mui/material/Stack";
+import { Tabs, Tab } from "@/Components/design-elements";
+import { useTheme } from "@mui/material/styles";
+import { useTranslation } from "react-i18next";
+import type { GeoContinent } from "@/Types/GeoCheck";
+
+interface HeaderGeoTabsProps {
+	geoCheckEnabled: boolean;
+	locations: GeoContinent[] | undefined;
+	selectedLocation: GeoContinent;
+	onLocationChange: (location: GeoContinent) => void;
+}
+
+export const HeaderGeoTabs = ({
+	geoCheckEnabled,
+	locations,
+	selectedLocation,
+	onLocationChange,
+}: HeaderGeoTabsProps) => {
+	const { t } = useTranslation();
+	const theme = useTheme();
+
+	if (!geoCheckEnabled || !locations || locations.length === 0) {
+		return null;
+	}
+
+	const handleChange = (_event: React.SyntheticEvent, newValue: GeoContinent) => {
+		onLocationChange(newValue);
+	};
+
+	return (
+		<Stack
+			spacing={{ xs: theme.spacing(8), md: 0 }}
+			direction={{ xs: "column", md: "row" }}
+			alignItems={"center"}
+			justifyContent={"flex-start"}
+		>
+			<Tabs
+				value={selectedLocation}
+				onChange={handleChange}
+			>
+				{locations.map((location) => (
+					<Tab
+						key={location}
+						label={t(
+							`pages.createMonitor.form.geoChecks.option.locations.options.${location}`
+						)}
+						value={location}
+					/>
+				))}
+			</Tabs>
+		</Stack>
+	);
+};

client/src/Components/monitors/HeaderMonitorControls.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
-import { Icon, MonitorStatus } from "@/Components/v2/design-elements";
-import { Button } from "@/Components/v2/inputs";
+import { Icon, MonitorStatus } from "@/Components/design-elements";
+import { Button } from "@/Components/inputs";
 import { Settings, Pause, Play, Mail, Bug, Trash } from "lucide-react";
 
 import { useTranslation } from "react-i18next";

client/src/Components/monitors/HeaderMonitorsSummary.tsx

@@ -4,7 +4,7 @@ import {
 	PausedStatusBox,
 	InitializingStatusBox,
 	BreachedStatusBox,
-} from "@/Components/v2/design-elements";
+} from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 
 import type { MonitorsSummary } from "@/Types/Monitor";

client/src/Components/monitors/MonitorStatBoxes.tsx

@@ -1,5 +1,5 @@
 import Stack from "@mui/material/Stack";
-import { StatBox } from "@/Components/v2/design-elements";
+import { StatBox } from "@/Components/design-elements";
 
 import prettyMilliseconds from "pretty-ms";
 import { useTheme } from "@mui/material/styles";

client/src/Components/monitors/charts/HistogramDetails.tsx

@@ -1,4 +1,4 @@
-import { BaseChart, BaseBox } from "@/Components/v2/design-elements";
+import { BaseChart, BaseBox } from "@/Components/design-elements";
 import { Clock } from "lucide-react";
 import {
 	AreaChart,

client/src/Components/monitors/charts/HistogramInfrastructure.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import {
 	AreaChart,
 	Area,
@@ -8,7 +8,7 @@ import {
 	ResponsiveContainer,
 } from "recharts";
 import { Fragment, useId } from "react";
-import { XTick } from "@/Components/v2/monitors";
+import { XTick } from "@/Components/monitors";
 
 import { useTheme } from "@mui/material/styles";
 import type { HardwareCheckStats } from "@/Types/Monitor";

client/src/Components/monitors/charts/HistogramPageSpeed.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
 import { Area, AreaChart, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
-import { HistogramPageSpeedTooltip } from "@/Components/v2/monitors/charts/HistogramPageSpeedTooltip";
+import { HistogramPageSpeedTooltip } from "@/Components/monitors/charts/HistogramPageSpeedTooltip";
 import { useTheme } from "@mui/material/styles";
 import type { CheckSnapshot } from "@/Types/Check";
 import type { MonitorStatus } from "@/Types/Monitor";

client/src/Components/monitors/charts/HistogramPageSpeedDetails.tsx

@@ -1,6 +1,6 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { TrendingUp } from "lucide-react";
-import { XTick } from "@/Components/v2/monitors/";
+import { XTick } from "@/Components/monitors";
 import {
 	XAxis,
 	AreaChart,
@@ -9,10 +9,10 @@ import {
 	CartesianGrid,
 	ResponsiveContainer,
 } from "recharts";
-import { HistogramPageSpeedScoresTooltip } from "@/Components/v2/monitors";
+import { HistogramPageSpeedScoresTooltip } from "@/Components/monitors";
 
 import { useTheme } from "@mui/material/styles";
-import type { CheckSnapshot } from "@/Types/Check";
+import type { PageSpeedGroupedCheck } from "@/Types/Check";
 import type { Palette } from "@mui/material/styles";
 type PaletteColorKey = Extract<
 	keyof Palette,
@@ -52,7 +52,7 @@ export const HistogramPageSpeedDetails = ({
 	checks,
 	range,
 }: {
-	checks: CheckSnapshot[];
+	checks: PageSpeedGroupedCheck[];
 	range: string;
 }) => {
 	const theme = useTheme();
@@ -73,7 +73,7 @@ export const HistogramPageSpeedDetails = ({
 			>
 				<AreaChart data={checks}>
 					<XAxis
-						dataKey={"createdAt"}
+						dataKey={"bucketDate"}
 						tick={(props) => (
 							<XTick
 								{...props}

client/src/Components/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx

@@ -2,8 +2,9 @@ import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { formatDateWithTz } from "@/Utils/TimeUtils";
-import type { ConfigItem } from "@/Components/v2/monitors";
+import type { ConfigItem } from "@/Components/monitors";
 import type { TooltipProps } from "recharts";
 import { useSelector } from "react-redux";
 import type { RootState } from "@/Types/state";
@@ -30,8 +31,8 @@ export const HistogramPageSpeedScoresTooltip = ({
 					border: 1,
 					borderColor: theme.palette.divider,
 					borderRadius: theme.shape.borderRadius,
-					py: theme.spacing(2),
-					px: theme.spacing(4),
+					py: theme.spacing(SPACING.LG),
+					px: theme.spacing(LAYOUT.XS),
 				}}
 			>
 				<Typography
@@ -54,12 +55,12 @@ export const HistogramPageSpeedScoresTooltip = ({
 								key={`${key}-tooltip`}
 								direction="row"
 								alignItems="center"
-								gap={theme.spacing(3)}
-								mt={theme.spacing(1)}
+								gap={theme.spacing(SPACING.XXL)}
+								mt={theme.spacing(SPACING.SM)}
 							>
 								<Box
-									width={theme.spacing(4)}
-									height={theme.spacing(4)}
+									width={theme.spacing(LAYOUT.XS)}
+									height={theme.spacing(LAYOUT.XS)}
 									sx={{ borderRadius: "50%", backgroundColor: dotColor }}
 								/>
 								<Typography

client/src/Components/monitors/charts/HistogramStatus.tsx

@@ -1,6 +1,6 @@
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import { formatDateWithTz } from "@/Utils/TimeUtils";

client/src/Components/monitors/charts/PiePageSpeed.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import { FileText } from "lucide-react";
 import type { CheckAudits, CheckSnapshot } from "@/Types/Check";
 import { Pie, PieChart, ResponsiveContainer, Label } from "recharts";

client/src/Components/monitors/charts/PiePageSpeedLegend.tsx

@@ -1,7 +1,7 @@
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import { BarChart3 } from "lucide-react";
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Typography from "@mui/material/Typography";
 
 import type { CheckSnapshot } from "@/Types/Check";

client/src/Components/monitors/charts/RadialAvgResponse.tsx

@@ -1,4 +1,4 @@
-import { BaseChart } from "@/Components/v2/design-elements";
+import { BaseChart } from "@/Components/design-elements";
 import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Gauge } from "lucide-react";

client/src/Components/monitors/index.tsx

@@ -1,6 +1,8 @@
 export * from "./ControlsFilter";
 export * from "./MonitorStatBoxes";
 export * from "./HeaderMonitorControls";
+export * from "./HeaderGeoTabs";
+export * from "./GeoChecksMap";
 export * from "./charts/HistogramStatus";
 export * from "./charts/RadialAvgResponse";
 export * from "./charts/HistogramDetails";

client/src/Components/sidebar/Authfooter.tsx

@@ -5,12 +5,13 @@ import IconButton from "@mui/material/IconButton";
 import Menu from "@mui/material/Menu";
 import MenuItem from "@mui/material/MenuItem";
 import { useTheme } from "@mui/material";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 import { useSelector, useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { useState } from "react";
 import { useNavigate } from "react-router";
 import { MoreVertical, LogOut } from "lucide-react";
-import { Avatar, Icon } from "@/Components/v2/design-elements";
+import { Avatar, Icon } from "@/Components/design-elements";
 import { clearAuthState } from "@/Features/Auth/authSlice.js";
 import type { RootState } from "@/Types/state.js";
 
@@ -64,9 +65,9 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 	});
 
 	const menuItemSx = {
-		gap: theme.spacing(2),
+		gap: theme.spacing(LAYOUT.MD),
 		borderRadius: theme.shape.borderRadius,
-		pl: theme.spacing(4),
+		pl: theme.spacing(LAYOUT.XS),
 		"& svg": { stroke: theme.palette.text.secondary },
 	};
 
@@ -74,9 +75,9 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 		<Stack
 			direction="row"
 			alignItems="center"
-			py={theme.spacing(4)}
-			px={theme.spacing(8)}
-			gap={theme.spacing(4)}
+			py={theme.spacing(LAYOUT.XS)}
+			px={theme.spacing(LAYOUT.MD)}
+			gap={theme.spacing(LAYOUT.MD)}
 		>
 			<Avatar
 				small
@@ -88,7 +89,7 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 				<Stack
 					direction="row"
 					alignItems="center"
-					gap={theme.spacing(2)}
+					gap={theme.spacing(SPACING.MD)}
 					minWidth={0}
 					flex={1}
 				>
@@ -132,10 +133,15 @@ export const AuthFooter = ({ collapsed, accountMenuItems }: AuthFooterProps) =>
 				disableScrollLock
 				anchorOrigin={{ vertical: "top", horizontal: "right" }}
 				slotProps={{
-					paper: { sx: { mt: theme.spacing(-4), ml: collapsed ? theme.spacing(2) : 0 } },
+					paper: {
+						sx: {
+							mt: theme.spacing(-LAYOUT.XS),
+							ml: collapsed ? theme.spacing(SPACING.LG) : 0,
+						},
+					},
 				}}
 				MenuListProps={{ sx: { p: 2, "& li": { m: 0 } } }}
-				sx={{ ml: theme.spacing(4) }}
+				sx={{ ml: theme.spacing(LAYOUT.XS) }}
 			>
 				{collapsed && (
 					<Box

client/src/Components/sidebar/Menu.tsx

@@ -1,4 +1,4 @@
-import { Icon } from "@/Components/v2/design-elements";
+import { Icon } from "@/Components/design-elements";
 
 import {
 	Globe,

client/src/Components/sidebar/StarPrompt.tsx

@@ -1,6 +1,7 @@
 import { Typography, IconButton, Stack, Box } from "@mui/material";
-import { Icon } from "@/Components/v2/design-elements";
+import { Icon } from "@/Components/design-elements";
 import { X } from "lucide-react";
+import { SPACING, LAYOUT } from "@/Utils/Theme/constants";
 
 import { useTheme } from "@mui/material";
 import { useSelector, useDispatch } from "react-redux";
@@ -34,25 +35,22 @@ export const StarPrompt = ({
 	return (
 		<Stack
 			direction="column"
-			sx={{
-				width: "100%",
-				padding: `${theme.spacing(6)} ${theme.spacing(6)}`,
-				borderTop: `1px solid ${theme.palette.divider}`,
-				borderBottom: `1px solid ${theme.palette.divider}`,
-				borderRadius: 0,
-				gap: theme.spacing(1.5),
-			}}
+			gap={theme.spacing(LAYOUT.MD)}
+			padding={theme.spacing(LAYOUT.SM)}
+			width={"100%"}
+			borderTop={`1px solid ${theme.palette.divider}`}
+			borderBottom={`1px solid ${theme.palette.divider}`}
 		>
 			<Stack
 				direction="row"
 				justifyContent="space-between"
 				alignItems="center"
 				width="100%"
-				pl={theme.spacing(4)}
+				pl={theme.spacing(LAYOUT.XS)}
 			>
 				<Typography
 					variant="subtitle2"
-					mt={theme.spacing(3)}
+					mt={theme.spacing(SPACING.XXL)}
 				>
 					{t("components.sidebar.starPrompt.title")}
 				</Typography>
@@ -78,7 +76,7 @@ export const StarPrompt = ({
 			<Typography
 				sx={{
 					mb: 1,
-					px: theme.spacing(4),
+					px: theme.spacing(LAYOUT.XS),
 				}}
 			>
 				{t("components.sidebar.starPrompt.description")}
@@ -96,7 +94,7 @@ export const StarPrompt = ({
 					"&:hover": {
 						opacity: 0.8,
 					},
-					pl: theme.spacing(4),
+					pl: theme.spacing(LAYOUT.XS),
 					filter: mode === "dark" ? "invert(1)" : "none",
 				}}
 			/>

client/src/Components/sidebar/index.tsx

@@ -3,12 +3,13 @@ import Backdrop from "@mui/material/Backdrop";
 import Stack from "@mui/material/Stack";
 import List from "@mui/material/List";
 import Divider from "@mui/material/Divider";
+import { LAYOUT } from "@/Utils/Theme/constants";
 import { useSidebar } from "@/Hooks/useSidebar.js";
-import { Logo } from "@/Components/v2/sidebar/Logo";
-import { getMenu, getBottomMenu, getAccountMenu } from "@/Components/v2/sidebar/Menu";
-import { NavItem } from "@/Components/v2/sidebar/NavItem";
-import { StarPrompt } from "@/Components/v2/sidebar/StarPrompt";
-import { AuthFooter } from "@/Components/v2/sidebar/Authfooter";
+import { Logo } from "@/Components/sidebar/Logo";
+import { getMenu, getBottomMenu, getAccountMenu } from "@/Components/sidebar/Menu";
+import { NavItem } from "@/Components/sidebar/NavItem";
+import { StarPrompt } from "@/Components/sidebar/StarPrompt";
+import { AuthFooter } from "@/Components/sidebar/Authfooter";
 
 import { useNavigate, useLocation } from "react-router";
 import { useTranslation } from "react-i18next";
@@ -65,9 +66,9 @@ export const Sidebar = () => {
 				left={0}
 				minHeight={"100vh"}
 				maxHeight={"100vh"}
-				paddingTop={theme.spacing(6)}
-				paddingBottom={theme.spacing(6)}
-				gap={theme.spacing(6)}
+				paddingTop={theme.spacing(LAYOUT.SM)}
+				paddingBottom={theme.spacing(LAYOUT.SM)}
+				gap={theme.spacing(LAYOUT.SM)}
 				borderRight={`1px solid ${theme.palette.divider}`}
 				width={width}
 				sx={{
@@ -81,13 +82,13 @@ export const Sidebar = () => {
 					component="nav"
 					disablePadding
 					sx={{
-						px: theme.spacing(6),
+						px: theme.spacing(LAYOUT.SM),
 						flex: 1,
 					}}
 				>
 					<Logo
-						pt={theme.spacing(8)}
-						pb={theme.spacing(10)}
+						pt={theme.spacing(LAYOUT.MD)}
+						pb={theme.spacing(LAYOUT.MD)}
 					/>
 					{menu.map((item) => {
 						const selected = location.pathname.startsWith(`/${item.path}`);
@@ -105,7 +106,7 @@ export const Sidebar = () => {
 				<List
 					component="nav"
 					disablePadding
-					sx={{ px: theme.spacing(6) }}
+					sx={{ px: theme.spacing(LAYOUT.SM) }}
 				>
 					{bottomMenu.map((item) => {
 						const selected = location.pathname.startsWith(`/${item.path}`);

client/src/Components/v1/ArrowRight/index.jsx

@@ -1,29 +0,0 @@
-import Icon from "../Icon";
-import PropTypes from "prop-types";
-
-const ArrowRight = ({ type, color = "#667085", ...props }) => {
-	if (type === "double") {
-		return (
-			<Icon
-				name="ChevronsRight"
-				color={color}
-				{...props}
-			/>
-		);
-	} else {
-		return (
-			<Icon
-				name="ChevronRight"
-				color={color}
-				{...props}
-			/>
-		);
-	}
-};
-
-ArrowRight.propTypes = {
-	type: PropTypes.oneOf(["double", "default"]),
-	color: PropTypes.string,
-};
-
-export default ArrowRight;

client/src/Components/v1/Breadcrumbs/index.css

@@ -1,21 +0,0 @@
-.MuiBreadcrumbs-root {
-	min-height: 34px;
-}
-.MuiBreadcrumbs-root svg {
-	width: 16px;
-	min-height: 16px;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-li a {
-	font-weight: 400;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-li:not(:last-child) {
-	cursor: pointer;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-li:last-child a {
-	font-weight: 500;
-	opacity: 1;
-	cursor: default;
-}
-.MuiBreadcrumbs-root .MuiBreadcrumbs-separator {
-	margin: 0;
-}

client/src/Components/v1/Breadcrumbs/index.jsx

@@ -1,78 +0,0 @@
-import PropTypes from "prop-types";
-import { Box, Breadcrumbs as MUIBreadcrumbs } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import { useNavigate } from "react-router-dom";
-import ArrowRight from "../ArrowRight/index.jsx";
-import "./index.css";
-
-/**
- * Breadcrumbs component that displays a list of breadcrumb items.
- *
- * @param {Object} props
- * @param {Array} props.list - Array of breadcrumb items. Each item should have `name` and `path` properties.
- * @param {string} props.list.name - The name to display for the breadcrumb.
- * @param {string} props.list.path - The path to navigate to when the breadcrumb is clicked.
- *
- * @returns {JSX.Element} The rendered Breadcrumbs component.
- */
-
-const Breadcrumbs = ({ list }) => {
-	const theme = useTheme();
-	const navigate = useNavigate();
-
-	return (
-		<MUIBreadcrumbs
-			separator={<ArrowRight />}
-			aria-label="breadcrumb"
-			px={theme.spacing(2)}
-			py={theme.spacing(3.5)}
-			width="fit-content"
-			backgroundColor={theme.palette.secondary.main}
-			borderRadius={theme.shape.borderRadius}
-			lineHeight="18px"
-			sx={{
-				"& .MuiBreadcrumbs-li a": {
-					transition: "background-color 0.2s ease-in-out, color 0.2s ease-in-out",
-				},
-				"& .MuiBreadcrumbs-li:not(:last-of-type):hover a": {
-					backgroundColor: theme.palette.secondary.contrastText,
-					color: theme.palette.secondary.main,
-				},
-			}}
-		>
-			{list.map((item, index) => {
-				return (
-					<Box
-						component="a"
-						key={`${item.name}-${index}`}
-						px={theme.spacing(4)}
-						pt={theme.spacing(2)}
-						pb={theme.spacing(3)}
-						borderRadius={theme.shape.borderRadius}
-						onClick={() => navigate(item.path)}
-						sx={{
-							opacity: 0.8,
-							textTransform: "capitalize",
-							"&, &:hover": {
-								color: theme.palette.secondary.contrastText,
-							},
-						}}
-					>
-						{item.name}
-					</Box>
-				);
-			})}
-		</MUIBreadcrumbs>
-	);
-};
-
-Breadcrumbs.propTypes = {
-	list: PropTypes.arrayOf(
-		PropTypes.shape({
-			name: PropTypes.string.isRequired,
-			path: PropTypes.string.isRequired,
-		}).isRequired
-	).isRequired,
-};
-
-export default Breadcrumbs;

client/src/Components/v1/ConfigBox/index.jsx

@@ -1,39 +0,0 @@
-import { Stack, styled } from "@mui/material";
-
-const ConfigBox = styled(Stack)(({ theme }) => ({
-	display: "flex",
-	flexDirection: "row",
-	justifyContent: "space-between",
-	backgroundColor: theme.palette.primary.main,
-	border: 1,
-	borderStyle: "solid",
-	borderColor: theme.palette.primary.lowContrast,
-	borderRadius: theme.spacing(2),
-	"& > *": {
-		paddingTop: theme.spacing(15),
-		paddingBottom: theme.spacing(15),
-	},
-	"& > div:first-of-type": {
-		flex: 0.7,
-		borderRight: 1,
-		borderRightStyle: "solid",
-		borderRightColor: theme.palette.primary.lowContrast,
-		paddingRight: theme.spacing(15),
-		paddingLeft: theme.spacing(15),
-		backgroundColor: theme.palette.tertiary.background,
-		"& :is(h1, h2):first-of-type": {
-			fontWeight: 600,
-			marginBottom: theme.spacing(4),
-		},
-	},
-	"& > div:last-of-type": {
-		flex: 1,
-		paddingRight: theme.spacing(20),
-		paddingLeft: theme.spacing(20),
-	},
-	"& h1, & h2": {
-		color: theme.palette.primary.contrastTextSecondary,
-	},
-}));
-
-export default ConfigBox;

client/src/Components/v1/Dialog/genericDialog.jsx

@@ -1,73 +0,0 @@
-import { useId } from "react";
-import PropTypes from "prop-types";
-import { Modal, Stack, Typography } from "@mui/material";
-
-const GenericDialog = ({ title, description, open, onClose, theme, children, width }) => {
-	const titleId = useId();
-	const descriptionId = useId();
-	const ariaDescribedBy = description?.length > 0 ? descriptionId : "";
-	return (
-		<Modal
-			aria-labelledby={titleId}
-			aria-describedby={ariaDescribedBy}
-			open={open}
-			onClose={onClose}
-			onClick={(e) => e.stopPropagation()}
-		>
-			<Stack
-				gap={theme.spacing(2)}
-				width={width}
-				sx={{
-					position: "absolute",
-					top: "50%",
-					left: "50%",
-					transform: "translate(-50%, -50%)",
-					minWidth: 400,
-					bgcolor: theme.palette.primary.main,
-					border: 1,
-					borderColor: theme.palette.primary.lowContrast,
-					borderRadius: theme.shape.borderRadius,
-					boxShadow: 24,
-					p: theme.spacing(15),
-					"&:focus": {
-						outline: "none",
-					},
-				}}
-			>
-				<Typography
-					id={titleId}
-					component="h2"
-					fontSize={16}
-					color={theme.palette.primary.contrastText}
-					fontWeight={600}
-					marginBottom={theme.spacing(4)}
-				>
-					{title}
-				</Typography>
-				{description && (
-					<Typography
-						id={descriptionId}
-						color={theme.palette.primary.contrastTextTertiary}
-						marginBottom={theme.spacing(4)}
-					>
-						{description}
-					</Typography>
-				)}
-				{children}
-			</Stack>
-		</Modal>
-	);
-};
-
-GenericDialog.propTypes = {
-	title: PropTypes.string.isRequired,
-	description: PropTypes.string,
-	open: PropTypes.bool.isRequired,
-	onClose: PropTypes.func.isRequired,
-	theme: PropTypes.object.isRequired,
-	children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node])
-		.isRequired,
-	width: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]),
-};
-
-export { GenericDialog };

client/src/Components/v1/Dialog/index.jsx

@@ -1,63 +0,0 @@
-import PropTypes from "prop-types";
-import { Button, Stack } from "@mui/material";
-import { GenericDialog } from "./genericDialog.jsx";
-import { useTheme } from "@emotion/react";
-import { useTranslation } from "react-i18next";
-
-const Dialog = ({
-	title,
-	description,
-	open,
-	onCancel,
-	confirmationButtonLabel,
-	onConfirm,
-	isLoading,
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	return (
-		<GenericDialog
-			title={title}
-			description={description}
-			open={open}
-			onClose={onCancel}
-			theme={theme}
-		>
-			<Stack
-				direction="row"
-				gap={theme.spacing(4)}
-				mt={theme.spacing(12)}
-				justifyContent="flex-end"
-			>
-				<Button
-					variant="contained"
-					color="secondary"
-					onClick={onCancel}
-				>
-					{t("cancel", "Cancel")}
-				</Button>
-				<Button
-					variant="contained"
-					color="error"
-					loading={isLoading}
-					onClick={onConfirm}
-				>
-					{confirmationButtonLabel}
-				</Button>
-			</Stack>
-		</GenericDialog>
-	);
-};
-
-Dialog.propTypes = {
-	title: PropTypes.string.isRequired,
-	description: PropTypes.string,
-	open: PropTypes.bool.isRequired,
-	onCancel: PropTypes.func.isRequired,
-	confirmationButtonLabel: PropTypes.string.isRequired,
-	onConfirm: PropTypes.func.isRequired,
-	isLoading: PropTypes.bool,
-};
-
-export default Dialog;

client/src/Components/v1/Icon/iconMap.js

@@ -1,120 +0,0 @@
-/**
- * Maps legacy icon names to Lucide icon names
- * Use: import { iconMap } from './iconMap'; LucideIcons[iconMap['monitors']]
- */
-export const iconMap = {
-	// Navigation/Sidebar icons
-	monitors: "Globe",
-	incidents: "AlertTriangle",
-	integrations: "Link",
-	"page-speed": "Gauge",
-	settings: "Settings",
-	notifications: "Bell",
-	maintenance: "Wrench",
-	"status-pages": "Wifi",
-	docs: "FileText",
-	discussions: "MessageCircle",
-	support: "HelpCircle",
-	changeLog: "Code",
-	logs: "Database",
-
-	// User icons
-	user: "User",
-	"user-two": "Users",
-	"user-edit": "UserPen",
-	groups: "Users",
-	lock: "Lock",
-	key: "Key",
-	logout: "LogOut",
-
-	// Action icons
-	edit: "Pencil",
-	"trash-bin": "Trash2",
-	search: "Search",
-	"close-icon": "X",
-	check: "Check",
-	"check-icon": "CheckCircle",
-	"check-outlined": "CheckCircle",
-
-	// Arrow icons
-	"left-arrow": "ChevronLeft",
-	"right-arrow": "ChevronRight",
-	"up-arrow": "ChevronUp",
-	"down-arrow": "ChevronDown",
-	"left-arrow-double": "ChevronsLeft",
-	"right-arrow-double": "ChevronsRight",
-	"left-arrow-long": "ArrowLeft",
-	"top-right-arrow": "ArrowUpRight",
-	"open-in-new-page": "ExternalLink",
-	"selector-vertical": "ChevronsUpDown",
-
-	// Status/Alert icons
-	"alert-icon": "Bell",
-	"warning-icon": "AlertCircle",
-	"history-icon": "History",
-
-	// Data/Chart icons
-	dashboard: "LayoutGrid",
-	"monitor-graph-line": "TrendingUp",
-	"response-time-icon": "TrendingUp",
-	"uptime-icon": "Activity",
-	"speedometer-icon": "Gauge",
-	"spedometer-icon": "Gauge",
-	"ruler-icon": "Ruler",
-	"performance-report": "Layers",
-	"average-response-icon": "BarChart3",
-	"distributed-uptime": "Network",
-
-	// Misc icons
-	calendar: "Calendar",
-	"calendar-check": "CalendarCheck",
-	"clock-snooze": "Clock",
-	mail: "Mail",
-	email: "Mail",
-	folder: "Folder",
-	"dots-vertical": "MoreVertical",
-	"pause-icon": "PauseCircle",
-	"resume-icon": "PlayCircle",
-	"checkbox-filled": "CheckSquare",
-	"checkbox-outline": "Square",
-	"radio-checked": "Circle",
-	"cpu-chip": "Cpu",
-	certificate: "Award",
-	"interval-check": "RefreshCw",
-};
-
-/**
- * MUI icon to Lucide mapping
- */
-export const muiToLucideMap = {
-	AddCircleOutline: "PlusCircle",
-	ArrowDownwardRounded: "ArrowDown",
-	ArrowUpwardRounded: "ArrowUp",
-	ArrowDropDown: "ChevronDown",
-	ArrowOutward: "ExternalLink",
-	CheckCircle: "CheckCircle2",
-	Clear: "X",
-	Close: "X",
-	CloseRounded: "X",
-	CloudUpload: "Upload",
-	Delete: "Trash2",
-	DeleteOutlineRounded: "Trash2",
-	Email: "Mail",
-	ErrorOutline: "AlertTriangle",
-	ErrorOutlineOutlined: "AlertTriangle",
-	Image: "ImageIcon",
-	InfoOutlined: "Info",
-	KeyboardArrowDown: "ChevronDown",
-	Menu: "Menu",
-	PauseCircleOutline: "PauseCircle",
-	PauseOutlined: "Pause",
-	PlayArrowOutlined: "Play",
-	PlayCircleOutlineRounded: "PlayCircle",
-	RadioButtonChecked: "Circle",
-	ReorderRounded: "GripVertical",
-	SettingsOutlined: "Settings",
-	Share: "Share2",
-	Visibility: "Eye",
-	VisibilityOff: "EyeOff",
-	WarningAmberOutlined: "AlertTriangle",
-};

client/src/Components/v1/Icon/index.jsx

@@ -1,198 +0,0 @@
-import { useTheme } from "@mui/material";
-import PropTypes from "prop-types";
-import {
-	Activity,
-	AlertCircle,
-	AlertTriangle,
-	ArrowDown,
-	ArrowLeft,
-	ArrowUp,
-	ArrowUpRight,
-	Bell,
-	Calendar,
-	Check,
-	CheckCircle,
-	CheckCircle2,
-	CheckSquare,
-	ChevronDown,
-	ChevronLeft,
-	ChevronRight,
-	ChevronsLeft,
-	ChevronsRight,
-	ChevronsUpDown,
-	Circle,
-	CircleDot,
-	Clock,
-	Code,
-	Cpu,
-	Database,
-	ExternalLink,
-	Eye,
-	EyeOff,
-	FileText,
-	Gauge,
-	Globe,
-	GripVertical,
-	HelpCircle,
-	History,
-	Image as ImageIcon,
-	Info,
-	Key,
-	Layers,
-	Link,
-	Lock,
-	LogOut,
-	Mail,
-	Menu,
-	MessageCircle,
-	MoreVertical,
-	Pause,
-	PauseCircle,
-	Play,
-	PlayCircle,
-	PlusCircle,
-	RefreshCw,
-	Ruler,
-	Search,
-	Settings,
-	Square,
-	Trash2,
-	TrendingUp,
-	Upload,
-	User,
-	Users,
-	Wifi,
-	Wrench,
-	X,
-} from "lucide-react";
-
-/**
- * Map of icon names to Lucide icon components.
- * Only icons explicitly imported here will be included in the bundle (tree-shaking).
- * To add a new icon: import it above and add it to this object.
- */
-const iconComponents = {
-	Activity,
-	AlertCircle,
-	AlertTriangle,
-	ArrowDown,
-	ArrowLeft,
-	ArrowUp,
-	ArrowUpRight,
-	Bell,
-	Calendar,
-	Check,
-	CheckCircle,
-	CheckCircle2,
-	CheckSquare,
-	ChevronDown,
-	ChevronLeft,
-	ChevronRight,
-	ChevronsLeft,
-	ChevronsRight,
-	ChevronsUpDown,
-	Circle,
-	CircleDot,
-	Clock,
-	Code,
-	Cpu,
-	Database,
-	ExternalLink,
-	Eye,
-	EyeOff,
-	FileText,
-	Gauge,
-	Globe,
-	GripVertical,
-	HelpCircle,
-	History,
-	Image: ImageIcon,
-	Info,
-	Key,
-	Layers,
-	Link,
-	Lock,
-	LogOut,
-	Mail,
-	Menu,
-	MessageCircle,
-	MoreVertical,
-	Pause,
-	PauseCircle,
-	Play,
-	PlayCircle,
-	PlusCircle,
-	RefreshCw,
-	Ruler,
-	Search,
-	Settings,
-	Square,
-	Trash2,
-	TrendingUp,
-	Upload,
-	User,
-	Users,
-	Wifi,
-	Wrench,
-	X,
-};
-
-/**
- * Theme-aware icon component wrapping Lucide icons
- *
- * @param {string} name - Lucide icon name (e.g., "Bell", "Check", "ArrowLeft")
- * @param {number} size - Icon size in pixels (default: 20)
- * @param {string} color - Direct color value OR theme path like "primary.contrastText"
- * @param {number} strokeWidth - Stroke width (default: 1.5)
- * @param {string} fill - Fill color (default: "none")
- */
-const Icon = ({ name, size = 20, color, strokeWidth = 1.5, fill = "none", ...props }) => {
-	const theme = useTheme();
-
-	// Resolve color from theme path or use direct value
-	const resolveColor = (colorValue) => {
-		if (!colorValue) {
-			return theme.palette.primary.contrastTextTertiary; // Default icon color
-		}
-
-		// If it's a theme path like "primary.contrastText"
-		if (typeof colorValue === "string" && colorValue.includes(".")) {
-			const parts = colorValue.split(".");
-			let resolved = theme.palette;
-			for (const part of parts) {
-				resolved = resolved?.[part];
-			}
-			return resolved || colorValue;
-		}
-
-		// Direct color value
-		return colorValue;
-	};
-
-	const LucideIcon = iconComponents[name];
-
-	if (!LucideIcon) {
-		console.warn(`Icon "${name}" not found in Icon component`);
-		return null;
-	}
-
-	return (
-		<LucideIcon
-			size={size}
-			color={resolveColor(color)}
-			strokeWidth={strokeWidth}
-			fill={fill}
-			{...props}
-		/>
-	);
-};
-
-Icon.propTypes = {
-	name: PropTypes.string.isRequired,
-	size: PropTypes.number,
-	color: PropTypes.string,
-	strokeWidth: PropTypes.number,
-	fill: PropTypes.string,
-};
-
-export default Icon;

client/src/Components/v1/Inputs/Checkbox/index.jsx

@@ -1,116 +0,0 @@
-import PropTypes from "prop-types";
-import { FormControlLabel, Checkbox as MuiCheckbox } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import Icon from "../../Icon";
-
-/**
- * Checkbox Component
- *
- * A customized checkbox component using Material-UI that supports custom sizing,
- * disabled states, and custom icons.
- *
- * @component
- * @param {Object} props - Component properties
- * @param {string} props.id - Unique identifier for the checkbox input
- * @param {string} [props.name] - Optional name attribute for the checkbox
- * @param {(string|React.ReactNode)} props.label - Label text or node for the checkbox
- * @param {('small'|'medium'|'large')} [props.size='medium'] - Size of the checkbox icon
- * @param {boolean} props.isChecked - Current checked state of the checkbox
- * @param {string} [props.value] - Optional value associated with the checkbox
- * @param {Function} [props.onChange] - Callback function triggered when checkbox state changes
- * @param {boolean} [props.isDisabled] - Determines if the checkbox is disabled
- *
- * @returns {React.ReactElement} Rendered Checkbox component
- *
- * @example
- * // Basic usage
- * <Checkbox
- *   id="terms-checkbox"
- *   label="I agree to terms"
- *   isChecked={agreed}
- *   onChange={handleAgree}
- * />
- *
- * @example
- * // With custom size and disabled state
- * <Checkbox
- *   id="advanced-checkbox"
- *   label="Advanced Option"
- *   size="large"
- *   isChecked={isAdvanced}
- *   isDisabled={!canModify}
- *   onChange={handleAdvancedToggle}
- * />
- */
-const Checkbox = ({
-	id,
-	name,
-	label,
-	size = "medium",
-	isChecked,
-	value,
-	onChange,
-	isDisabled,
-}) => {
-	/* TODO move sizes to theme */
-	const sizes = { small: "14px", medium: "16px", large: "18px" };
-	const theme = useTheme();
-	return (
-		<FormControlLabel
-			className="checkbox-wrapper"
-			control={
-				<MuiCheckbox
-					checked={isDisabled ? false : isChecked}
-					name={name}
-					value={value}
-					onChange={onChange}
-					icon={<Icon name="Square" />}
-					checkedIcon={<Icon name="CheckSquare" />}
-					inputProps={{
-						"aria-label": "controlled checkbox",
-						id: id,
-					}}
-					sx={{
-						"&:hover": { backgroundColor: "transparent" },
-						"& svg": { width: sizes[size], height: sizes[size] },
-					}}
-				/>
-			}
-			label={label}
-			disabled={isDisabled}
-			sx={{
-				borderRadius: theme.shape.borderRadius,
-				p: theme.spacing(2.5),
-				"& .MuiButtonBase-root": {
-					width: theme.spacing(10),
-					p: 0,
-					mr: theme.spacing(6),
-				},
-				"&:not(:has(.Mui-disabled)):hover": {
-					backgroundColor: theme.palette.tertiary.main,
-				},
-				"& span.MuiTypography-root": {
-					fontSize: 13,
-					color: theme.palette.primary.contrastTextTertiary,
-				},
-				".MuiFormControlLabel-label.Mui-disabled": {
-					color: theme.palette.primary.contrastTextTertiary,
-					opacity: 0.25,
-				},
-			}}
-		/>
-	);
-};
-
-Checkbox.propTypes = {
-	id: PropTypes.string,
-	name: PropTypes.string,
-	label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
-	size: PropTypes.oneOf(["small", "medium", "large"]),
-	isChecked: PropTypes.bool.isRequired,
-	value: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
-	onChange: PropTypes.func,
-	isDisabled: PropTypes.bool,
-};
-
-export default Checkbox;

client/src/Components/v1/Inputs/ColorPicker/index.jsx

@@ -1,63 +0,0 @@
-import PropTypes from "prop-types";
-import { Stack, Typography } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import { MuiColorInput } from "mui-color-input";
-
-/**
- *
- * @param {*} id The ID of the component
- * @param {*} value The color value of the component
- * @param {*} error The error of the component
- * @param {*} onChange The Change handler function
- * @param {*} onBlur The Blur handler function
- * @returns The ColorPicker component
- * Example usage:
- * 	<ColorPicker
- *		id="color"
- *		value={form.color}
- *		error={errors["color"]}
- *		onChange={handleColorChange}
- *		onBlur={handleBlur}
- *		>
- *	</ColorPicker>
- */
-const ColorPicker = ({ id, name, value, error, onChange, onBlur }) => {
-	const theme = useTheme();
-	return (
-		<Stack gap={theme.spacing(4)}>
-			<MuiColorInput
-				format="hex"
-				name={name}
-				type="color-picker"
-				value={value}
-				id={id}
-				onChange={(color) => onChange({ target: { name, value: color } })}
-				onBlur={onBlur}
-			/>
-			{error && (
-				<Typography
-					component="span"
-					className="input-error"
-					color={theme.palette.error.main}
-					mt={theme.spacing(2)}
-					sx={{
-						opacity: 0.8,
-					}}
-				>
-					{error}
-				</Typography>
-			)}
-		</Stack>
-	);
-};
-
-ColorPicker.propTypes = {
-	id: PropTypes.string.isRequired,
-	value: PropTypes.string,
-	error: PropTypes.string,
-	onChange: PropTypes.func.isRequired,
-	onBlur: PropTypes.func,
-	name: PropTypes.string,
-};
-
-export default ColorPicker;

client/src/Components/v1/Inputs/FieldWrapper/index.jsx

@@ -1,51 +0,0 @@
-import { Stack, Typography } from "@mui/material";
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-
-const DEFAULT_GAP = 6;
-const FieldWrapper = ({
-	label,
-	children,
-	gap,
-	labelMb,
-	labelFontWeight = 500,
-	labelVariant = "h3",
-	labelSx = {},
-	sx = {},
-}) => {
-	const theme = useTheme();
-	return (
-		<Stack
-			gap={gap ?? theme.spacing(DEFAULT_GAP)}
-			sx={sx}
-		>
-			{label && (
-				<Typography
-					component={labelVariant}
-					color={theme.palette.primary.contrastTextSecondary}
-					fontWeight={labelFontWeight}
-					sx={{
-						...(labelMb !== undefined && { mb: theme.spacing(labelMb) }),
-						...labelSx,
-					}}
-				>
-					{label}
-				</Typography>
-			)}
-			{children}
-		</Stack>
-	);
-};
-
-FieldWrapper.propTypes = {
-	label: PropTypes.node,
-	children: PropTypes.node.isRequired,
-	gap: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]),
-	labelMb: PropTypes.number,
-	labelFontWeight: PropTypes.number,
-	labelVariant: PropTypes.string,
-	labelSx: PropTypes.object,
-	sx: PropTypes.object,
-};
-
-export default FieldWrapper;

client/src/Components/v1/Inputs/ImageUpload/index.jsx

@@ -1,249 +0,0 @@
-// Components
-import { Box, Stack, Typography } from "@mui/material";
-import Icon from "../../Icon";
-import Image from "../../Image/index.jsx";
-import TextField from "@mui/material/TextField";
-import IconButton from "@mui/material/IconButton";
-import ProgressUpload from "../../ProgressBars/index.jsx";
-
-// Utils
-import PropTypes from "prop-types";
-import { useCallback, useState, useRef, useEffect } from "react";
-import { useTheme } from "@emotion/react";
-import { useTranslation } from "react-i18next";
-
-/**
- * ImageUpload component allows users to upload images with drag-and-drop functionality.
- * It supports file size and format validation.
- *
- * @component
- * @param {Object} props - Component props
- * @param {boolean} [props.previewIsRound=false] - Determines if the image preview should be round
- * @param {string} [props.src] - Source URL of the image to display
- * @param {function} props.onChange - Callback function to handle file change, takes a file as an argument
- * @param {number} [props.maxSize=3145728] - Maximum file size allowed in bytes (default is 3MB)
- * @param {Array<string>} [props.accept=['jpg', 'jpeg', 'png']] - Array of accepted file formats
- * @param {Object} [props.errors] - Object containing error messages
- * @returns {JSX.Element} The rendered component
- */
-const ImageUpload = ({
-	previewIsRound = false,
-	src,
-	onChange,
-	maxSize = 3 * 1024 * 1024,
-	accept = ["jpg", "jpeg", "png"],
-	error,
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const [uploadComplete, setUploadComplete] = useState(false);
-	const [completedFile, setCompletedFile] = useState(null);
-	const [file, setFile] = useState(null);
-	const [progress, setProgress] = useState({ value: 0, isLoading: false });
-	const intervalRef = useRef(null);
-	const [localError, setLocalError] = useState(null);
-	const [isDragging, setIsDragging] = useState(false);
-
-	const roundStyle = previewIsRound ? { borderRadius: "50%" } : {};
-
-	const handleImageChange = useCallback(
-		(file) => {
-			if (!file) return;
-
-			const isValidType = accept.some((type) => file.type.includes(type));
-			const isValidSize = file.size <= maxSize;
-
-			if (!isValidType) {
-				setLocalError(t("invalidFileFormat"));
-				return;
-			}
-			if (!isValidSize) {
-				setLocalError(t("invalidFileSize"));
-				return;
-			}
-
-			setLocalError(null);
-
-			const previewFile = {
-				src: URL.createObjectURL(file),
-				name: file.name,
-				file,
-			};
-
-			setFile(previewFile);
-			setProgress({ value: 0, isLoading: true });
-
-			intervalRef.current = setInterval(() => {
-				setProgress((prev) => {
-					const buffer = 12;
-					if (prev.value + buffer >= 100) {
-						clearInterval(intervalRef.current);
-						setUploadComplete(true);
-						setCompletedFile(previewFile);
-						return { value: 100, isLoading: false };
-					}
-					return { value: prev.value + buffer, isLoading: true };
-				});
-			}, 120);
-		},
-		[maxSize, accept]
-	);
-
-	useEffect(() => {
-		if (uploadComplete && completedFile) {
-			onChange?.(completedFile);
-			setUploadComplete(false);
-			setCompletedFile(null);
-		}
-	}, [uploadComplete, completedFile, onChange]);
-
-	return (
-		<>
-			{src ? (
-				<Stack
-					direction="row"
-					justifyContent="center"
-				>
-					<Image
-						alt="Uploaded preview"
-						src={src}
-						width="250px"
-						height="250px"
-						sx={{ ...roundStyle }}
-					/>
-				</Stack>
-			) : (
-				<>
-					<Box
-						className="image-field-wrapper"
-						mt={theme.spacing(8)}
-						onDragEnter={() => setIsDragging(true)}
-						onDragLeave={() => setIsDragging(false)}
-						onDrop={() => setIsDragging(false)}
-						sx={{
-							position: "relative",
-							height: "fit-content",
-							border: "dashed",
-							borderRadius: theme.shape.borderRadius,
-							borderColor: isDragging
-								? theme.palette.primary.main
-								: theme.palette.primary.lowContrast,
-							backgroundColor: isDragging ? "hsl(215, 87%, 51%, 0.05)" : "transparent",
-							borderWidth: "2px",
-							transition: "0.2s",
-							"&:hover": {
-								borderColor: theme.palette.primary.main,
-								backgroundColor: "hsl(215, 87%, 51%, 0.05)",
-							},
-						}}
-					>
-						<TextField
-							type="file"
-							onChange={(e) => handleImageChange(e?.target?.files?.[0])}
-							sx={{
-								width: "100%",
-								"& .MuiInputBase-input[type='file']": {
-									opacity: 0,
-									cursor: "pointer",
-									maxWidth: "500px",
-									minHeight: "175px",
-									zIndex: 1,
-								},
-								"& fieldset": {
-									padding: 0,
-									border: "none",
-								},
-							}}
-						/>
-						<Stack
-							alignItems="center"
-							gap="4px"
-							sx={{
-								position: "absolute",
-								top: "50%",
-								left: "50%",
-								transform: "translate(-50%, -50%)",
-								zIndex: 0,
-								width: "100%",
-							}}
-						>
-							<IconButton
-								sx={{
-									pointerEvents: "none",
-									borderRadius: theme.shape.borderRadius,
-									border: `solid ${theme.shape.borderThick}px ${theme.palette.primary.lowContrast}`,
-									boxShadow: theme.shape.boxShadow,
-								}}
-							>
-								<Icon
-									name="Upload"
-									size={24}
-								/>
-							</IconButton>
-							<Typography
-								component="h2"
-								color={theme.palette.primary.contrastTextTertiary}
-							>
-								<Typography
-									component="span"
-									fontSize="inherit"
-									color="info"
-									fontWeight={500}
-								>
-									{t("ClickUpload")}
-								</Typography>{" "}
-								or {t("DragandDrop")}
-							</Typography>
-							<Typography
-								component="p"
-								color={theme.palette.primary.contrastTextTertiary}
-								sx={{ opacity: 0.6 }}
-							>
-								({t("MaxSize")}: {Math.round(maxSize / 1024 / 1024)}MB)
-							</Typography>
-						</Stack>
-					</Box>
-					{(localError || progress.isLoading || progress.value !== 0) && (
-						<ProgressUpload
-							icon={
-								<Icon
-									name="Image"
-									size={20}
-								/>
-							}
-							label={file?.name || "Upload failed"}
-							size={file?.size}
-							progress={progress.value}
-							onClick={() => {
-								clearInterval(intervalRef.current);
-								setFile(null);
-								setProgress({ value: 0, isLoading: false });
-								setLocalError(null);
-								onChange(undefined);
-							}}
-							error={localError || error}
-						/>
-					)}
-					<Typography
-						component="p"
-						color={theme.palette.primary.contrastTextTertiary}
-						sx={{ opacity: 0.6 }}
-					>
-						{t("SupportedFormats")}: {accept.join(", ").toUpperCase()}
-					</Typography>
-				</>
-			)}
-		</>
-	);
-};
-
-ImageUpload.propTypes = {
-	previewIsRound: PropTypes.bool,
-	src: PropTypes.string,
-	onChange: PropTypes.func,
-	maxSize: PropTypes.number,
-	accept: PropTypes.array,
-	error: PropTypes.string,
-};
-
-export default ImageUpload;

client/src/Components/v1/Inputs/Radio/index.jsx

@@ -1,117 +0,0 @@
-import PropTypes from "prop-types";
-import { FormControlLabel, Radio as MUIRadio, Typography } from "@mui/material";
-import { useTheme } from "@emotion/react";
-import Icon from "../../Icon";
-import "./index.css";
-
-/**
- * Radio component.
- *
- * @component
- * @example
- * // Usage:
- * <Radio
- *   title="Radio Button Title"
- *   desc="Radio Button Description"
- *   size="small"
- * />
- *
- * @param {Object} props - The component
- * @param {string} id - The id of the radio button.
- * @param {string} title - The title of the radio button.
- * @param {string} [desc] - The description of the radio button.
- * @param {string} [size="small"] - The size of the radio button.
- * @returns {JSX.Element} - The rendered Radio component.
- */
-
-const Radio = ({
-	name,
-	checked,
-	value,
-	id,
-	size,
-	title,
-	desc,
-	onChange,
-	labelSpacing,
-}) => {
-	const theme = useTheme();
-
-	return (
-		<FormControlLabel
-			className="custom-radio-button"
-			name={name}
-			checked={checked}
-			value={value}
-			control={
-				<MUIRadio
-					id={id}
-					size={size}
-					checkedIcon={
-						<Icon
-							name="CircleDot"
-							size={16}
-						/>
-					}
-					sx={{
-						color: "transparent",
-						width: 16,
-						height: 16,
-						boxShadow: `inset 0 0 0 1px ${theme.palette.secondary.main}`,
-						"&:not(.Mui-checked)": {
-							boxShadow: `inset 0 0 0 1px ${theme.palette.primary.contrastText}70`, // Use theme text color for the outline
-						},
-						mt: theme.spacing(0.5),
-					}}
-				/>
-			}
-			onChange={onChange}
-			label={
-				<>
-					<Typography
-						component="p"
-						mb={
-							labelSpacing !== undefined ? theme.spacing(labelSpacing) : theme.spacing(2)
-						}
-					>
-						{title}
-					</Typography>
-					<Typography
-						component="h6"
-						mt={theme.spacing(1)}
-						color={theme.palette.primary.contrastTextSecondary}
-					>
-						{desc}
-					</Typography>
-				</>
-			}
-			labelPlacement="end"
-			sx={{
-				alignItems: "flex-start",
-				p: theme.spacing(2.5),
-				m: theme.spacing(-2.5),
-				borderRadius: theme.shape.borderRadius,
-				"&:hover": {
-					backgroundColor: theme.palette.tertiary.main,
-				},
-				"& .MuiButtonBase-root": {
-					p: 0,
-					mr: theme.spacing(6),
-				},
-			}}
-		/>
-	);
-};
-
-Radio.propTypes = {
-	title: PropTypes.string,
-	desc: PropTypes.string,
-	size: PropTypes.string,
-	name: PropTypes.string,
-	checked: PropTypes.bool,
-	value: PropTypes.string,
-	id: PropTypes.string,
-	onChange: PropTypes.func,
-};
-
-export default Radio;

client/src/Components/v1/Inputs/Search/index.jsx

@@ -1,315 +0,0 @@
-import PropTypes from "prop-types";
-import {
-	Box,
-	ListItem,
-	Autocomplete,
-	TextField,
-	Typography,
-	Checkbox,
-} from "@mui/material";
-import { useTheme } from "@emotion/react";
-import Icon from "../../Icon";
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import FieldWrapper from "../FieldWrapper/index.jsx";
-
-/**
- * Search component using Material UI's Autocomplete.
- *
- * @param {Object} props
- * @param {string} props.id - Unique identifier for the Autocomplete component
- * @param {Array<Object>} props.options - Options to display in the Autocomplete dropdown
- * @param {string} props.filteredBy - Key to access the option label from the options
- * @param {string} props.value - Current input value for the Autocomplete
- * @param {Function} props.handleChange - Function to call when the input changes
- * @param {Function} Prop.onBlur - Function to call when the input is blured
- * @param {Object} props.sx - Additional styles to apply to the component
- * @param {string} props.unit - Label to identify type of options
- * @returns {JSX.Element} The rendered Search component
- */
-
-const SearchAdornment = () => {
-	const theme = useTheme();
-	return (
-		<Box height={16}>
-			<Icon
-				name="Search"
-				size={16}
-				color="primary.contrastTextTertiary"
-				strokeWidth={1.2}
-			/>
-		</Box>
-	);
-};
-
-//TODO keep search state inside of component.
-const Search = ({
-	label,
-	id,
-	options,
-	filteredBy,
-	secondaryLabel,
-	value,
-	inputValue,
-	handleInputChange,
-	handleChange,
-	sx,
-	multiple = false,
-	isAdorned = true,
-	error,
-	disabled,
-	startAdornment,
-	endAdornment,
-	onBlur,
-	//FieldWrapper's props
-	gap,
-	labelMb,
-	labelFontWeight,
-	labelVariant,
-	labelSx = {},
-	unit = "option",
-	maxWidth = "100%",
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-	const [selectAll, setSelectAll] = React.useState(false);
-
-	const [open, setOpen] = React.useState(false);
-	const enhancedOptions = React.useMemo(() => {
-		return multiple && isAdorned
-			? [
-					{
-						[filteredBy]: t("selectAll"),
-						isSelectAll: true,
-						_id: "select_all",
-						id: "select_all",
-					},
-					...options,
-				]
-			: options;
-	}, [multiple, isAdorned, options, filteredBy]);
-	const isOptionSelected = (option) => {
-		if (!multiple && !isAdorned) return false;
-		if (Array.isArray(value)) {
-			return value.some((item) => (item._id ?? item.id) === (option._id ?? option.id));
-		}
-		return false;
-	};
-	const handleSelectAll = (isSelectAll) => {
-		const newValue = isSelectAll ? [...options] : [];
-		handleChange(newValue);
-		setSelectAll(isSelectAll);
-	};
-	useEffect(() => {
-		const allSelected =
-			Array.isArray(value) && Array.isArray(options) && value.length === options.length;
-		if (selectAll !== allSelected) setSelectAll(allSelected);
-	}, [value, options]);
-	return (
-		<Autocomplete
-			onBlur={onBlur}
-			multiple={multiple}
-			id={id}
-			value={value}
-			open={open}
-			onOpen={() => setOpen(true)}
-			onClose={(event, reason) => {
-				if (reason === "blur" || reason === "escape") {
-					setOpen(false);
-				}
-			}}
-			inputValue={inputValue}
-			onInputChange={(_, newValue) => {
-				handleInputChange(newValue);
-			}}
-			onChange={(_, newValue) => {
-				if (multiple && isAdorned) {
-					const hasSelectAllSelected =
-						Array.isArray(newValue) && newValue.some((item) => item.isSelectAll);
-					if (hasSelectAllSelected) {
-						handleSelectAll(!selectAll);
-					} else {
-						handleChange(newValue);
-						setSelectAll(Array.isArray(newValue) && newValue.length === options.length);
-					}
-				} else {
-					handleChange(newValue);
-					setOpen(false);
-				}
-			}}
-			fullWidth
-			freeSolo
-			disabled={disabled}
-			disableClearable
-			options={enhancedOptions}
-			getOptionLabel={(option) => option[filteredBy]}
-			isOptionEqualToValue={(option, value) =>
-				(option._id ?? option.id) === (value?._id ?? value?.id)
-			} // Compare by unique identifier
-			renderInput={(params) => (
-				<FieldWrapper
-					label={label}
-					labelMb={labelMb}
-					labelVariant={labelVariant}
-					labelFontWeight={labelFontWeight}
-					labelSx={labelSx}
-					gap={gap}
-					sx={{
-						...sx,
-					}}
-				>
-					<TextField
-						{...params}
-						error={Boolean(error)}
-						placeholder="Type to search"
-						slotProps={{
-							input: {
-								...params.InputProps,
-								...(isAdorned && { startAdornment: <SearchAdornment /> }),
-								...(startAdornment && { startAdornment: startAdornment }),
-								...(endAdornment && { endAdornment: endAdornment }),
-							},
-						}}
-						sx={{}}
-					/>
-					{error && (
-						<Typography
-							component="span"
-							className="input-error"
-							color={theme.palette.error.main}
-							mt={theme.spacing(2)}
-							sx={{
-								opacity: 0.8,
-							}}
-						>
-							{error}
-						</Typography>
-					)}
-				</FieldWrapper>
-			)}
-			filterOptions={(options, { inputValue }) => {
-				if (inputValue.trim() === "" && multiple && isAdorned) {
-					return enhancedOptions;
-				}
-				const filtered = options.filter((option) =>
-					option[filteredBy].toLowerCase().includes(inputValue.toLowerCase())
-				);
-
-				if (filtered.length === 0) {
-					return [
-						{
-							[filteredBy]: t("general.noOptionsFound", { unit: unit }),
-							noOptions: true,
-						},
-					];
-				}
-				return filtered;
-			}}
-			getOptionKey={(option) => {
-				return option._id ?? option.id;
-			}}
-			renderOption={(props, option) => {
-				const { key, ...optionProps } = props;
-				const hasSecondaryLabel = secondaryLabel && option[secondaryLabel] !== undefined;
-				const port = option["port"];
-				const selected = isOptionSelected(option);
-				return (
-					<ListItem
-						key={key}
-						{...optionProps}
-						sx={
-							option.noOptions
-								? {
-										pointerEvents: "none",
-										backgroundColor: theme.palette.primary.main,
-									}
-								: option.isSelectAll
-									? {
-											fontWeight: "bold",
-											backgroundColor: theme.palette.primary.light,
-											"&:hover": {
-												backgroundColor: theme.palette.primary.light,
-											},
-										}
-									: {}
-						}
-					>
-						{multiple && isAdorned && !option.noOptions && (
-							<Checkbox
-								checked={option.isSelectAll ? selectAll : selected}
-								sx={{
-									color: theme.palette.primary.contrastTextSecondary,
-									"&.Mui-checked": {
-										color: theme.palette.secondary.main,
-									},
-									padding: 0,
-								}}
-							/>
-						)}
-						{option[filteredBy] +
-							(hasSecondaryLabel
-								? ` (${option[secondaryLabel]}${port ? `: ${port}` : ""})`
-								: "")}
-					</ListItem>
-				);
-			}}
-			slotProps={{
-				popper: {
-					keepMounted: true,
-					sx: {
-						"& ul": { p: 2, backgroundColor: theme.palette.primary.main },
-						"& li.MuiAutocomplete-option": {
-							color: theme.palette.primary.contrastTextSecondary,
-							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.primary.lowContrast,
-								color: "red",
-							},
-						"& li.MuiAutocomplete-option:hover:not([aria-selected='true'])": {
-							color: theme.palette.secondary.contrastText,
-							backgroundColor: theme.palette.secondary.main,
-						},
-						"& .MuiAutocomplete-noOptions": {
-							px: theme.spacing(6),
-							py: theme.spacing(5),
-						},
-					},
-				},
-			}}
-			sx={{
-				/* 	height: 34,*/
-				"&.MuiAutocomplete-root .MuiAutocomplete-input": {
-					padding: `0 ${theme.spacing(5)}`,
-				},
-				...sx,
-			}}
-		/>
-	);
-};
-
-Search.propTypes = {
-	label: PropTypes.string,
-	id: PropTypes.string,
-	multiple: PropTypes.bool,
-	options: PropTypes.array.isRequired,
-	filteredBy: PropTypes.string.isRequired,
-	secondaryLabel: PropTypes.string,
-	value: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
-	inputValue: PropTypes.string.isRequired,
-	handleInputChange: PropTypes.func.isRequired,
-	handleChange: PropTypes.func,
-	isAdorned: PropTypes.bool,
-	sx: PropTypes.object,
-	error: PropTypes.string,
-	disabled: PropTypes.bool,
-	startAdornment: PropTypes.object,
-	endAdornment: PropTypes.object,
-	onBlur: PropTypes.func,
-	unit: PropTypes.string,
-};
-
-export default Search;

client/src/Components/v1/Inputs/Select/index.css

@@ -1,7 +0,0 @@
-.select-wrapper .select-component > .MuiSelect-select {
-	padding: 0 10px;
-	min-height: 34px;
-	display: flex;
-	align-items: center;
-	line-height: 1;
-}

client/src/Components/v1/Inputs/Select/index.jsx

@@ -1,213 +0,0 @@
-import PropTypes from "prop-types";
-import { useTheme } from "@emotion/react";
-import { MenuItem, Select as MuiSelect, Stack, Typography } from "@mui/material";
-import Icon from "../../Icon";
-import FieldWrapper from "../FieldWrapper/index.jsx";
-
-import "./index.css";
-
-/**
- * @component
- * @param {object} props
- * @param {string} props.id - The ID attribute for the select element.
- * @param {string} props.placeholder - The label of the select element.
- * @param {string} props.placeholder - The placeholder text when no option is selected.
- * @param {boolean} props.isHidden - Whether the placeholder should be hidden.
- * @param {(string | number | boolean)} props.value - The currently selected value.
- * @param {object[]} props.items - The array of items to populate in the select dropdown.
- *    @param {(string | number | boolean)} props.items._id - The unique identifier of each item.
- *    @param {string} props.items.name - The display name of each item.
- * @param {function} props.onChange - The function to handle onChange event.
- * @param {object} props.sx - The custom styles object for MUI Select component.
- * @param {number} props.maxWidth - Maximum width in pixels for the select component. Enables responsive text truncation.
- * @returns {JSX.Element}
- *
- * @example
- * const frequencies = [
- * { _id: 1, name: "1 minute" },
- * { _id: 2, name: "2 minutes" },
- * { _id: 3, name: "3 minutes" },
- * ];
- *
- * <Select
- *  id="frequency-id"
- *  name="my-name"
- *  label="Check frequency"
- *  placeholder="Select frequency"
- *  value={value}
- *  onChange={handleChange}
- *  items={frequencies}
- * />
- */
-
-const Select = ({
-	id,
-	label,
-	placeholder,
-	isHidden,
-	value,
-	items,
-	onChange,
-	onBlur,
-	sx,
-	error = false,
-	name = "",
-	labelControlSpacing = 6,
-	maxWidth,
-	//FieldWrapper's props
-	labelMb,
-	labelFontWeight,
-	labelVariant,
-	labelSx = {},
-	fieldWrapperSx = {},
-}) => {
-	const theme = useTheme();
-	const getItemValue = (item) => item?._id ?? item?.id;
-	const itemStyles = {
-		color: theme.palette.primary.contrastTextTertiary,
-		borderRadius: theme.shape.borderRadius,
-		margin: theme.spacing(2),
-	};
-
-	const responsiveMaxWidth = {
-		xs: `${maxWidth * 0.5}px`,
-		sm: `${maxWidth * 0.75}px`,
-		md: `${maxWidth * 0.9}px`,
-		lg: `${maxWidth}px`,
-	};
-
-	return (
-		<FieldWrapper
-			label={label}
-			labelMb={labelMb}
-			labelVariant={labelVariant}
-			labelFontWeight={labelFontWeight}
-			labelSx={labelSx}
-			gap={labelControlSpacing}
-			sx={{
-				...fieldWrapperSx,
-			}}
-		>
-			<MuiSelect
-				className="select-component"
-				value={value}
-				onChange={onChange}
-				onBlur={onBlur}
-				displayEmpty
-				error={error}
-				name={name}
-				inputProps={{ id: id }}
-				IconComponent={(props) => (
-					<Icon
-						name="ChevronDown"
-						size={20}
-						{...props}
-					/>
-				)}
-				MenuProps={{ disableScrollLock: true }}
-				sx={{
-					fontSize: 13,
-					minWidth: "125px",
-					...(maxWidth && { maxWidth: responsiveMaxWidth }),
-					"& fieldset": {
-						borderRadius: theme.shape.borderRadius,
-						borderColor: theme.palette.primary.lowContrast,
-					},
-					"&:not(.Mui-focused):hover fieldset": {
-						borderColor: theme.palette.primary.lowContrast,
-					},
-					"& svg path": {
-						fill: theme.palette.primary.contrastTextTertiary,
-					},
-					"& .MuiSelect-select": {
-						padding: "0",
-						minHeight: "34px",
-						display: "flex",
-						alignItems: "center",
-						lineHeight: 1,
-					},
-					...sx,
-				}}
-				renderValue={(selected) => {
-					const selectedItem = items.find((item) => getItemValue(item) === selected);
-					const displayName = selectedItem ? selectedItem.name : placeholder;
-					return (
-						<Typography
-							sx={{
-								overflow: "hidden",
-								textOverflow: "ellipsis",
-								whiteSpace: "nowrap",
-							}}
-							title={displayName}
-						>
-							{displayName}
-						</Typography>
-					);
-				}}
-			>
-				{placeholder && (
-					<MenuItem
-						className="select-placeholder"
-						value="0"
-						sx={{
-							display: isHidden ? "none" : "flex",
-							visibility: isHidden ? "none" : "visible",
-							...itemStyles,
-						}}
-					>
-						{placeholder}
-					</MenuItem>
-				)}
-				{items
-					.map((item) => {
-						const itemValue = getItemValue(item);
-						if (itemValue === undefined || itemValue === null) {
-							return null;
-						}
-						return (
-							<MenuItem
-								value={itemValue}
-								key={`${id}-${itemValue}`}
-								sx={{
-									...itemStyles,
-								}}
-							>
-								{item.name}
-							</MenuItem>
-						);
-					})
-					.filter(Boolean)}
-			</MuiSelect>
-		</FieldWrapper>
-	);
-};
-
-Select.propTypes = {
-	id: PropTypes.string,
-	name: PropTypes.string,
-	label: PropTypes.string,
-	placeholder: PropTypes.string,
-	isHidden: PropTypes.bool,
-	error: PropTypes.bool,
-	value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool])
-		.isRequired,
-	items: PropTypes.arrayOf(
-		PropTypes.shape({
-			_id: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]),
-			id: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.bool]),
-
-			name: PropTypes.string.isRequired,
-		})
-	).isRequired,
-	onChange: PropTypes.func.isRequired,
-	onBlur: PropTypes.func,
-	sx: PropTypes.object,
-	labelControlSpacing: PropTypes.number,
-	/**
-	 * Maximum width in pixels. Used to control text truncation and element width.
-	 * Responsive breakpoints will be calculated as percentages of this value.
-	 */
-	maxWidth: PropTypes.number,
-};
-
-export default Select;

client/src/Components/v1/Inputs/TextInput/Adornments/index.jsx

@@ -1,74 +0,0 @@
-import { Stack, Typography, InputAdornment, IconButton } from "@mui/material";
-import { useTheme } from "@mui/material/styles";
-import PropTypes from "prop-types";
-import Icon from "../../../Icon";
-
-export const HttpAdornment = ({ https }) => {
-	const theme = useTheme();
-	return (
-		<Stack
-			direction="row"
-			alignItems="center"
-			height="100%"
-			sx={{
-				borderRight: `solid 1px ${theme.palette.primary.lowContrast}`,
-				backgroundColor: theme.palette.tertiary.main,
-				pl: theme.spacing(6),
-			}}
-		>
-			<Typography
-				component="h5"
-				color={theme.palette.primary.contrastTextSecondary}
-				sx={{ lineHeight: 1, opacity: 0.8 }}
-			>
-				{https ? "https" : "http"}
-			</Typography>
-		</Stack>
-	);
-};
-
-HttpAdornment.propTypes = {
-	https: PropTypes.bool.isRequired,
-	prefix: PropTypes.string,
-};
-
-export const PasswordEndAdornment = ({ fieldType, setFieldType }) => {
-	const theme = useTheme();
-	return (
-		<InputAdornment position="end">
-			<IconButton
-				aria-label="toggle password visibility"
-				onClick={() => setFieldType(fieldType === "password" ? "text" : "password")}
-				sx={{
-					color: theme.palette.primary.lowContrast,
-					padding: theme.spacing(1),
-					"&:focus-visible": {
-						outline: `2px solid ${theme.palette.primary.main}`,
-						outlineOffset: `2px`,
-					},
-					"& .MuiTouchRipple-root": {
-						pointerEvents: "none",
-						display: "none",
-					},
-				}}
-			>
-				{fieldType === "password" ? (
-					<Icon
-						name="EyeOff"
-						size={20}
-					/>
-				) : (
-					<Icon
-						name="Eye"
-						size={20}
-					/>
-				)}
-			</IconButton>
-		</InputAdornment>
-	);
-};
-
-PasswordEndAdornment.propTypes = {
-	fieldType: PropTypes.string,
-	setFieldType: PropTypes.func,
-};