Merge branch 'develop' of https://github.com/Shivansh-22866/Checkmate into fix/remove_future_features

This commit is contained in:
Shivansh-22866 committed 2025-06-08 23:16:40 +05:30
commit f6f1842863
28 files changed
+779 -307

No files matched your search

+19 -1
View File
@@ -200,13 +200,31 @@ const Settings = () => {
<Stack
direction="row"
justifyContent="flex-end"
sx={{
position: "sticky",
bottom: 0,
boxShadow: theme.shape.boxShadow,
zIndex: 1000,
mt: 3,
backgroundColor: theme.palette.primary.main,
display: "flex",
justifyContent: "flex-end",
pb: theme.spacing(4),
pr: theme.spacing(15),
pl: theme.spacing(5),
pt: theme.spacing(4),
border: 1,
borderStyle: "solid",
borderColor: theme.palette.primary.lowContrast,
borderRadius: theme.spacing(2),
}}
>
<Button
loading={isSaving || isDeletingMonitorStats || isSettingsLoading}
disabled={Object.keys(errors).length > 0}
variant="contained"
color="accent"
sx={{ px: theme.spacing(12), mt: theme.spacing(20) }}
sx={{ px: theme.spacing(12), py: theme.spacing(8) }}
onClick={handleSave}
>
{t("settingsSave")}
@@ -15,7 +15,7 @@ const useMonitorsFetch = () => {
const response = await networkService.getMonitorsByTeamId({
teamId: user.teamId,
limit: null, // donot return any checks for the monitors
types: ["http", "ping"], // status page is available for uptime and ping monitors
types: ["http", "ping", "port"], // status page is available for uptime, ping, and port monitors
});
setMonitors(response.data.data.monitors);
} catch (error) {
@@ -23,7 +23,7 @@ const UploadFile = ({ onFileSelect }) => {
// Basic file validation
if (!selectedFile) return;
if (!selectedFile.name.endsWith(".csv")) {
if (!selectedFile.name.toLowerCase().endsWith(".csv")) {
setError(t("bulkImport.invalidFileType"));
return;
}
+3 -1
View File
@@ -353,7 +353,9 @@ const CreateMonitor = () => {
>
{t("settingsGeneralSettings")}
</Typography>
<Typography component="p">{t(`uptimeGeneralInstructions.${monitor.type}`)}</Typography>
<Typography component="p">
{t(`uptimeGeneralInstructions.${monitor.type}`)}
</Typography>
</Box>
<Stack gap={theme.spacing(15)}>
<TextInput