Merge pull request #3316 from bluewave-labs/fix/settings-refactor

fix/settings refactor

Author: ajhollid

client/src/App.tsx

@@ -3,16 +3,14 @@ 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 { 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";
 
 function App() {
 	const mode = useSelector((state: RootState) => state.ui.mode);
-
 	const theme = mode === "light" ? lightTheme : darkTheme;
 
 	return (
@@ -21,8 +19,7 @@ function App() {
 			<GlobalStyles
 				styles={{
 					body: {
-						// @ts-ignore
-						backgroundColor: theme.palette.background.main,
+						backgroundColor: theme.palette.background.default,
 					},
 				}}
 			/>

…src/Components/v2/actions-menu/index.tsx …nt/src/Components/actions-menu/index.tsxclient/src/Components/v2/actions-menu/index.tsx renamed to client/src/Components/actions-menu/index.tsx client/src/Components/v2/actions-menu/index.tsx renamed to client/src/Components/actions-menu/index.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";
 

…v2/common/charts/HeatmapResponseTime.tsx …ts/common/charts/HeatmapResponseTime.tsxclient/src/Components/v2/common/charts/HeatmapResponseTime.tsx renamed to client/src/Components/common/charts/HeatmapResponseTime.tsx client/src/Components/v2/common/charts/HeatmapResponseTime.tsx renamed to client/src/Components/common/charts/HeatmapResponseTime.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";

…on/charts/HeatmapResponseTimeTooltip.tsx …on/charts/HeatmapResponseTimeTooltip.tsxclient/src/Components/v2/common/charts/HeatmapResponseTimeTooltip.tsx renamed to client/src/Components/common/charts/HeatmapResponseTimeTooltip.tsx client/src/Components/v2/common/charts/HeatmapResponseTimeTooltip.tsx renamed to client/src/Components/common/charts/HeatmapResponseTimeTooltip.tsx

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