diff --git a/client/src/App.tsx b/client/src/App.tsx index 148978521..127426c85 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -5,7 +5,7 @@ import { ToastContainer } from "react-toastify"; import { ThemeProvider } from "@emotion/react"; 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"; diff --git a/client/src/Components/v2/actions-menu/index.tsx b/client/src/Components/actions-menu/index.tsx similarity index 100% rename from client/src/Components/v2/actions-menu/index.tsx rename to client/src/Components/actions-menu/index.tsx diff --git a/client/src/Components/v2/common/charts/HeatmapResponseTime.tsx b/client/src/Components/common/charts/HeatmapResponseTime.tsx similarity index 97% rename from client/src/Components/v2/common/charts/HeatmapResponseTime.tsx rename to client/src/Components/common/charts/HeatmapResponseTime.tsx index 972291f57..8178ffb92 100644 --- a/client/src/Components/v2/common/charts/HeatmapResponseTime.tsx +++ b/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"; diff --git a/client/src/Components/v2/common/charts/HeatmapResponseTimeTooltip.tsx b/client/src/Components/common/charts/HeatmapResponseTimeTooltip.tsx similarity index 100% rename from client/src/Components/v2/common/charts/HeatmapResponseTimeTooltip.tsx rename to client/src/Components/common/charts/HeatmapResponseTimeTooltip.tsx diff --git a/client/src/Components/v2/common/charts/HistogramResponseTime.tsx b/client/src/Components/common/charts/HistogramResponseTime.tsx similarity index 100% rename from client/src/Components/v2/common/charts/HistogramResponseTime.tsx rename to client/src/Components/common/charts/HistogramResponseTime.tsx diff --git a/client/src/Components/v2/common/controls/HeaderCreate.tsx b/client/src/Components/common/controls/HeaderCreate.tsx similarity index 100% rename from client/src/Components/v2/common/controls/HeaderCreate.tsx rename to client/src/Components/common/controls/HeaderCreate.tsx diff --git a/client/src/Components/v2/common/controls/HeaderTimeRange.tsx b/client/src/Components/common/controls/HeaderTimeRange.tsx similarity index 96% rename from client/src/Components/v2/common/controls/HeaderTimeRange.tsx rename to client/src/Components/common/controls/HeaderTimeRange.tsx index c66ee9ff6..d7c7102bc 100644 --- a/client/src/Components/v2/common/controls/HeaderTimeRange.tsx +++ b/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"; diff --git a/client/src/Components/common/index.ts b/client/src/Components/common/index.ts new file mode 100644 index 000000000..4db9cac34 --- /dev/null +++ b/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"; diff --git a/client/src/Components/v2/design-elements/Avatar.tsx b/client/src/Components/design-elements/Avatar.tsx similarity index 100% rename from client/src/Components/v2/design-elements/Avatar.tsx rename to client/src/Components/design-elements/Avatar.tsx diff --git a/client/src/Components/v2/design-elements/BaseBox.tsx b/client/src/Components/design-elements/BaseBox.tsx similarity index 100% rename from client/src/Components/v2/design-elements/BaseBox.tsx rename to client/src/Components/design-elements/BaseBox.tsx diff --git a/client/src/Components/v2/design-elements/BaseChart.tsx b/client/src/Components/design-elements/BaseChart.tsx similarity index 96% rename from client/src/Components/v2/design-elements/BaseChart.tsx rename to client/src/Components/design-elements/BaseChart.tsx index fd9251915..569652b20 100644 --- a/client/src/Components/v2/design-elements/BaseChart.tsx +++ b/client/src/Components/design-elements/BaseChart.tsx @@ -1,4 +1,4 @@ -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"; diff --git a/client/src/Components/v2/design-elements/BasePage.tsx b/client/src/Components/design-elements/BasePage.tsx similarity index 97% rename from client/src/Components/v2/design-elements/BasePage.tsx rename to client/src/Components/design-elements/BasePage.tsx index 48c836e54..cf28da40f 100644 --- a/client/src/Components/v2/design-elements/BasePage.tsx +++ b/client/src/Components/design-elements/BasePage.tsx @@ -8,8 +8,8 @@ import { 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"; diff --git a/client/src/Components/v2/design-elements/Breadcrumb.tsx b/client/src/Components/design-elements/Breadcrumb.tsx similarity index 100% rename from client/src/Components/v2/design-elements/Breadcrumb.tsx rename to client/src/Components/design-elements/Breadcrumb.tsx diff --git a/client/src/Components/v2/design-elements/BulletPointCheck.tsx b/client/src/Components/design-elements/BulletPointCheck.tsx similarity index 100% rename from client/src/Components/v2/design-elements/BulletPointCheck.tsx rename to client/src/Components/design-elements/BulletPointCheck.tsx diff --git a/client/src/Components/v2/design-elements/Dot.tsx b/client/src/Components/design-elements/Dot.tsx similarity index 100% rename from client/src/Components/v2/design-elements/Dot.tsx rename to client/src/Components/design-elements/Dot.tsx diff --git a/client/src/Components/v2/design-elements/Fallback.tsx b/client/src/Components/design-elements/Fallback.tsx similarity index 96% rename from client/src/Components/v2/design-elements/Fallback.tsx rename to client/src/Components/design-elements/Fallback.tsx index 593829ab5..93cdac410 100644 --- a/client/src/Components/v2/design-elements/Fallback.tsx +++ b/client/src/Components/design-elements/Fallback.tsx @@ -1,7 +1,7 @@ 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 { useNavigate } from "react-router"; import useMediaQuery from "@mui/material/useMediaQuery"; diff --git a/client/src/Components/v2/design-elements/Gauge.tsx b/client/src/Components/design-elements/Gauge.tsx similarity index 98% rename from client/src/Components/v2/design-elements/Gauge.tsx rename to client/src/Components/design-elements/Gauge.tsx index 4fee5386c..fda42df3c 100644 --- a/client/src/Components/v2/design-elements/Gauge.tsx +++ b/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"; diff --git a/client/src/Components/v2/design-elements/Icon.tsx b/client/src/Components/design-elements/Icon.tsx similarity index 100% rename from client/src/Components/v2/design-elements/Icon.tsx rename to client/src/Components/design-elements/Icon.tsx diff --git a/client/src/Components/v2/design-elements/MonitorStatus.tsx b/client/src/Components/design-elements/MonitorStatus.tsx similarity index 95% rename from client/src/Components/v2/design-elements/MonitorStatus.tsx rename to client/src/Components/design-elements/MonitorStatus.tsx index a9720e293..04c62de47 100644 --- a/client/src/Components/v2/design-elements/MonitorStatus.tsx +++ b/client/src/Components/design-elements/MonitorStatus.tsx @@ -1,7 +1,7 @@ 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"; diff --git a/client/src/Components/v2/design-elements/OfflineBanner.tsx b/client/src/Components/design-elements/OfflineBanner.tsx similarity index 100% rename from client/src/Components/v2/design-elements/OfflineBanner.tsx rename to client/src/Components/design-elements/OfflineBanner.tsx diff --git a/client/src/Components/v2/design-elements/PulseDot.tsx b/client/src/Components/design-elements/PulseDot.tsx similarity index 100% rename from client/src/Components/v2/design-elements/PulseDot.tsx rename to client/src/Components/design-elements/PulseDot.tsx diff --git a/client/src/Components/v2/design-elements/SkeletonCard.tsx b/client/src/Components/design-elements/SkeletonCard.tsx similarity index 100% rename from client/src/Components/v2/design-elements/SkeletonCard.tsx rename to client/src/Components/design-elements/SkeletonCard.tsx diff --git a/client/src/Components/v2/design-elements/SplitBox.tsx b/client/src/Components/design-elements/SplitBox.tsx similarity index 100% rename from client/src/Components/v2/design-elements/SplitBox.tsx rename to client/src/Components/design-elements/SplitBox.tsx diff --git a/client/src/Components/v2/design-elements/StatBox.tsx b/client/src/Components/design-elements/StatBox.tsx similarity index 96% rename from client/src/Components/v2/design-elements/StatBox.tsx rename to client/src/Components/design-elements/StatBox.tsx index 901468f23..01a8e9835 100644 --- a/client/src/Components/v2/design-elements/StatBox.tsx +++ b/client/src/Components/design-elements/StatBox.tsx @@ -5,7 +5,7 @@ import { useTheme } from "@mui/material/styles"; import { lighten } from "@mui/material/styles"; import useMediaQuery from "@mui/material/useMediaQuery"; import type { PaletteKey } from "@/Utils/Theme/Theme"; -import { BaseBox, TooltipWithInfo } from "@/Components/v2/design-elements"; +import { BaseBox, TooltipWithInfo } from "@/Components/design-elements"; import type { SxProps } from "@mui/material"; type GradientBox = React.PropsWithChildren<{ diff --git a/client/src/Components/v2/design-elements/StatusBox.tsx b/client/src/Components/design-elements/StatusBox.tsx similarity index 98% rename from client/src/Components/v2/design-elements/StatusBox.tsx rename to client/src/Components/design-elements/StatusBox.tsx index 73a881736..96a9d9fbf 100644 --- a/client/src/Components/v2/design-elements/StatusBox.tsx +++ b/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"; diff --git a/client/src/Components/v2/design-elements/StatusLabel.tsx b/client/src/Components/design-elements/StatusLabel.tsx similarity index 97% rename from client/src/Components/v2/design-elements/StatusLabel.tsx rename to client/src/Components/design-elements/StatusLabel.tsx index 19bb8d157..d50058378 100644 --- a/client/src/Components/v2/design-elements/StatusLabel.tsx +++ b/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"; diff --git a/client/src/Components/v2/design-elements/Table.tsx b/client/src/Components/design-elements/Table.tsx similarity index 100% rename from client/src/Components/v2/design-elements/Table.tsx rename to client/src/Components/design-elements/Table.tsx diff --git a/client/src/Components/v2/design-elements/Tabs.tsx b/client/src/Components/design-elements/Tabs.tsx similarity index 100% rename from client/src/Components/v2/design-elements/Tabs.tsx rename to client/src/Components/design-elements/Tabs.tsx diff --git a/client/src/Components/v2/design-elements/TextLink.tsx b/client/src/Components/design-elements/TextLink.tsx similarity index 100% rename from client/src/Components/v2/design-elements/TextLink.tsx rename to client/src/Components/design-elements/TextLink.tsx diff --git a/client/src/Components/v2/design-elements/Tooltip.tsx b/client/src/Components/design-elements/Tooltip.tsx similarity index 100% rename from client/src/Components/v2/design-elements/Tooltip.tsx rename to client/src/Components/design-elements/Tooltip.tsx diff --git a/client/src/Components/v2/design-elements/index.tsx b/client/src/Components/design-elements/index.tsx similarity index 100% rename from client/src/Components/v2/design-elements/index.tsx rename to client/src/Components/design-elements/index.tsx diff --git a/client/src/Components/v2/i18nLoader/index.tsx b/client/src/Components/i18nLoader/index.tsx similarity index 100% rename from client/src/Components/v2/i18nLoader/index.tsx rename to client/src/Components/i18nLoader/index.tsx diff --git a/client/src/Components/v2/inputs/AutoComplete.tsx b/client/src/Components/inputs/AutoComplete.tsx similarity index 97% rename from client/src/Components/v2/inputs/AutoComplete.tsx rename to client/src/Components/inputs/AutoComplete.tsx index af0e8cbfd..c98e8ff32 100644 --- a/client/src/Components/v2/inputs/AutoComplete.tsx +++ b/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"; diff --git a/client/src/Components/v2/inputs/Button.tsx b/client/src/Components/inputs/Button.tsx similarity index 100% rename from client/src/Components/v2/inputs/Button.tsx rename to client/src/Components/inputs/Button.tsx diff --git a/client/src/Components/v2/inputs/Checkbox.tsx b/client/src/Components/inputs/Checkbox.tsx similarity index 100% rename from client/src/Components/v2/inputs/Checkbox.tsx rename to client/src/Components/inputs/Checkbox.tsx diff --git a/client/src/Components/v2/inputs/ColorPicker.tsx b/client/src/Components/inputs/ColorPicker.tsx similarity index 94% rename from client/src/Components/v2/inputs/ColorPicker.tsx rename to client/src/Components/inputs/ColorPicker.tsx index d2899c203..de736c85d 100644 --- a/client/src/Components/v2/inputs/ColorPicker.tsx +++ b/client/src/Components/inputs/ColorPicker.tsx @@ -3,7 +3,7 @@ import type { MuiColorInputProps } from "mui-color-input"; 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; diff --git a/client/src/Components/v2/inputs/DatePicker.tsx b/client/src/Components/inputs/DatePicker.tsx similarity index 100% rename from client/src/Components/v2/inputs/DatePicker.tsx rename to client/src/Components/inputs/DatePicker.tsx diff --git a/client/src/Components/v2/inputs/Dialog.tsx b/client/src/Components/inputs/Dialog.tsx similarity index 97% rename from client/src/Components/v2/inputs/Dialog.tsx rename to client/src/Components/inputs/Dialog.tsx index 9dd546dea..b0c924f55 100644 --- a/client/src/Components/v2/inputs/Dialog.tsx +++ b/client/src/Components/inputs/Dialog.tsx @@ -4,7 +4,7 @@ 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 { Button } from "@/Components/inputs"; import { typographyLevels } from "@/Utils/Theme/Palette"; import { useTranslation } from "react-i18next"; import type { ReactNode } from "react"; diff --git a/client/src/Components/v2/inputs/FieldLabel.tsx b/client/src/Components/inputs/FieldLabel.tsx similarity index 100% rename from client/src/Components/v2/inputs/FieldLabel.tsx rename to client/src/Components/inputs/FieldLabel.tsx diff --git a/client/src/Components/v2/inputs/ImageUpload.tsx b/client/src/Components/inputs/ImageUpload.tsx similarity index 100% rename from client/src/Components/v2/inputs/ImageUpload.tsx rename to client/src/Components/inputs/ImageUpload.tsx diff --git a/client/src/Components/v2/inputs/LanguageSelector.tsx b/client/src/Components/inputs/LanguageSelector.tsx similarity index 97% rename from client/src/Components/v2/inputs/LanguageSelector.tsx rename to client/src/Components/inputs/LanguageSelector.tsx index 2a1274ef2..a6d52a555 100644 --- a/client/src/Components/v2/inputs/LanguageSelector.tsx +++ b/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"; diff --git a/client/src/Components/v2/inputs/Radio.tsx b/client/src/Components/inputs/Radio.tsx similarity index 100% rename from client/src/Components/v2/inputs/Radio.tsx rename to client/src/Components/inputs/Radio.tsx diff --git a/client/src/Components/v2/inputs/Select.tsx b/client/src/Components/inputs/Select.tsx similarity index 100% rename from client/src/Components/v2/inputs/Select.tsx rename to client/src/Components/inputs/Select.tsx diff --git a/client/src/Components/v2/inputs/Slider.tsx b/client/src/Components/inputs/Slider.tsx similarity index 100% rename from client/src/Components/v2/inputs/Slider.tsx rename to client/src/Components/inputs/Slider.tsx diff --git a/client/src/Components/v2/inputs/Switch.tsx b/client/src/Components/inputs/Switch.tsx similarity index 100% rename from client/src/Components/v2/inputs/Switch.tsx rename to client/src/Components/inputs/Switch.tsx diff --git a/client/src/Components/v2/inputs/SwitchTheme.tsx b/client/src/Components/inputs/SwitchTheme.tsx similarity index 100% rename from client/src/Components/v2/inputs/SwitchTheme.tsx rename to client/src/Components/inputs/SwitchTheme.tsx diff --git a/client/src/Components/v2/inputs/TextInput.tsx b/client/src/Components/inputs/TextInput.tsx similarity index 100% rename from client/src/Components/v2/inputs/TextInput.tsx rename to client/src/Components/inputs/TextInput.tsx diff --git a/client/src/Components/v2/inputs/TimePicker.tsx b/client/src/Components/inputs/TimePicker.tsx similarity index 100% rename from client/src/Components/v2/inputs/TimePicker.tsx rename to client/src/Components/inputs/TimePicker.tsx diff --git a/client/src/Components/v2/inputs/ToggleButton.tsx b/client/src/Components/inputs/ToggleButton.tsx similarity index 100% rename from client/src/Components/v2/inputs/ToggleButton.tsx rename to client/src/Components/inputs/ToggleButton.tsx diff --git a/client/src/Components/v2/inputs/index.tsx b/client/src/Components/inputs/index.tsx similarity index 100% rename from client/src/Components/v2/inputs/index.tsx rename to client/src/Components/inputs/index.tsx diff --git a/client/src/Components/v2/layout/AppLayout.tsx b/client/src/Components/layout/AppLayout.tsx similarity index 96% rename from client/src/Components/v2/layout/AppLayout.tsx rename to client/src/Components/layout/AppLayout.tsx index 24d18bfee..baadd85ca 100644 --- a/client/src/Components/v2/layout/AppLayout.tsx +++ b/client/src/Components/layout/AppLayout.tsx @@ -4,7 +4,7 @@ import { useTheme } from "@mui/material/styles"; import { useSelector } from "react-redux"; import BackgroundSVG from "@/assets/Images/background.svg"; import type { RootState } from "@/Types/state"; -import { OfflineBanner } from "@/Components/v2/design-elements"; +import { OfflineBanner } from "@/Components/design-elements"; import { setServerUnreachableCallback, get } from "@/Utils/ApiClient"; interface AppLayoutProps { diff --git a/client/src/Components/v2/layout/RootLayout.tsx b/client/src/Components/layout/RootLayout.tsx similarity index 94% rename from client/src/Components/v2/layout/RootLayout.tsx rename to client/src/Components/layout/RootLayout.tsx index 117c08255..c22bd7455 100644 --- a/client/src/Components/v2/layout/RootLayout.tsx +++ b/client/src/Components/layout/RootLayout.tsx @@ -1,4 +1,4 @@ -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"; diff --git a/client/src/Components/v2/monitors/ControlsFilter.tsx b/client/src/Components/monitors/ControlsFilter.tsx similarity index 97% rename from client/src/Components/v2/monitors/ControlsFilter.tsx rename to client/src/Components/monitors/ControlsFilter.tsx index 01802ee3f..e37408819 100644 --- a/client/src/Components/v2/monitors/ControlsFilter.tsx +++ b/client/src/Components/monitors/ControlsFilter.tsx @@ -1,5 +1,5 @@ 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"; diff --git a/client/src/Components/v2/monitors/HeaderMonitorControls.tsx b/client/src/Components/monitors/HeaderMonitorControls.tsx similarity index 97% rename from client/src/Components/v2/monitors/HeaderMonitorControls.tsx rename to client/src/Components/monitors/HeaderMonitorControls.tsx index 6d321cbb8..7f6968f0b 100644 --- a/client/src/Components/v2/monitors/HeaderMonitorControls.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/HeaderMonitorsSummary.tsx b/client/src/Components/monitors/HeaderMonitorsSummary.tsx similarity index 95% rename from client/src/Components/v2/monitors/HeaderMonitorsSummary.tsx rename to client/src/Components/monitors/HeaderMonitorsSummary.tsx index 38a6adfde..1d130209d 100644 --- a/client/src/Components/v2/monitors/HeaderMonitorsSummary.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/MonitorStatBoxes.tsx b/client/src/Components/monitors/MonitorStatBoxes.tsx similarity index 97% rename from client/src/Components/v2/monitors/MonitorStatBoxes.tsx rename to client/src/Components/monitors/MonitorStatBoxes.tsx index 867f85516..044bb71ab 100644 --- a/client/src/Components/v2/monitors/MonitorStatBoxes.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/charts/HistogramDetails.tsx b/client/src/Components/monitors/charts/HistogramDetails.tsx similarity index 97% rename from client/src/Components/v2/monitors/charts/HistogramDetails.tsx rename to client/src/Components/monitors/charts/HistogramDetails.tsx index 8858a9784..c2f75aa7b 100644 --- a/client/src/Components/v2/monitors/charts/HistogramDetails.tsx +++ b/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, diff --git a/client/src/Components/v2/monitors/charts/HistogramInfrastructure.tsx b/client/src/Components/monitors/charts/HistogramInfrastructure.tsx similarity index 97% rename from client/src/Components/v2/monitors/charts/HistogramInfrastructure.tsx rename to client/src/Components/monitors/charts/HistogramInfrastructure.tsx index e65a58bd9..8dd15ae03 100644 --- a/client/src/Components/v2/monitors/charts/HistogramInfrastructure.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/charts/HistogramPageSpeed.tsx b/client/src/Components/monitors/charts/HistogramPageSpeed.tsx similarity index 96% rename from client/src/Components/v2/monitors/charts/HistogramPageSpeed.tsx rename to client/src/Components/monitors/charts/HistogramPageSpeed.tsx index f19e0323c..79c826851 100644 --- a/client/src/Components/v2/monitors/charts/HistogramPageSpeed.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/charts/HistogramPageSpeedDetails.tsx b/client/src/Components/monitors/charts/HistogramPageSpeedDetails.tsx similarity index 93% rename from client/src/Components/v2/monitors/charts/HistogramPageSpeedDetails.tsx rename to client/src/Components/monitors/charts/HistogramPageSpeedDetails.tsx index 05bee8bc8..8df491197 100644 --- a/client/src/Components/v2/monitors/charts/HistogramPageSpeedDetails.tsx +++ b/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,7 +9,7 @@ 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"; diff --git a/client/src/Components/v2/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx b/client/src/Components/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx similarity index 97% rename from client/src/Components/v2/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx rename to client/src/Components/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx index 1663ab3b5..37c172b4d 100644 --- a/client/src/Components/v2/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx +++ b/client/src/Components/monitors/charts/HistogramPageSpeedDetailsTooltip.tsx @@ -3,7 +3,7 @@ import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; import { useTheme } from "@mui/material/styles"; 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"; diff --git a/client/src/Components/v2/monitors/charts/HistogramPageSpeedTooltip.tsx b/client/src/Components/monitors/charts/HistogramPageSpeedTooltip.tsx similarity index 100% rename from client/src/Components/v2/monitors/charts/HistogramPageSpeedTooltip.tsx rename to client/src/Components/monitors/charts/HistogramPageSpeedTooltip.tsx diff --git a/client/src/Components/v2/monitors/charts/HistogramStatus.tsx b/client/src/Components/monitors/charts/HistogramStatus.tsx similarity index 98% rename from client/src/Components/v2/monitors/charts/HistogramStatus.tsx rename to client/src/Components/monitors/charts/HistogramStatus.tsx index d3aa62a69..44f6bea97 100644 --- a/client/src/Components/v2/monitors/charts/HistogramStatus.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/charts/PiePageSpeed.tsx b/client/src/Components/monitors/charts/PiePageSpeed.tsx similarity index 98% rename from client/src/Components/v2/monitors/charts/PiePageSpeed.tsx rename to client/src/Components/monitors/charts/PiePageSpeed.tsx index 205ec9a96..397262cd9 100644 --- a/client/src/Components/v2/monitors/charts/PiePageSpeed.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/charts/PiePageSpeedLegend.tsx b/client/src/Components/monitors/charts/PiePageSpeedLegend.tsx similarity index 97% rename from client/src/Components/v2/monitors/charts/PiePageSpeedLegend.tsx rename to client/src/Components/monitors/charts/PiePageSpeedLegend.tsx index b98b09b33..a3977e284 100644 --- a/client/src/Components/v2/monitors/charts/PiePageSpeedLegend.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/charts/RadialAvgResponse.tsx b/client/src/Components/monitors/charts/RadialAvgResponse.tsx similarity index 97% rename from client/src/Components/v2/monitors/charts/RadialAvgResponse.tsx rename to client/src/Components/monitors/charts/RadialAvgResponse.tsx index b54bfc764..fcfaa426b 100644 --- a/client/src/Components/v2/monitors/charts/RadialAvgResponse.tsx +++ b/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"; diff --git a/client/src/Components/v2/monitors/index.tsx b/client/src/Components/monitors/index.tsx similarity index 100% rename from client/src/Components/v2/monitors/index.tsx rename to client/src/Components/monitors/index.tsx diff --git a/client/src/Components/v2/routing/RouteProtected.tsx b/client/src/Components/routing/RouteProtected.tsx similarity index 100% rename from client/src/Components/v2/routing/RouteProtected.tsx rename to client/src/Components/routing/RouteProtected.tsx diff --git a/client/src/Components/v2/sidebar/Authfooter.tsx b/client/src/Components/sidebar/Authfooter.tsx similarity index 98% rename from client/src/Components/v2/sidebar/Authfooter.tsx rename to client/src/Components/sidebar/Authfooter.tsx index 4724ed97d..3edac75dd 100644 --- a/client/src/Components/v2/sidebar/Authfooter.tsx +++ b/client/src/Components/sidebar/Authfooter.tsx @@ -10,7 +10,7 @@ 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"; diff --git a/client/src/Components/v2/sidebar/Logo.tsx b/client/src/Components/sidebar/Logo.tsx similarity index 100% rename from client/src/Components/v2/sidebar/Logo.tsx rename to client/src/Components/sidebar/Logo.tsx diff --git a/client/src/Components/v2/sidebar/Menu.tsx b/client/src/Components/sidebar/Menu.tsx similarity index 97% rename from client/src/Components/v2/sidebar/Menu.tsx rename to client/src/Components/sidebar/Menu.tsx index 918a82858..9d005e547 100644 --- a/client/src/Components/v2/sidebar/Menu.tsx +++ b/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, diff --git a/client/src/Components/v2/sidebar/NavItem.tsx b/client/src/Components/sidebar/NavItem.tsx similarity index 100% rename from client/src/Components/v2/sidebar/NavItem.tsx rename to client/src/Components/sidebar/NavItem.tsx diff --git a/client/src/Components/v2/sidebar/StarPrompt.tsx b/client/src/Components/sidebar/StarPrompt.tsx similarity index 97% rename from client/src/Components/v2/sidebar/StarPrompt.tsx rename to client/src/Components/sidebar/StarPrompt.tsx index 5319f6bcc..9897ca91e 100644 --- a/client/src/Components/v2/sidebar/StarPrompt.tsx +++ b/client/src/Components/sidebar/StarPrompt.tsx @@ -1,5 +1,5 @@ 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 { useTheme } from "@mui/material"; diff --git a/client/src/Components/v2/sidebar/index.tsx b/client/src/Components/sidebar/index.tsx similarity index 92% rename from client/src/Components/v2/sidebar/index.tsx rename to client/src/Components/sidebar/index.tsx index 6469e56f0..dcf02e45f 100644 --- a/client/src/Components/v2/sidebar/index.tsx +++ b/client/src/Components/sidebar/index.tsx @@ -4,11 +4,11 @@ import Stack from "@mui/material/Stack"; import List from "@mui/material/List"; import Divider from "@mui/material/Divider"; 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"; diff --git a/client/src/Components/v2/common/index.ts b/client/src/Components/v2/common/index.ts deleted file mode 100644 index 2ea3bf3f7..000000000 --- a/client/src/Components/v2/common/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from "../common/charts/HistogramResponseTime"; -export * from "../common/charts/HeatmapResponseTime"; -export * from "../common/charts/HeatmapResponseTimeTooltip"; -export * from "../common/controls/HeaderCreate"; -export * from "../common/controls/HeaderTimeRange"; diff --git a/client/src/Pages/Account/EditUser/index.tsx b/client/src/Pages/Account/EditUser/index.tsx index 483181c35..a3ddebaba 100644 --- a/client/src/Pages/Account/EditUser/index.tsx +++ b/client/src/Pages/Account/EditUser/index.tsx @@ -1,12 +1,12 @@ import { Trash2 } from "lucide-react"; -import { TextField, Button, Autocomplete } from "@/Components/v2/inputs"; +import { TextField, Button, Autocomplete } from "@/Components/inputs"; import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; import IconButton from "@mui/material/IconButton"; import Divider from "@mui/material/Divider"; import FormHelperText from "@mui/material/FormHelperText"; import { useForm, Controller } from "react-hook-form"; -import { ConfigBox, BasePage } from "@/Components/v2/design-elements"; +import { ConfigBox, BasePage } from "@/Components/design-elements"; import { UserRoles } from "@/Types/User"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Account/TabPassword.tsx b/client/src/Pages/Account/TabPassword.tsx index 85e13fb7e..d09a9eeea 100644 --- a/client/src/Pages/Account/TabPassword.tsx +++ b/client/src/Pages/Account/TabPassword.tsx @@ -1,6 +1,6 @@ import { Stack } from "@mui/material"; -import { ConfigBox } from "@/Components/v2/design-elements"; -import { TextField, Button } from "@/Components/v2/inputs"; +import { ConfigBox } from "@/Components/design-elements"; +import { TextField, Button } from "@/Components/inputs"; import { useTranslation } from "react-i18next"; import { useTheme } from "@mui/material"; diff --git a/client/src/Pages/Account/TabProfile.tsx b/client/src/Pages/Account/TabProfile.tsx index dd1960e6f..01e4f14b1 100644 --- a/client/src/Pages/Account/TabProfile.tsx +++ b/client/src/Pages/Account/TabProfile.tsx @@ -1,7 +1,7 @@ import { Stack } from "@mui/material"; -import { ConfigBox } from "@/Components/v2/design-elements"; -import { TextField, Button } from "@/Components/v2/inputs"; -import { ImageUpload } from "@/Components/v2/inputs"; +import { ConfigBox } from "@/Components/design-elements"; +import { TextField, Button } from "@/Components/inputs"; +import { ImageUpload } from "@/Components/inputs"; import { useTheme } from "@mui/material"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Account/components/AddTeamMemberDialog.tsx b/client/src/Pages/Account/components/AddTeamMemberDialog.tsx index 7a108680d..14765eb79 100644 --- a/client/src/Pages/Account/components/AddTeamMemberDialog.tsx +++ b/client/src/Pages/Account/components/AddTeamMemberDialog.tsx @@ -4,7 +4,7 @@ import { useTheme } from "@mui/material"; import { useTranslation } from "react-i18next"; import { useForm, Controller } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js"; -import { Dialog, TextField, Select } from "@/Components/v2/inputs"; +import { Dialog, TextField, Select } from "@/Components/inputs"; import { useAddTeamMemberForm } from "@/Hooks/useAddTeamMemberForm"; import type { AddTeamMemberFormData } from "@/Validation/addTeamMember"; import type { UserRole, User } from "@/Types/User"; diff --git a/client/src/Pages/Account/components/HeaderTeamControls.tsx b/client/src/Pages/Account/components/HeaderTeamControls.tsx index 57f000170..51fea25b6 100644 --- a/client/src/Pages/Account/components/HeaderTeamControls.tsx +++ b/client/src/Pages/Account/components/HeaderTeamControls.tsx @@ -1,7 +1,7 @@ import Stack from "@mui/material/Stack"; import MenuItem from "@mui/material/MenuItem"; -import { Button, Select } from "@/Components/v2/inputs"; -import { Icon } from "@/Components/v2/design-elements"; +import { Button, Select } from "@/Components/inputs"; +import { Icon } from "@/Components/design-elements"; import { UserPlus, Mail } from "lucide-react"; import { UserRoles } from "@/Types/User"; diff --git a/client/src/Pages/Account/components/InviteTeamMemberDialog.tsx b/client/src/Pages/Account/components/InviteTeamMemberDialog.tsx index 02e5ba29c..e7c42a1ac 100644 --- a/client/src/Pages/Account/components/InviteTeamMemberDialog.tsx +++ b/client/src/Pages/Account/components/InviteTeamMemberDialog.tsx @@ -4,7 +4,7 @@ import { useTheme, FormHelperText, Typography } from "@mui/material"; import { useState } from "react"; import { useTranslation } from "react-i18next"; import { useForm, Controller } from "react-hook-form"; -import { Dialog, TextField, Select, Button } from "@/Components/v2/inputs"; +import { Dialog, TextField, Select, Button } from "@/Components/inputs"; import type { UserRole } from "@/Types/User"; import { useInviteForm } from "@/Hooks/useInviteForm"; import type { InviteFormData } from "@/Validation/invite"; diff --git a/client/src/Pages/Account/components/TeamTable.tsx b/client/src/Pages/Account/components/TeamTable.tsx index 2583d1c39..ab8dcc3b4 100644 --- a/client/src/Pages/Account/components/TeamTable.tsx +++ b/client/src/Pages/Account/components/TeamTable.tsx @@ -1,8 +1,8 @@ import Typography from "@mui/material/Typography"; import { useNavigate } from "react-router-dom"; import { useTranslation } from "react-i18next"; -import { Table } from "@/Components/v2/design-elements"; -import type { Header } from "@/Components/v2/design-elements/Table"; +import { Table } from "@/Components/design-elements"; +import type { Header } from "@/Components/design-elements/Table"; import { useIsSuperAdmin } from "@/Hooks/useIsAdmin"; import type { User } from "@/Types/User"; diff --git a/client/src/Pages/Account/index.tsx b/client/src/Pages/Account/index.tsx index 4a57b539a..fbe8db64b 100644 --- a/client/src/Pages/Account/index.tsx +++ b/client/src/Pages/Account/index.tsx @@ -1,4 +1,4 @@ -import { BasePage, Tabs, Tab } from "@/Components/v2/design-elements"; +import { BasePage, Tabs, Tab } from "@/Components/design-elements"; import { useState, useEffect } from "react"; import { useTranslation } from "react-i18next"; import { TabProfile } from "./TabProfile"; diff --git a/client/src/Pages/Auth/Login/index.tsx b/client/src/Pages/Auth/Login/index.tsx index 8611499d9..ec95a0ce3 100644 --- a/client/src/Pages/Auth/Login/index.tsx +++ b/client/src/Pages/Auth/Login/index.tsx @@ -1,5 +1,5 @@ -import { BaseAuthPage, TextLink } from "@/Components/v2/design-elements"; -import { Button, TextField } from "@/Components/v2/inputs"; +import { BaseAuthPage, TextLink } from "@/Components/design-elements"; +import { Button, TextField } from "@/Components/inputs"; import { useTranslation } from "react-i18next"; import { useForm, Controller } from "react-hook-form"; diff --git a/client/src/Pages/Auth/Recovery/index.tsx b/client/src/Pages/Auth/Recovery/index.tsx index 5add53077..d0eeaef06 100644 --- a/client/src/Pages/Auth/Recovery/index.tsx +++ b/client/src/Pages/Auth/Recovery/index.tsx @@ -1,5 +1,5 @@ -import { Button, TextField } from "@/Components/v2/inputs"; -import { BaseAuthPage, TextLink } from "@/Components/v2/design-elements"; +import { Button, TextField } from "@/Components/inputs"; +import { BaseAuthPage, TextLink } from "@/Components/design-elements"; import { useForm, Controller } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js"; diff --git a/client/src/Pages/Auth/Register/index.tsx b/client/src/Pages/Auth/Register/index.tsx index 3c8a4e4bc..a2a439023 100644 --- a/client/src/Pages/Auth/Register/index.tsx +++ b/client/src/Pages/Auth/Register/index.tsx @@ -1,5 +1,5 @@ -import { BaseAuthPage } from "@/Components/v2/design-elements"; -import { Button, TextField } from "@/Components/v2/inputs"; +import { BaseAuthPage } from "@/Components/design-elements"; +import { Button, TextField } from "@/Components/inputs"; import { useForm, Controller } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js"; import { useRegisterForm } from "@/Hooks/useRegisterForm"; diff --git a/client/src/Pages/Auth/SetNewPassword/index.tsx b/client/src/Pages/Auth/SetNewPassword/index.tsx index 2e99be254..5d70b4811 100644 --- a/client/src/Pages/Auth/SetNewPassword/index.tsx +++ b/client/src/Pages/Auth/SetNewPassword/index.tsx @@ -1,9 +1,5 @@ -import { - BaseAuthPage, - BulletPointCheck, - TextLink, -} from "@/Components/v2/design-elements"; -import { Button, TextField } from "@/Components/v2/inputs"; +import { BaseAuthPage, BulletPointCheck, TextLink } from "@/Components/design-elements"; +import { Button, TextField } from "@/Components/inputs"; import Stack from "@mui/material/Stack"; import { useTheme } from "@mui/material/styles"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Auth/components/HeaderAuthControls.tsx b/client/src/Pages/Auth/components/HeaderAuthControls.tsx index a62048372..c986362f8 100644 --- a/client/src/Pages/Auth/components/HeaderAuthControls.tsx +++ b/client/src/Pages/Auth/components/HeaderAuthControls.tsx @@ -1,7 +1,7 @@ import Stack, { type StackProps } from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; import Logo from "@/assets/icons/checkmate-icon.svg?react"; -import { LanguageSelector, SwitchTheme } from "@/Components/v2/inputs"; +import { LanguageSelector, SwitchTheme } from "@/Components/inputs"; import { useTheme } from "@mui/material/styles"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Checks/Components/ChecksTable.tsx b/client/src/Pages/Checks/Components/ChecksTable.tsx index bb1920ab2..4a40d993b 100644 --- a/client/src/Pages/Checks/Components/ChecksTable.tsx +++ b/client/src/Pages/Checks/Components/ChecksTable.tsx @@ -1,11 +1,6 @@ -import { - Table, - Pagination, - ValueLabel, - StatusLabel, -} from "@/Components/v2/design-elements"; +import { Table, Pagination, ValueLabel, StatusLabel } from "@/Components/design-elements"; import Box from "@mui/material/Box"; -import type { Header } from "@/Components/v2/design-elements/Table"; +import type { Header } from "@/Components/design-elements/Table"; import type { Monitor } from "@/Types/Monitor"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Checks/index.tsx b/client/src/Pages/Checks/index.tsx index fa2adfae9..108547f3e 100644 --- a/client/src/Pages/Checks/index.tsx +++ b/client/src/Pages/Checks/index.tsx @@ -4,9 +4,9 @@ import { TotalChecksBox, UpChecksBox, DownChecksBox, -} from "@/Components/v2/design-elements"; -import { HeaderTimeRange } from "@/Components/v2/common"; -import { Select } from "@/Components/v2/inputs"; +} from "@/Components/design-elements"; +import { HeaderTimeRange } from "@/Components/common"; +import { Select } from "@/Components/inputs"; import { ChecksTable } from "./Components/ChecksTable"; import { MenuItem } from "@mui/material"; diff --git a/client/src/Pages/CreateMonitor/index.tsx b/client/src/Pages/CreateMonitor/index.tsx index 1c111e23d..5012c1154 100644 --- a/client/src/Pages/CreateMonitor/index.tsx +++ b/client/src/Pages/CreateMonitor/index.tsx @@ -14,9 +14,9 @@ import Link from "@mui/material/Link"; import Divider from "@mui/material/Divider"; import IconButton from "@mui/material/IconButton"; import { Trash2 } from "lucide-react"; -import { HeaderDeleteControls } from "@/Components/v2/monitors"; +import { HeaderDeleteControls } from "@/Components/monitors"; -import { BasePage, ConfigBox } from "@/Components/v2/design-elements"; +import { BasePage, ConfigBox } from "@/Components/design-elements"; import { RadioWithDescription, Button, @@ -26,7 +26,7 @@ import { SwitchComponent as Switch, SliderWithLabel, Dialog, -} from "@/Components/v2/inputs"; +} from "@/Components/inputs"; import { useGet, usePost, usePatch, useDelete } from "@/Hooks/UseApi"; import { useMonitorForm } from "@/Hooks/useMonitorForm"; import type { Monitor, MonitorType, GamesMap } from "@/Types/Monitor"; @@ -620,7 +620,7 @@ const CreateMonitorPage = () => { name="notifications" control={control} render={({ field }) => { - // Map notifications to have 'name' property for v2 Autocomplete + // Map notifications to have 'name' property for Autocomplete const notificationOptions = (notifications ?? []).map((n) => ({ ...n, name: n.notificationName, diff --git a/client/src/Pages/Incidents/Components/CardDetails.tsx b/client/src/Pages/Incidents/Components/CardDetails.tsx index 577c777de..70f3bc6e3 100644 --- a/client/src/Pages/Incidents/Components/CardDetails.tsx +++ b/client/src/Pages/Incidents/Components/CardDetails.tsx @@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack"; import Grid from "@mui/material/Grid"; import Divider from "@mui/material/Divider"; import Typography from "@mui/material/Typography"; -import { BaseBox, ValueLabel } from "@/Components/v2/design-elements"; +import { BaseBox, ValueLabel } from "@/Components/design-elements"; import { useTranslation } from "react-i18next"; import type { Incident } from "@/Types/Incident"; diff --git a/client/src/Pages/Incidents/Components/CardSummary.tsx b/client/src/Pages/Incidents/Components/CardSummary.tsx index c0e129dde..938455808 100644 --- a/client/src/Pages/Incidents/Components/CardSummary.tsx +++ b/client/src/Pages/Incidents/Components/CardSummary.tsx @@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; import Divider from "@mui/material/Divider"; import Grid from "@mui/material/Grid"; -import { BaseBox, ValueLabel } from "@/Components/v2/design-elements"; +import { BaseBox, ValueLabel } from "@/Components/design-elements"; import { CircleCheck, TriangleAlert, Bell, Wrench, Globe } from "lucide-react"; import Box from "@mui/material/Box"; diff --git a/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx b/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx index 186942cf0..a0f4eb15a 100644 --- a/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx +++ b/client/src/Pages/Incidents/Components/ControlsIncidentFilter.tsx @@ -1,5 +1,5 @@ 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 { Typography, useTheme } from "@mui/material"; diff --git a/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx b/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx index daef58f68..628f6cb29 100644 --- a/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx +++ b/client/src/Pages/Incidents/Components/DialogIncidentDetails.tsx @@ -1,4 +1,4 @@ -import { Dialog } from "@/Components/v2/inputs"; +import { Dialog } from "@/Components/inputs"; import { CardDetails } from "@/Pages/Incidents/Components/CardDetails"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Incidents/Components/DialogResolution.tsx b/client/src/Pages/Incidents/Components/DialogResolution.tsx index a102b1de3..99dd898dd 100644 --- a/client/src/Pages/Incidents/Components/DialogResolution.tsx +++ b/client/src/Pages/Incidents/Components/DialogResolution.tsx @@ -1,6 +1,6 @@ import { useState, useEffect } from "react"; import Box from "@mui/material/Box"; -import { Dialog, TextField } from "@/Components/v2/inputs"; +import { Dialog, TextField } from "@/Components/inputs"; import { usePut } from "@/Hooks/UseApi"; import { useTranslation } from "react-i18next"; import { useTheme } from "@mui/material"; diff --git a/client/src/Pages/Incidents/Components/IncidentTable.tsx b/client/src/Pages/Incidents/Components/IncidentTable.tsx index a9b4bc104..bb1759dcd 100644 --- a/client/src/Pages/Incidents/Components/IncidentTable.tsx +++ b/client/src/Pages/Incidents/Components/IncidentTable.tsx @@ -1,12 +1,12 @@ -import { Table } from "@/Components/v2/design-elements"; -import { Pagination } from "@/Components/v2/design-elements/Table"; -import type { Header } from "@/Components/v2/design-elements/Table"; -import { ValueLabel } from "@/Components/v2/design-elements"; -import type { ValueType } from "@/Components/v2/design-elements/StatusLabel"; -import { ActionsMenu } from "@/Components/v2/actions-menu"; +import { Table } from "@/Components/design-elements"; +import { Pagination } from "@/Components/design-elements/Table"; +import type { Header } from "@/Components/design-elements/Table"; +import { ValueLabel } from "@/Components/design-elements"; +import type { ValueType } from "@/Components/design-elements/StatusLabel"; +import { ActionsMenu } from "@/Components/actions-menu"; import type { Incident } from "@/Types/Incident"; import type { Monitor } from "@/Types/Monitor"; -import type { ActionMenuItem } from "@/Components/v2/actions-menu"; +import type { ActionMenuItem } from "@/Components/actions-menu"; import { useTranslation } from "react-i18next"; import { useNavigate } from "react-router-dom"; import { formatDateWithTz } from "@/Utils/TimeUtils"; diff --git a/client/src/Pages/Incidents/index.tsx b/client/src/Pages/Incidents/index.tsx index 1f332224b..9003f6956 100644 --- a/client/src/Pages/Incidents/index.tsx +++ b/client/src/Pages/Incidents/index.tsx @@ -1,4 +1,4 @@ -import { BasePage } from "@/Components/v2/design-elements"; +import { BasePage } from "@/Components/design-elements"; import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; import Divider from "@mui/material/Divider"; @@ -11,7 +11,7 @@ import { import { IncidentsTable } from "@/Pages/Incidents/Components/IncidentTable"; import { DialogResolution } from "@/Pages/Incidents/Components/DialogResolution"; import { DialogIncidentDetails } from "@/Pages/Incidents/Components/DialogIncidentDetails"; -import { HeaderTimeRange } from "@/Components/v2/common"; +import { HeaderTimeRange } from "@/Components/common"; import { ControlsIncidentFilter } from "@/Pages/Incidents/Components/ControlsIncidentFilter"; import { useGet } from "@/Hooks/UseApi"; diff --git a/client/src/Pages/Infrastructure/Details/Components/Charts.tsx b/client/src/Pages/Infrastructure/Details/Components/Charts.tsx index e3752de95..4309feca7 100644 --- a/client/src/Pages/Infrastructure/Details/Components/Charts.tsx +++ b/client/src/Pages/Infrastructure/Details/Components/Charts.tsx @@ -1,5 +1,5 @@ import Grid from "@mui/material/Grid"; -import { HistogramInfrastructure } from "@/Components/v2/monitors"; +import { HistogramInfrastructure } from "@/Components/monitors"; import { useTranslation } from "react-i18next"; import type { HardwareCheckStats } from "@/Types/Monitor"; diff --git a/client/src/Pages/Infrastructure/Details/Components/ChartsNetwork.tsx b/client/src/Pages/Infrastructure/Details/Components/ChartsNetwork.tsx index 535bdc0fd..54e3cc1ed 100644 --- a/client/src/Pages/Infrastructure/Details/Components/ChartsNetwork.tsx +++ b/client/src/Pages/Infrastructure/Details/Components/ChartsNetwork.tsx @@ -1,5 +1,5 @@ import Grid from "@mui/material/Grid"; -import { HistogramInfrastructure } from "@/Components/v2/monitors"; +import { HistogramInfrastructure } from "@/Components/monitors"; import { useTranslation } from "react-i18next"; import type { HardwareCheckStats } from "@/Types/Monitor"; diff --git a/client/src/Pages/Infrastructure/Details/Components/Gauges.tsx b/client/src/Pages/Infrastructure/Details/Components/Gauges.tsx index dded8ecf5..04c87ca95 100644 --- a/client/src/Pages/Infrastructure/Details/Components/Gauges.tsx +++ b/client/src/Pages/Infrastructure/Details/Components/Gauges.tsx @@ -1,5 +1,5 @@ import Stack from "@mui/material/Stack"; -import { DetailGauge } from "@/Components/v2/design-elements"; +import { DetailGauge } from "@/Components/design-elements"; import prettyBytes from "pretty-bytes"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Infrastructure/Details/Components/StatusBoxes.tsx b/client/src/Pages/Infrastructure/Details/Components/StatusBoxes.tsx index dffa6a175..ebfdad569 100644 --- a/client/src/Pages/Infrastructure/Details/Components/StatusBoxes.tsx +++ b/client/src/Pages/Infrastructure/Details/Components/StatusBoxes.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 prettyBytes from "pretty-bytes"; import { useTheme } from "@mui/material"; diff --git a/client/src/Pages/Infrastructure/Details/index.tsx b/client/src/Pages/Infrastructure/Details/index.tsx index f27979a4f..202887ad5 100644 --- a/client/src/Pages/Infrastructure/Details/index.tsx +++ b/client/src/Pages/Infrastructure/Details/index.tsx @@ -1,6 +1,6 @@ -import { BasePage, Tab, Tabs } from "@/Components/v2/design-elements"; -import { HeaderTimeRange } from "@/Components/v2/common"; -import { MonitorStatBoxes, HeaderMonitorControls } from "@/Components/v2/monitors"; +import { BasePage, Tab, Tabs } from "@/Components/design-elements"; +import { HeaderTimeRange } from "@/Components/common"; +import { MonitorStatBoxes, HeaderMonitorControls } from "@/Components/monitors"; import { TabNetwork } from "@/Pages/Infrastructure/Details/Components/TabNetwork"; import { TabOverview } from "@/Pages/Infrastructure/Details/Components/TabOverview"; diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable.tsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable.tsx index b2bcadc1a..994ddcea1 100644 --- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable.tsx +++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable.tsx @@ -1,8 +1,8 @@ import Box from "@mui/material/Box"; import Typography from "@mui/material/Typography"; -import { Table, Pagination, StatusLabel, Gauge } from "@/Components/v2/design-elements"; -import type { Header } from "@/Components/v2/design-elements/Table"; -import { ActionsMenu, type ActionMenuItem } from "@/Components/v2/actions-menu"; +import { Table, Pagination, StatusLabel, Gauge } from "@/Components/design-elements"; +import type { Header } from "@/Components/design-elements/Table"; +import { ActionsMenu, type ActionMenuItem } from "@/Components/actions-menu"; import { ArrowUp, ArrowDown } from "lucide-react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Infrastructure/Monitors/index.tsx b/client/src/Pages/Infrastructure/Monitors/index.tsx index 8d1ef1a3a..bdf477613 100644 --- a/client/src/Pages/Infrastructure/Monitors/index.tsx +++ b/client/src/Pages/Infrastructure/Monitors/index.tsx @@ -1,9 +1,9 @@ import Stack from "@mui/material/Stack"; import useMediaQuery from "@mui/material/useMediaQuery"; -import { MonitorBasePageWithStates } from "@/Components/v2/design-elements"; -import { HeaderCreate } from "@/Components/v2/common"; -import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/v2/monitors"; -import { TextField, Dialog } from "@/Components/v2/inputs"; +import { MonitorBasePageWithStates } from "@/Components/design-elements"; +import { HeaderCreate } from "@/Components/common"; +import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/monitors"; +import { TextField, Dialog } from "@/Components/inputs"; import { useGet, useDelete } from "@/Hooks/UseApi"; import { useIsAdmin } from "@/Hooks/useIsAdmin"; diff --git a/client/src/Pages/Logs/TabLogs.tsx b/client/src/Pages/Logs/TabLogs.tsx index a44de73a4..a05726b42 100644 --- a/client/src/Pages/Logs/TabLogs.tsx +++ b/client/src/Pages/Logs/TabLogs.tsx @@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack"; import MenuItem from "@mui/material/MenuItem"; import Typography from "@mui/material/Typography"; import { useSelector } from "react-redux"; -import { Select } from "@/Components/v2/inputs"; +import { Select } from "@/Components/inputs"; import { TableLogs } from "@/Pages/Logs/components/TableLogs"; import { useTheme } from "@mui/material"; diff --git a/client/src/Pages/Logs/TabQueue.tsx b/client/src/Pages/Logs/TabQueue.tsx index be0013368..06ce8ed0c 100644 --- a/client/src/Pages/Logs/TabQueue.tsx +++ b/client/src/Pages/Logs/TabQueue.tsx @@ -7,7 +7,7 @@ import { useTranslation } from "react-i18next"; import { useGet, usePost } from "@/Hooks/UseApi"; import type { QueueData } from "@/Types/Queue"; import { Metrics } from "@/Pages/Logs/components/Metrics"; -import { Button } from "@/Components/v2/inputs"; +import { Button } from "@/Components/inputs"; export const TabQueue = () => { const theme = useTheme(); diff --git a/client/src/Pages/Logs/components/Metrics.tsx b/client/src/Pages/Logs/components/Metrics.tsx index 8f96ec5ac..9705b9ecd 100644 --- a/client/src/Pages/Logs/components/Metrics.tsx +++ b/client/src/Pages/Logs/components/Metrics.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 { useTheme } from "@mui/material"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Logs/components/StatGauges.tsx b/client/src/Pages/Logs/components/StatGauges.tsx index 34a148948..65c443831 100644 --- a/client/src/Pages/Logs/components/StatGauges.tsx +++ b/client/src/Pages/Logs/components/StatGauges.tsx @@ -1,5 +1,5 @@ import Stack from "@mui/material/Stack"; -import { DetailGauge } from "@/Components/v2/design-elements"; +import { DetailGauge } from "@/Components/design-elements"; import { getPercentage, formatPercentageFromWhole } from "@/Utils/FormatUtils"; import prettyBytes from "pretty-bytes"; diff --git a/client/src/Pages/Logs/components/Stats.tsx b/client/src/Pages/Logs/components/Stats.tsx index 429330873..7bf343de3 100644 --- a/client/src/Pages/Logs/components/Stats.tsx +++ b/client/src/Pages/Logs/components/Stats.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 prettyBytes from "pretty-bytes"; import prettyMilliseconds from "pretty-ms"; diff --git a/client/src/Pages/Logs/components/TableJobs.tsx b/client/src/Pages/Logs/components/TableJobs.tsx index e9608df9a..660a5df4f 100644 --- a/client/src/Pages/Logs/components/TableJobs.tsx +++ b/client/src/Pages/Logs/components/TableJobs.tsx @@ -1,11 +1,11 @@ -import { Table } from "@/Components/v2/design-elements"; +import { Table } from "@/Components/design-elements"; import { Typography, useTheme } from "@mui/material"; import prettyMilliseconds from "pretty-ms"; import { formatTimestamp } from "@/Utils/TimeUtils"; import { useTranslation } from "react-i18next"; import type { QueueJobFailure, QueueJobSummary, QueueMetrics } from "@/Types/Queue"; -import type { Header } from "@/Components/v2/design-elements"; +import type { Header } from "@/Components/design-elements"; type QueueJobWithId = QueueJobSummary & { id: string | number }; diff --git a/client/src/Pages/Logs/components/TableLogs.tsx b/client/src/Pages/Logs/components/TableLogs.tsx index dace0db43..144d6056c 100644 --- a/client/src/Pages/Logs/components/TableLogs.tsx +++ b/client/src/Pages/Logs/components/TableLogs.tsx @@ -1,9 +1,9 @@ import Box from "@mui/material/Box"; import Typography from "@mui/material/Typography"; -import { Table } from "@/Components/v2/design-elements"; -import { Pagination } from "@/Components/v2/design-elements/Table"; +import { Table } from "@/Components/design-elements"; +import { Pagination } from "@/Components/design-elements/Table"; import { useTheme } from "@mui/material"; -import type { Header } from "@/Components/v2/design-elements/Table"; +import type { Header } from "@/Components/design-elements/Table"; import type { Log, LogLevel } from "@/Types/Log"; import { useTranslation } from "react-i18next"; import { useSelector, useDispatch } from "react-redux"; diff --git a/client/src/Pages/Logs/index.tsx b/client/src/Pages/Logs/index.tsx index ab30b84eb..101ac11af 100644 --- a/client/src/Pages/Logs/index.tsx +++ b/client/src/Pages/Logs/index.tsx @@ -1,4 +1,4 @@ -import { BasePage, Tabs, Tab } from "@/Components/v2/design-elements"; +import { BasePage, Tabs, Tab } from "@/Components/design-elements"; import { TabLogs } from "@/Pages/Logs/TabLogs"; import { TabQueue } from "@/Pages/Logs/TabQueue"; import { TabDiagnostics } from "@/Pages/Logs/TabDiagnostics"; diff --git a/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx b/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx index 876969d3d..6dadb5a9c 100644 --- a/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx +++ b/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx @@ -1,13 +1,13 @@ import Typography from "@mui/material/Typography"; -import { Table, ValueLabel } from "@/Components/v2/design-elements"; -import { Pagination } from "@/Components/v2/design-elements/Table"; -import { ActionsMenu } from "@/Components/v2/actions-menu"; -import { DialogInput } from "@/Components/v2/inputs/Dialog"; +import { Table, ValueLabel } from "@/Components/design-elements"; +import { Pagination } from "@/Components/design-elements/Table"; +import { ActionsMenu } from "@/Components/actions-menu"; +import { DialogInput } from "@/Components/inputs/Dialog"; import prettyMilliseconds from "pretty-ms"; import { useTheme } from "@mui/material"; -import type { Header } from "@/Components/v2/design-elements/Table"; -import type { ActionMenuItem } from "@/Components/v2/actions-menu"; +import type { Header } from "@/Components/design-elements/Table"; +import type { ActionMenuItem } from "@/Components/actions-menu"; import type { MaintenanceWindow } from "@/Types/MaintenanceWindow"; import { useTranslation } from "react-i18next"; import { useNavigate } from "react-router-dom"; diff --git a/client/src/Pages/Maintenance/create/index.tsx b/client/src/Pages/Maintenance/create/index.tsx index 370694a94..b6666d4e2 100644 --- a/client/src/Pages/Maintenance/create/index.tsx +++ b/client/src/Pages/Maintenance/create/index.tsx @@ -2,7 +2,7 @@ import Stack from "@mui/material/Stack"; import MenuItem from "@mui/material/MenuItem"; import Typography from "@mui/material/Typography"; import IconButton from "@mui/material/IconButton"; -import { BasePage, ConfigBox } from "@/Components/v2/design-elements"; +import { BasePage, ConfigBox } from "@/Components/design-elements"; import { TextField, Select, @@ -10,7 +10,7 @@ import { TimePicker, Button, Autocomplete, -} from "@/Components/v2/inputs"; +} from "@/Components/inputs"; import { useTheme } from "@mui/material"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/Maintenance/index.tsx b/client/src/Pages/Maintenance/index.tsx index ad8b8dac7..6a9c6f12b 100644 --- a/client/src/Pages/Maintenance/index.tsx +++ b/client/src/Pages/Maintenance/index.tsx @@ -1,5 +1,5 @@ -import { BasePageWithStates } from "@/Components/v2/design-elements"; -import { HeaderCreate } from "@/Components/v2/common"; +import { BasePageWithStates } from "@/Components/design-elements"; +import { HeaderCreate } from "@/Components/common"; import { useTranslation } from "react-i18next"; import { useGet } from "@/Hooks/UseApi"; import { MaintenanceWindowTable } from "./MaintenanceWindowTable"; diff --git a/client/src/Pages/NotFound/index.tsx b/client/src/Pages/NotFound/index.tsx index 868a1573a..ce974a2e1 100644 --- a/client/src/Pages/NotFound/index.tsx +++ b/client/src/Pages/NotFound/index.tsx @@ -1,5 +1,5 @@ import NotFoundSvg from "@/assets/Images/sushi_404.svg"; -import { Button } from "@/Components/v2/inputs"; +import { Button } from "@/Components/inputs"; import Box from "@mui/material/Box"; import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; diff --git a/client/src/Pages/Notifications/components/NotificationsTable.tsx b/client/src/Pages/Notifications/components/NotificationsTable.tsx index 2885a34bb..d103458c3 100644 --- a/client/src/Pages/Notifications/components/NotificationsTable.tsx +++ b/client/src/Pages/Notifications/components/NotificationsTable.tsx @@ -1,7 +1,7 @@ -import { ActionsMenu, type ActionMenuItem } from "@/Components/v2/actions-menu"; +import { ActionsMenu, type ActionMenuItem } from "@/Components/actions-menu"; import Typography from "@mui/material/Typography"; -import type { Header } from "@/Components/v2/design-elements/Table"; -import { Table } from "@/Components/v2/design-elements"; +import type { Header } from "@/Components/design-elements/Table"; +import { Table } from "@/Components/design-elements"; import type { Notification } from "@/Types/Notification"; import { useNavigate } from "react-router"; diff --git a/client/src/Pages/Notifications/create/index.tsx b/client/src/Pages/Notifications/create/index.tsx index 30cfd4c80..7aa7bc831 100644 --- a/client/src/Pages/Notifications/create/index.tsx +++ b/client/src/Pages/Notifications/create/index.tsx @@ -1,5 +1,5 @@ -import { BasePage, ConfigBox } from "@/Components/v2/design-elements"; -import { TextField, Select, Button } from "@/Components/v2/inputs"; +import { BasePage, ConfigBox } from "@/Components/design-elements"; +import { TextField, Select, Button } from "@/Components/inputs"; import MenuItem from "@mui/material/MenuItem"; import Typography from "@mui/material/Typography"; import Stack from "@mui/material/Stack"; diff --git a/client/src/Pages/Notifications/index.tsx b/client/src/Pages/Notifications/index.tsx index 37c8cbbed..1e4091461 100644 --- a/client/src/Pages/Notifications/index.tsx +++ b/client/src/Pages/Notifications/index.tsx @@ -1,7 +1,7 @@ -import { BasePageWithStates } from "@/Components/v2/design-elements"; +import { BasePageWithStates } from "@/Components/design-elements"; import { NotificationsTable } from "@/Pages/Notifications/components/NotificationsTable"; -import { Dialog } from "@/Components/v2/inputs"; -import { HeaderCreate } from "@/Components/v2/common"; +import { Dialog } from "@/Components/inputs"; +import { HeaderCreate } from "@/Components/common"; import { useState } from "react"; import { useGet, useDelete } from "@/Hooks/UseApi"; diff --git a/client/src/Pages/PageSpeed/Details/index.tsx b/client/src/Pages/PageSpeed/Details/index.tsx index 3be3a245b..f67ce6730 100644 --- a/client/src/Pages/PageSpeed/Details/index.tsx +++ b/client/src/Pages/PageSpeed/Details/index.tsx @@ -1,4 +1,4 @@ -import { BasePage } from "@/Components/v2/design-elements"; +import { BasePage } from "@/Components/design-elements"; import type { PageSpeedDetailsResponse } from "@/Types/Monitor"; import Stack from "@mui/material/Stack"; import { @@ -7,7 +7,7 @@ import { PiePageSpeedLegend, MonitorStatBoxes, HeaderMonitorControls, -} from "@/Components/v2/monitors"; +} from "@/Components/monitors"; import { useIsAdmin } from "@/Hooks/useIsAdmin"; import { useGet } from "@/Hooks/UseApi"; diff --git a/client/src/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable.tsx b/client/src/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable.tsx index 1dc9ce9df..a812883e0 100644 --- a/client/src/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable.tsx +++ b/client/src/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable.tsx @@ -1,11 +1,11 @@ import Stack from "@mui/material/Stack"; import Box from "@mui/material/Box"; import Typography from "@mui/material/Typography"; -import { Table, Pagination, StatusLabel } from "@/Components/v2/design-elements"; -import { HistogramPageSpeed } from "@/Components/v2/monitors"; +import { Table, Pagination, StatusLabel } from "@/Components/design-elements"; +import { HistogramPageSpeed } from "@/Components/monitors"; import { ArrowDown, ArrowUp } from "lucide-react"; -import type { Header } from "@/Components/v2/design-elements/Table"; -import { ActionsMenu } from "@/Components/v2/actions-menu"; +import type { Header } from "@/Components/design-elements/Table"; +import { ActionsMenu } from "@/Components/actions-menu"; import { useTranslation } from "react-i18next"; import useMediaQuery from "@mui/material/useMediaQuery"; @@ -14,7 +14,7 @@ import { useNavigate } from "react-router-dom"; import { usePatch } from "@/Hooks/UseApi"; import type { Monitor, MonitorWithChecks } from "@/Types/Monitor"; -import type { ActionMenuItem } from "@/Components/v2/actions-menu"; +import type { ActionMenuItem } from "@/Components/actions-menu"; export const PageSpeedMonitorsTable = ({ monitors, diff --git a/client/src/Pages/PageSpeed/Monitors/index.tsx b/client/src/Pages/PageSpeed/Monitors/index.tsx index f958b5619..cfdbe6c4e 100644 --- a/client/src/Pages/PageSpeed/Monitors/index.tsx +++ b/client/src/Pages/PageSpeed/Monitors/index.tsx @@ -1,9 +1,9 @@ import { MonitorBasePageWithStates, PageSpeedKeyPriorityFallback, -} from "@/Components/v2/design-elements"; -import { Dialog } from "@/Components/v2/inputs"; -import { HeaderCreate } from "@/Components/v2/common"; +} from "@/Components/design-elements"; +import { Dialog } from "@/Components/inputs"; +import { HeaderCreate } from "@/Components/common"; import { PageSpeedMonitorsTable } from "@/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable"; import type { Monitor } from "@/Types/Monitor"; @@ -13,7 +13,7 @@ import { useIsAdmin } from "@/Hooks/useIsAdmin"; import { useGet, useDelete } from "@/Hooks/UseApi"; import type { MonitorsWithChecksResponse } from "@/Types/Monitor"; import type { AppSettingsResponse } from "@/Types/Settings"; -import { HeaderMonitorsSummary } from "@/Components/v2/monitors"; +import { HeaderMonitorsSummary } from "@/Components/monitors"; const PageSpeedMonitorsPage = () => { const { t } = useTranslation(); diff --git a/client/src/Pages/Settings/DummyChart.tsx b/client/src/Pages/Settings/DummyChart.tsx index df7cd5603..b354ee9bb 100644 --- a/client/src/Pages/Settings/DummyChart.tsx +++ b/client/src/Pages/Settings/DummyChart.tsx @@ -1,7 +1,7 @@ import Box from "@mui/material/Box"; import Typography from "@mui/material/Typography"; import { useTheme } from "@mui/material/styles"; -import { HeatmapResponseTime, HistogramResponseTime } from "@/Components/v2/common"; +import { HeatmapResponseTime, HistogramResponseTime } from "@/Components/common"; import type { CheckSnapshot } from "@/Types/Check"; interface DummyChartProps { diff --git a/client/src/Pages/Settings/index.tsx b/client/src/Pages/Settings/index.tsx index 5e01e02f1..b9d3e1f3c 100644 --- a/client/src/Pages/Settings/index.tsx +++ b/client/src/Pages/Settings/index.tsx @@ -1,5 +1,5 @@ -import { BasePage, ConfigBox, TextLink } from "@/Components/v2/design-elements"; -import { Autocomplete, Select, Dialog, SwitchComponent } from "@/Components/v2/inputs"; +import { BasePage, ConfigBox, TextLink } from "@/Components/design-elements"; +import { Autocomplete, Select, Dialog, SwitchComponent } from "@/Components/inputs"; import { Stack, useTheme, MenuItem, Link, type SelectChangeEvent } from "@mui/material"; import { useEffect } from "react"; import { useForm } from "react-hook-form"; @@ -13,7 +13,7 @@ import { useIsAdmin } from "@/Hooks/useIsAdmin.js"; import type { SettingsFormData } from "@/Validation/settings"; import { useState } from "react"; import { Controller } from "react-hook-form"; -import { TextField, Button, FieldLabel } from "@/Components/v2/inputs"; +import { TextField, Button, FieldLabel } from "@/Components/inputs"; import { Box, Typography } from "@mui/material"; import { useDelete } from "@/Hooks/UseApi"; diff --git a/client/src/Pages/StatusPage/Create/Components/HeaderConfigStatusControls.tsx b/client/src/Pages/StatusPage/Create/Components/HeaderConfigStatusControls.tsx index 99ae46cdd..407306f1b 100644 --- a/client/src/Pages/StatusPage/Create/Components/HeaderConfigStatusControls.tsx +++ b/client/src/Pages/StatusPage/Create/Components/HeaderConfigStatusControls.tsx @@ -1,6 +1,6 @@ import Stack from "@mui/material/Stack"; -import { Icon } from "@/Components/v2/design-elements"; -import { Button } from "@/Components/v2/inputs"; +import { Icon } from "@/Components/design-elements"; +import { Button } from "@/Components/inputs"; import { Trash } from "lucide-react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/StatusPage/Create/index.tsx b/client/src/Pages/StatusPage/Create/index.tsx index 8b4394f14..b1b43d8bb 100644 --- a/client/src/Pages/StatusPage/Create/index.tsx +++ b/client/src/Pages/StatusPage/Create/index.tsx @@ -1,4 +1,4 @@ -import { BasePage, ConfigBox } from "@/Components/v2/design-elements"; +import { BasePage, ConfigBox } from "@/Components/design-elements"; import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; import IconButton from "@mui/material/IconButton"; @@ -15,7 +15,7 @@ import { Checkbox, Dialog, ColorInput, -} from "@/Components/v2/inputs"; +} from "@/Components/inputs"; import { useTheme } from "@mui/material/styles"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/StatusPage/Status/Components/HeaderStatusPageControls.tsx b/client/src/Pages/StatusPage/Status/Components/HeaderStatusPageControls.tsx index 0e8f444c9..2cc2395bb 100644 --- a/client/src/Pages/StatusPage/Status/Components/HeaderStatusPageControls.tsx +++ b/client/src/Pages/StatusPage/Status/Components/HeaderStatusPageControls.tsx @@ -1,8 +1,8 @@ import Stack from "@mui/material/Stack"; import Box from "@mui/material/Box"; import Typography from "@mui/material/Typography"; -import { Icon } from "@/Components/v2/design-elements"; -import { Button } from "@/Components/v2/inputs"; +import { Icon } from "@/Components/design-elements"; +import { Button } from "@/Components/inputs"; import { Settings, ExternalLink } from "lucide-react"; import { useTheme } from "@mui/material"; diff --git a/client/src/Pages/StatusPage/Status/Components/MonitorsList.tsx b/client/src/Pages/StatusPage/Status/Components/MonitorsList.tsx index 35aad7a26..b94b20a80 100644 --- a/client/src/Pages/StatusPage/Status/Components/MonitorsList.tsx +++ b/client/src/Pages/StatusPage/Status/Components/MonitorsList.tsx @@ -2,9 +2,9 @@ import Stack from "@mui/material/Stack"; import { useTranslation } from "react-i18next"; import Box from "@mui/material/Box"; import Typography from "@mui/material/Typography"; -import { HistogramResponseTime, HeatmapResponseTime } from "@/Components/v2/common"; -import { StatusLabel, BaseBox } from "@/Components/v2/design-elements"; -import { SwitchComponent } from "@/Components/v2/inputs"; +import { HistogramResponseTime, HeatmapResponseTime } from "@/Components/common"; +import { StatusLabel, BaseBox } from "@/Components/design-elements"; +import { SwitchComponent } from "@/Components/inputs"; import { useTheme } from "@mui/material/styles"; import { useSelector } from "react-redux"; diff --git a/client/src/Pages/StatusPage/Status/index.tsx b/client/src/Pages/StatusPage/Status/index.tsx index b1826b867..0ca629581 100644 --- a/client/src/Pages/StatusPage/Status/index.tsx +++ b/client/src/Pages/StatusPage/Status/index.tsx @@ -1,4 +1,4 @@ -import { BasePage, BaseFallback } from "@/Components/v2/design-elements"; +import { BasePage, BaseFallback } from "@/Components/design-elements"; import { StatusBar } from "@/Pages/StatusPage/Status/Components/StatusBar"; import { MonitorsList } from "@/Pages/StatusPage/Status/Components/MonitorsList"; import Typography from "@mui/material/Typography"; diff --git a/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable.tsx b/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable.tsx index 192f9c101..978466bb4 100644 --- a/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable.tsx +++ b/client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable.tsx @@ -1,8 +1,8 @@ import Box from "@mui/material/Box"; import Stack from "@mui/material/Stack"; import Typography from "@mui/material/Typography"; -import { Table, type Header, ValueLabel } from "@/Components/v2/design-elements"; -import { ActionsMenu, type ActionMenuItem } from "@/Components/v2/actions-menu"; +import { Table, type Header, ValueLabel } from "@/Components/design-elements"; +import { ActionsMenu, type ActionMenuItem } from "@/Components/actions-menu"; import { ExternalLink } from "lucide-react"; import { useTranslation } from "react-i18next"; diff --git a/client/src/Pages/StatusPage/StatusPages/index.tsx b/client/src/Pages/StatusPage/StatusPages/index.tsx index 85b84e638..9468b7e12 100644 --- a/client/src/Pages/StatusPage/StatusPages/index.tsx +++ b/client/src/Pages/StatusPage/StatusPages/index.tsx @@ -1,11 +1,11 @@ import { useState } from "react"; -import { BasePageWithStates } from "@/Components/v2/design-elements"; -import { Dialog } from "@/Components/v2/inputs"; +import { BasePageWithStates } from "@/Components/design-elements"; +import { Dialog } from "@/Components/inputs"; import { StatusPagesTable } from "./Components/StatusPagesTable"; import { useGet, useDelete } from "@/Hooks/UseApi"; import type { StatusPage } from "@/Types/StatusPage"; import { useTranslation } from "react-i18next"; -import { HeaderCreate } from "@/Components/v2/common"; +import { HeaderCreate } from "@/Components/common"; import { useIsAdmin } from "@/Hooks/useIsAdmin"; const StatusPages = () => { diff --git a/client/src/Pages/Uptime/Details/Components/ChecksTable.tsx b/client/src/Pages/Uptime/Details/Components/ChecksTable.tsx index ceb8e1a28..26905e7cc 100644 --- a/client/src/Pages/Uptime/Details/Components/ChecksTable.tsx +++ b/client/src/Pages/Uptime/Details/Components/ChecksTable.tsx @@ -1,6 +1,6 @@ -import { Table, Pagination, StatusLabel } from "@/Components/v2/design-elements"; +import { Table, Pagination, StatusLabel } from "@/Components/design-elements"; import Box from "@mui/material/Box"; -import type { Header } from "@/Components/v2/design-elements/"; +import type { Header } from "@/Components/design-elements"; import type { Check } from "@/Types/Check"; import { useNavigate } from "react-router"; diff --git a/client/src/Pages/Uptime/Details/index.tsx b/client/src/Pages/Uptime/Details/index.tsx index b7910a17c..23f9a2196 100644 --- a/client/src/Pages/Uptime/Details/index.tsx +++ b/client/src/Pages/Uptime/Details/index.tsx @@ -1,15 +1,15 @@ -import { BasePage } from "@/Components/v2/design-elements"; -import { HeaderTimeRange } from "@/Components/v2/common"; +import { BasePage } from "@/Components/design-elements"; +import { HeaderTimeRange } from "@/Components/common"; import Stack from "@mui/material/Stack"; import { HistogramStatus, RadialAvgResponse, HistogramDetails, HeaderMonitorControls, -} from "@/Components/v2/monitors"; +} from "@/Components/monitors"; import { TrendingUp, AlertTriangle } from "lucide-react"; import { ChecksTable } from "@/Pages/Uptime/Details/Components/ChecksTable"; -import { MonitorStatBoxes } from "@/Components/v2/monitors"; +import { MonitorStatBoxes } from "@/Components/monitors"; import { useTheme } from "@mui/material/styles"; import { useIsAdmin } from "@/Hooks/useIsAdmin"; diff --git a/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx b/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx index 75738e6ad..87db4246d 100644 --- a/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx +++ b/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx @@ -6,9 +6,9 @@ import { type Header, Pagination, StatusLabel, -} from "@/Components/v2/design-elements"; -import { HeatmapResponseTime, HistogramResponseTime } from "@/Components/v2/common"; -import { ActionsMenu } from "@/Components/v2/actions-menu"; +} from "@/Components/design-elements"; +import { HeatmapResponseTime, HistogramResponseTime } from "@/Components/common"; +import { ActionsMenu } from "@/Components/actions-menu"; import { ArrowDown, ArrowUp } from "lucide-react"; import { useTranslation } from "react-i18next"; @@ -18,7 +18,7 @@ import { usePost } from "@/Hooks/UseApi"; import { useSelector } from "react-redux"; import type { Monitor } from "@/Types/Monitor"; -import type { ActionMenuItem } from "@/Components/v2/actions-menu"; +import type { ActionMenuItem } from "@/Components/actions-menu"; import type { RootState } from "@/Types/state"; export const MonitorTable = ({ diff --git a/client/src/Pages/Uptime/Monitors/index.tsx b/client/src/Pages/Uptime/Monitors/index.tsx index 9e36ccc86..5c419738b 100644 --- a/client/src/Pages/Uptime/Monitors/index.tsx +++ b/client/src/Pages/Uptime/Monitors/index.tsx @@ -1,9 +1,9 @@ -import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/v2/monitors"; -import { MonitorBasePageWithStates } from "@/Components/v2/design-elements"; -import { TextField, Dialog } from "@/Components/v2/inputs"; +import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/monitors"; +import { MonitorBasePageWithStates } from "@/Components/design-elements"; +import { TextField, Dialog } from "@/Components/inputs"; import Stack from "@mui/material/Stack"; import { MonitorTable } from "@/Pages/Uptime/Monitors/Components/UptimeMonitorsTable"; -import { HeaderCreate } from "@/Components/v2/common"; +import { HeaderCreate } from "@/Components/common"; import { useTranslation } from "react-i18next"; import useMediaQuery from "@mui/material/useMediaQuery"; diff --git a/client/src/Routes/index.tsx b/client/src/Routes/index.tsx index a1b5d907a..20869c47c 100644 --- a/client/src/Routes/index.tsx +++ b/client/src/Routes/index.tsx @@ -1,5 +1,5 @@ import { Navigate, Route, Routes as LibRoutes } from "react-router"; -import RootLayout from "@/Components/v2/layout/RootLayout"; +import RootLayout from "@/Components/layout/RootLayout"; import NotFound from "@/Pages/NotFound"; // Auth @@ -46,10 +46,7 @@ import CreateNewMaintenanceWindow from "@/Pages/Maintenance/create"; import Logs from "@/Pages/Logs"; // Routing -import { - ProtectedRoute, - RoleProtectedRoute, -} from "@/Components/v2/routing/RouteProtected"; +import { ProtectedRoute, RoleProtectedRoute } from "@/Components/routing/RouteProtected"; import CreateMonitor from "@/Pages/CreateMonitor"; diff --git a/client/src/Utils/MonitorUtils.ts b/client/src/Utils/MonitorUtils.ts index 3be1b30a1..a19316c62 100644 --- a/client/src/Utils/MonitorUtils.ts +++ b/client/src/Utils/MonitorUtils.ts @@ -1,6 +1,6 @@ import type { MonitorStatus, MonitorType } from "@/Types/Monitor"; import type { PaletteKey } from "@/Utils/Theme/Theme"; -import type { ValueType } from "@/Components/v2/design-elements/StatusLabel"; +import type { ValueType } from "@/Components/design-elements/StatusLabel"; export const getMonitorPath = (type: MonitorType): string => { const pathMap: Record = { diff --git a/client/src/main.tsx b/client/src/main.tsx index f075886d3..1f5d4d2ef 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -5,7 +5,7 @@ import { BrowserRouter as Router } from "react-router-dom"; import { Provider } from "react-redux"; import { persistor, store } from "@/store.js"; import { PersistGate } from "redux-persist/integration/react"; -import I18nLoader from "./Components/v2/i18nLoader"; +import I18nLoader from "./Components/i18nLoader/index.js"; import { initApiClient } from "./Utils/ApiClient.js"; initApiClient(store);