diff --git a/client/src/Pages/Settings/SettingsAbout.jsx b/client/src/Pages/Settings/SettingsAbout.jsx
new file mode 100644
index 000000000..b2b5df308
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsAbout.jsx
@@ -0,0 +1,32 @@
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
+import ConfigBox from "../../Components/ConfigBox";
+// Utils
+import { useTheme } from "@emotion/react";
+import { useTranslation } from "react-i18next";
+import Link from "../../Components/Link";
+
+const SettingsAbout = () => {
+ const theme = useTheme();
+ const { t } = useTranslation();
+ return (
+
+
+ {t("settingsAbout")}
+
+
+ Checkmate {2.0}
+
+ {t("settingsDevelopedBy")}
+
+
+
+
+ );
+};
+
+export default SettingsAbout;
diff --git a/client/src/Pages/Settings/SettingsDemoMonitors.jsx b/client/src/Pages/Settings/SettingsDemoMonitors.jsx
new file mode 100644
index 000000000..6722e97ac
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsDemoMonitors.jsx
@@ -0,0 +1,98 @@
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
+import ConfigBox from "../../Components/ConfigBox";
+// Utils
+import { useTheme } from "@emotion/react";
+import { PropTypes } from "prop-types";
+import { useTranslation } from "react-i18next";
+import Dialog from "../../Components/Dialog";
+import { useState } from "react";
+const SettingsDemoMonitors = ({
+ isLoading,
+ authIsLoading,
+ checksIsLoading,
+ handleChange,
+}) => {
+ const { t } = useTranslation();
+ const theme = useTheme();
+ // Local state
+ const [isOpen, setIsOpen] = useState(false);
+ return (
+ <>
+
+
+ {t("settingsDemoMonitors")}
+
+ {t("settingsDemoMonitorsDescription")}
+
+
+
+ {t("settingsAddDemoMonitors")}
+
+
+
+
+
+ {t("settingsSystemReset")}
+
+ {t("settingsSystemResetDescription")}
+
+
+
+ {t("settingsRemoveAllMonitors")}
+
+
+
+ >
+ );
+};
+
+SettingsDemoMonitors.propTypes = {
+ isLoading: PropTypes.bool,
+ authIsLoading: PropTypes.bool,
+ checksIsLoading: PropTypes.bool,
+ handleChange: PropTypes.func,
+};
+
+export default SettingsDemoMonitors;
diff --git a/client/src/Pages/Settings/SettingsPagespeed.jsx b/client/src/Pages/Settings/SettingsPagespeed.jsx
new file mode 100644
index 000000000..87f558f32
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsPagespeed.jsx
@@ -0,0 +1,81 @@
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
+import ConfigBox from "../../Components/ConfigBox";
+import TextInput from "../../Components/Inputs/TextInput";
+import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
+// Utils
+import { useTheme } from "@emotion/react";
+import { PropTypes } from "prop-types";
+import { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+
+const SettingsPagespeed = ({ HEADING_SX, settings, setSettings }) => {
+ const { t } = useTranslation();
+ const theme = useTheme();
+
+ // Local state
+ const [apiKey, setApiKey] = useState("");
+ const [isApiKeySet, setIsApiKeySet] = useState(false);
+ const [hasBeenReset, setHasBeenReset] = useState(false);
+
+ // Handler
+ const handleChange = (e) => {
+ setApiKey(e.target.value);
+ setSettings({ ...settings, pagespeedApiKey: e.target.value });
+ };
+
+ useEffect(() => {
+ console.log(settings);
+ setIsApiKeySet(Boolean(settings.pagespeedApiKey) && apiKey === "");
+ }, [settings, apiKey]);
+
+ return (
+
+
+ {t("pageSpeedApiKeyFieldTitle")}
+ {t("pageSpeedApiKeyFieldDescription")}
+
+
+ {(isApiKeySet === false || hasBeenReset === true) && (
+ }
+ />
+ )}
+
+ {isApiKeySet === true && hasBeenReset === false && (
+
+ {t("pageSpeedApiKeyFieldResetLabel")}
+
+
+ )}
+
+
+ );
+};
+
+SettingsPagespeed.propTypes = {
+ HEADING_SX: PropTypes.object,
+ settings: PropTypes.object,
+ setSettings: PropTypes.func,
+};
+
+export default SettingsPagespeed;
diff --git a/client/src/Pages/Settings/SettingsStats.jsx b/client/src/Pages/Settings/SettingsStats.jsx
new file mode 100644
index 000000000..c9178b1da
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsStats.jsx
@@ -0,0 +1,84 @@
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
+import Stack from "@mui/material/Stack";
+import ConfigBox from "../../Components/ConfigBox";
+import TextInput from "../../Components/Inputs/TextInput";
+import Dialog from "../../Components/Dialog";
+
+// Utils
+import { useTheme } from "@emotion/react";
+import { PropTypes } from "prop-types";
+import { useTranslation } from "react-i18next";
+import { useState } from "react";
+
+const SettingsStats = ({ HEADING_SX, handleChange, settings, errors }) => {
+ const theme = useTheme();
+ const { t } = useTranslation();
+ const [isOpen, setIsOpen] = useState(false);
+ return (
+
+
+
+ {t("settingsHistoryAndMonitoring")}
+
+
+ {t("settingsHistoryAndMonitoringDescription")}
+
+
+
+
+
+ {t("settingsClearAllStats")}
+
+
+
+
+ );
+};
+
+SettingsStats.propTypes = {
+ HEADING_SX: PropTypes.object,
+ handleChange: PropTypes.func,
+ settings: PropTypes.object,
+ errors: PropTypes.object,
+};
+
+export default SettingsStats;
diff --git a/client/src/Pages/Settings/SettingsTimeZone.jsx b/client/src/Pages/Settings/SettingsTimeZone.jsx
new file mode 100644
index 000000000..e6ba1a77b
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsTimeZone.jsx
@@ -0,0 +1,43 @@
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import ConfigBox from "../../Components/ConfigBox";
+import Select from "../../Components/Inputs/Select";
+import timezones from "../../Utils/timezones.json";
+
+// Utils
+import { useTheme } from "@emotion/react";
+import { PropTypes } from "prop-types";
+import { useTranslation } from "react-i18next";
+const SettingsTimeZone = ({ HEADING_SX, handleChange, timezone }) => {
+ const theme = useTheme();
+ const { t } = useTranslation();
+ return (
+
+
+ {t("settingsGeneralSettings")}
+
+ {t("settingsDisplayTimezone")}-{" "}
+ {t("settingsDisplayTimezoneDescription")}
+
+
+
+
+
+
+ );
+};
+
+SettingsTimeZone.propTypes = {
+ HEADING_SX: PropTypes.object,
+ handleChange: PropTypes.func,
+ timezone: PropTypes.string,
+};
+
+export default SettingsTimeZone;
diff --git a/client/src/Pages/Settings/SettingsUI.jsx b/client/src/Pages/Settings/SettingsUI.jsx
new file mode 100644
index 000000000..24588d79e
--- /dev/null
+++ b/client/src/Pages/Settings/SettingsUI.jsx
@@ -0,0 +1,52 @@
+import Box from "@mui/material/Box";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import ConfigBox from "../../Components/ConfigBox";
+import Select from "../../Components/Inputs/Select";
+
+// Utils
+import { useTheme } from "@emotion/react";
+import { PropTypes } from "prop-types";
+import { useTranslation } from "react-i18next";
+
+const SettingsUI = ({ HEADING_SX, handleChange, mode, language }) => {
+ const { t, i18n } = useTranslation();
+ const theme = useTheme();
+ const languages = Object.keys(i18n.options.resources || {});
+ return (
+
+
+ {t("settingsAppearance")}
+ {t("settingsAppearanceDescription")}
+
+
+
+
+
+
+ );
+};
+
+SettingsUI.propTypes = {
+ HEADING_SX: PropTypes.object,
+ handleChange: PropTypes.func,
+ mode: PropTypes.string,
+ language: PropTypes.string,
+};
+
+export default SettingsUI;
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
index 79e5ea657..e1e8c3859 100644
--- a/client/src/Pages/Settings/index.jsx
+++ b/client/src/Pages/Settings/index.jsx
@@ -1,116 +1,67 @@
-// Components
-import { Box, Stack, Typography, Button } from "@mui/material";
-import TextInput from "../../Components/Inputs/TextInput";
-import Link from "../../Components/Link";
-import Select from "../../Components/Inputs/Select";
-import { useIsAdmin } from "../../Hooks/useIsAdmin";
-import Dialog from "../../Components/Dialog";
-import ConfigBox from "../../Components/ConfigBox";
-import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
-import { getAppSettings } from "../../Features/Settings/settingsSlice";
-// import {
-// WalletMultiButton,
-// WalletDisconnectButton,
-// } from "@solana/wallet-adapter-react-ui";
-
-//Utils
-import { useTheme } from "@emotion/react";
-import { logger } from "../../Utils/Logger";
-import { useDispatch, useSelector } from "react-redux";
+import Stack from "@mui/material/Stack";
+import Typography from "@mui/material/Typography";
+import Breadcrumbs from "../../Components/Breadcrumbs";
+import SettingsTimeZone from "./SettingsTimeZone";
+import SettingsUI from "./SettingsUI";
+import SettingsPagespeed from "./SettingsPagespeed";
+import SettingsDemoMonitors from "./SettingsDemoMonitors";
+import SettingsAbout from "./SettingsAbout";
+import Button from "@mui/material/Button";
+// Utils
+import { settingsValidation } from "../../Validation/validation";
import { createToast } from "../../Utils/toastUtils";
+import { useState } from "react";
+import { useTheme } from "@emotion/react";
+import { useTranslation } from "react-i18next";
+import { useSelector, useDispatch } from "react-redux";
+import { setTimezone, setMode, setLanguage } from "../../Features/UI/uiSlice";
+import { getAppSettings } from "../../Features/Settings/settingsSlice";
+import SettingsStats from "./SettingsStats";
import {
deleteMonitorChecksByTeamId,
addDemoMonitors,
deleteAllMonitors,
} from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
-import { update } from "../../Features/Auth/authSlice";
-import PropTypes from "prop-types";
-import { setTimezone, setMode, setLanguage } from "../../Features/UI/uiSlice";
-import timezones from "../../Utils/timezones.json";
-import { useState, useEffect } from "react";
-import { networkService } from "../../main";
-import { settingsValidation } from "../../Validation/validation";
-import { updateAppSettings } from "../../Features/Settings/settingsSlice";
-import { useTranslation } from "react-i18next";
+import { useFetchSettings, useSaveSettings } from "../../Hooks/useFetchSettings";
+import { UseDeleteMonitorStats } from "../../Hooks/useDeleteMonitorStats";
// Constants
-const SECONDS_PER_DAY = 86400;
+const BREADCRUMBS = [{ name: `Settings`, path: "/settings" }];
const Settings = () => {
- const theme = useTheme();
- const { t, i18n } = useTranslation();
- const isAdmin = useIsAdmin();
+ // Redux state
+ const { mode, language, timezone } = useSelector((state) => state.ui);
const { user } = useSelector((state) => state.auth);
- const { language } = useSelector((state) => state.ui);
- const { checkTTL } = user;
- const { isLoading } = useSelector((state) => state.uptimeMonitors);
- const { isLoading: authIsLoading } = useSelector((state) => state.auth);
- const { timezone, distributedUptimeEnabled } = useSelector((state) => state.ui);
- const { mode } = useSelector((state) => state.ui);
- const { pagespeedApiKey } = useSelector((state) => state.settings);
- const [checksIsLoading, setChecksIsLoading] = useState(false);
- const [form, setForm] = useState({
- enableDistributedUptime: distributedUptimeEnabled,
- ttl: checkTTL ? (checkTTL / SECONDS_PER_DAY).toString() : 0,
- pagespeedApiKey: pagespeedApiKey,
+
+ // Local state
+ const [settings, setSettings] = useState({});
+ const [errors, setErrors] = useState({});
+
+ // Network
+ const [isSettingsLoading, settingsError] = useFetchSettings({
+ settings,
+ setSettings,
});
- const [version, setVersion] = useState("unknown");
- const [apiKeyFieldType, setApiKeyFieldType] = useState("password");
- const [isApiKeySet, setIsApiKeySet] = useState(pagespeedApiKey ? true : false);
- const [tempPSKey, setTempPSKey] = useState("");
- const [errors, setErrors] = useState({});
- const deleteStatsMonitorsInitState = { deleteMonitors: false, deleteStats: false };
- const [isOpen, setIsOpen] = useState(deleteStatsMonitorsInitState);
+ const [isSaving, saveError, saveSettings] = useSaveSettings();
+
+ const [deleteMonitorStats, isDeletingMonitorStats] = UseDeleteMonitorStats();
+
+ // Setup
+ const theme = useTheme();
+ const HEADING_SX = { mt: theme.spacing(2), mb: theme.spacing(2) };
+ const { t, i18n } = useTranslation();
const dispatch = useDispatch();
- //Fetching latest release version from github
- useEffect(() => {
- const fetchLatestVersion = async () => {
- let version = "unknown";
- try {
- const response = await networkService.fetchGithubLatestRelease();
- if (!response.status === 200) {
- throw new Error("Failed to fetch latest version");
- }
- version = response.data.tag_name;
- } catch (error) {
- createToast({ body: error.message || "Error fetching latest version" }); // Set error message
- } finally {
- setVersion(version);
- }
- };
- fetchLatestVersion();
- }, []);
+ // Handlers
+ const handleChange = async (e) => {
+ const { name, value } = e.target;
- useEffect(() => {
- dispatch(getAppSettings());
- }, [dispatch]);
-
- const handleChange = (event) => {
- const { type, checked, value, id } = event.target;
-
- if (type === "checkbox") {
- setForm((prev) => ({
- ...prev,
- [id]: checked,
- }));
- return;
- }
-
- if (id === "pagespeedApiKey") {
- setTempPSKey(value);
- return;
- }
-
- let inputValue = value;
- if (id === "ttl") {
- inputValue = value.replace(/[^0-9]/g, "");
- }
-
- const updatedForm = { ...form, [id]: inputValue };
- const { error } = settingsValidation.validate(updatedForm, { abortEarly: false });
+ // Build next state early
+ const newSettings = { ...settings, [name]: value };
+ // Validate
+ const { error } = settingsValidation.validate(newSettings, { abortEarly: false });
if (!error || error.details.length === 0) {
setErrors({});
} else {
@@ -119,397 +70,122 @@ const Settings = () => {
newErrors[err.path[0]] = err.message;
});
setErrors(newErrors);
- logger.error("Validation errors:", error.details);
}
- setForm(updatedForm);
- };
-
- // TODO Handle saving
- const handleSave = async () => {
- try {
- setChecksIsLoading(true);
- await networkService.updateChecksTTL({
- ttl: form.ttl,
- });
- const updatedUser = { ...user, checkTTL: form.ttl };
- const [userAction, settingsAction] = await Promise.all([
- dispatch(update({ localData: updatedUser })),
- dispatch(
- updateAppSettings({
- settings: {
- language: language,
- pagespeedApiKey: tempPSKey ? tempPSKey : form.pagespeedApiKey,
- },
- })
- ),
- ]);
-
- if (userAction.payload.success && settingsAction.payload.success) {
- createToast({ body: t("settingsSuccessSaved") });
- } else {
- throw new Error("Failed to save settings");
- }
- } catch (error) {
- createToast({ body: t("settingsFailedToSave") });
- } finally {
- setChecksIsLoading(false);
+ if (name === "timezone") {
+ dispatch(setTimezone({ timezone: value }));
}
- };
- const handleClearStats = async () => {
- try {
- const action = await dispatch(deleteMonitorChecksByTeamId({ teamId: user.teamId }));
-
- if (deleteMonitorChecksByTeamId.fulfilled.match(action)) {
- createToast({ body: t("settingsStatsCleared") });
- } else {
- createToast({ body: t("settingsFailedToClearStats") });
- }
- } catch (error) {
- logger.error(error);
- createToast({ body: t("settingsFailedToClearStats") });
- } finally {
- setIsOpen(deleteStatsMonitorsInitState);
+ if (name === "mode") {
+ dispatch(setMode(value));
}
- };
- const handleInsertDemoMonitors = async () => {
- try {
- const action = await dispatch(addDemoMonitors());
- if (addDemoMonitors.fulfilled.match(action)) {
- createToast({ body: t("settingsDemoMonitorsAdded") });
- } else {
+ if (name === "language") {
+ dispatch(setLanguage(value));
+ i18n.changeLanguage(value);
+ }
+
+ if (name === "deleteStats") {
+ await deleteMonitorStats({ teamId: user.teamId });
+ return;
+ }
+
+ if (name === "demo") {
+ try {
+ const action = await dispatch(addDemoMonitors());
+ if (addDemoMonitors.fulfilled.match(action)) {
+ createToast({ body: t("settingsDemoMonitorsAdded") });
+ } else {
+ createToast({ body: t("settingsFailedToAddDemoMonitors") });
+ }
+ } catch (error) {
createToast({ body: t("settingsFailedToAddDemoMonitors") });
}
- } catch (error) {
- logger.error(error);
- createToast({ Body: t("settingsFailedToAddDemoMonitors") });
+ return;
}
- };
- const handleDeleteAllMonitors = async () => {
- try {
- const action = await dispatch(deleteAllMonitors());
- if (deleteAllMonitors.fulfilled.match(action)) {
- createToast({ body: t("settingsMonitorsDeleted") });
- } else {
+ if (name === "deleteMonitors") {
+ try {
+ const action = await dispatch(deleteAllMonitors());
+ if (deleteAllMonitors.fulfilled.match(action)) {
+ createToast({ body: t("settingsMonitorsDeleted") });
+ } else {
+ createToast({ body: t("settingsFailedToDeleteMonitors") });
+ }
+ } catch (error) {
createToast({ body: t("settingsFailedToDeleteMonitors") });
}
- } catch (error) {
- logger.error(error);
- createToast({ Body: t("settingsFailedToDeleteMonitors") });
- } finally {
- setIsOpen(deleteStatsMonitorsInitState);
+ return;
}
+
+ setSettings(newSettings);
};
- const handleResetApiKey = () => {
- setIsApiKeySet(false);
- setForm((prev) => ({
- ...prev,
- pagespeedApiKey: "",
- }));
+ const handleSave = () => {
+ const { error } = settingsValidation.validate(settings, { abortEarly: false });
+ if (!error || error.details.length === 0) {
+ setErrors({});
+ } else {
+ const newErrors = {};
+ error.details.forEach((err) => {
+ newErrors[err.path[0]] = err.message;
+ });
+ setErrors(newErrors);
+ }
+ saveSettings(settings);
};
- const languages = Object.keys(i18n.options.resources || {});
-
return (
-
+
+
+ Settings
+
+
+
+
+
+
-
-
- {t("settingsGeneralSettings")}
-
- {t("settingsDisplayTimezone")}-{" "}
- {t("settingsDisplayTimezoneDescription")}
-
-
-
-
-
-
-
- {t("settingsAppearance")}
-
- {t("settingsAppearanceDescription")}
-
-
-
-
-
-
-
- {/* {isAdmin && (
-
-
- {t("settingsDistributedUptime")}
-
- {t("settingsDistributedUptimeDescription")}
-
-
-
- {
- dispatch(setDistributedUptimeEnabled(e.target.checked));
- }}
- />
- {distributedUptimeEnabled === true
- ? t("settingsEnabled")
- : t("settingsDisabled")}
-
-
- )} */}
-
-
- {t("pageSpeedApiKeyFieldTitle")}
-
- {t("pageSpeedApiKeyFieldDescription")}
-
-
-
-
- )
- }
- />
- {isApiKeySet && (
-
- {t("pageSpeedApiKeyFieldResetLabel")}
-
-
- )}
-
-
- {/* {isAdmin && (
-
-
- {t("settingsWallet")}
-
- {t("settingsWalletDescription")}
-
-
-
-
-
-
-
-
-
- )} */}
- {isAdmin && (
-
-
- {t("settingsHistoryAndMonitoring")}
-
- {t("settingsHistoryAndMonitoringDescription")}
-
-
-
-
-
- {t("settingsClearAllStats")}
-
-
-
-
- )}
- {isAdmin && (
- <>
- {/* Demo Monitors Section */}
-
-
- {t("settingsDemoMonitors")}
-
- {t("settingsDemoMonitorsDescription")}
-
-
-
- {t("settingsAddDemoMonitors")}
-
-
-
-
- {/* System Reset Section */}
-
-
- {t("settingsSystemReset")}
-
- {t("settingsSystemResetDescription")}
-
-
-
- {t("settingsRemoveAllMonitors")}
-
-
-
- >
- )}
-
-
-
- {t("settingsAbout")}
-
-
- Checkmate {version}
-
- {t("settingsDevelopedBy")}
-
-
-
-
- 0}
+ variant="contained"
+ color="accent"
+ sx={{ px: theme.spacing(12), mt: theme.spacing(20) }}
+ onClick={handleSave}
>
-
-
+ {t("settingsSave")}
+
-
+
);
};
-Settings.propTypes = {
- isAdmin: PropTypes.bool,
-};
export default Settings;