Merged the conflict theme file.

This commit is contained in:
Owaise Imdad committed 2025-03-05 00:37:21 +05:30
commit b3bfab05e6
24 files changed
+388 -168

No files matched your search

+25
View File
@@ -807,6 +807,31 @@ class NetworkService {
);
}
getDistributedUptimeMonitors(config) {
const { teamId, limit, types, page, rowsPerPage, filter, field, order } = config;
const params = new URLSearchParams();
if (limit) params.append("limit", limit);
if (types) {
types.forEach((type) => {
params.append("type", type);
});
}
if (page) params.append("page", page);
if (rowsPerPage) params.append("rowsPerPage", rowsPerPage);
if (filter) params.append("filter", filter);
if (field) params.append("field", field);
if (order) params.append("order", order);
if (this.eventSource) {
this.eventSource.close();
}
const url = `${this.axiosInstance.defaults.baseURL}/distributed-uptime/monitors/${teamId}/initial?${params.toString()}`;
return this.axiosInstance.get(url);
}
subscribeToDistributedUptimeMonitors(config) {
const {
teamId,
+17 -1
View File
@@ -40,7 +40,6 @@ const paletteColors = {
blueGray150: "#667085",
blueGray200: "#475467",
blueGray400: "#344054",
blueGray900: "#1c2130",
blueBlueWave: "#1570EF",
blue700: "#4E5BA6",
purple300: "#664EFF",
@@ -89,11 +88,14 @@ const newColors = {
gray100: "#F3F3F3",
gray200: "#EFEFEF",
gray500: "#A2A3A3",
gray900: "#1c1c1c",
blueGray50: "#E8F0FE",
blueGray500: "#475467",
blueGray600: "#344054",
blueGray800: "#1C2130",
blueGray900: "#515151",
blueBlueWave: "#1570EF",
lightBlueWave: "#CDE2FF",
/* I changed green 100 and green 700. Need to change red and warning as well, and refactor the object following the structure */
green100: "#67cd78",
green200: "#4B9B77",
@@ -171,6 +173,10 @@ const newSemanticColors = {
light: newColors.gray200,
dark: "#313131" /* newColors.blueGray600 */,
},
light: {
light: newColors.lightBlueWave,
dark: newColors.lightBlueWave,
},
contrastText: {
light: newColors.blueGray600,
dark: newColors.gray200,
@@ -290,6 +296,16 @@ const newSemanticColors = {
dark: "#C084FC",
},
},
alert: {
main: {
light: newColors.gray200,
dark: newColors.gray900,
},
contrastText: {
light: newColors.blueGray600,
dark: newColors.blueGray900,
},
},
};
export { typographyLevels, semanticColors as colors, newSemanticColors };
+12
View File
@@ -382,6 +382,18 @@ const baseTheme = (palette) => ({
}),
},
},
MuiButtonGroup: {
styleOverrides: {
root: ({ theme }) => ({
ml: "auto",
"& .MuiButtonBase-root, & .MuiButtonBase-root:hover": {
borderColor: theme.palette.primary.lowContrast,
width: "auto",
whiteSpace: "nowrap",
},
}),
},
},
// This code is added for clock in maintenance page
// code starts from here.
+24 -14
View File
@@ -3,8 +3,8 @@
* @param {string} str String whose first letter is to be capitalized
* @returns A string with first letter capitalized
*/
export const capitalizeFirstLetter = (str) => {
if (str === null || str === undefined) {
export const capitalizeFirstLetter = (str) => {
if (str === null || str === undefined) {
return "";
}
if (typeof str !== "string") {
@@ -12,7 +12,7 @@ export const capitalizeFirstLetter = (str) => {
}
if (str.length === 0) {
return "";
}
}
return str.charAt(0).toUpperCase() + str.slice(1);
};
@@ -22,15 +22,25 @@ export const capitalizeFirstLetter = (str) => {
* @returns A string with first letter lower cased
*/
export const toLowerCaseFirstLetter = (str) => {
export const toLowerCaseFirstLetter = (str) => {
if (str === null || str === undefined) {
return "";
}
if (typeof str !== "string") {
throw new TypeError("Input must be a string");
}
if (str.length === 0) {
return "";
}
return str.charAt(0).toLowerCase() + str.slice(1);
};
return "";
}
if (typeof str !== "string") {
throw new TypeError("Input must be a string");
}
if (str.length === 0) {
return "";
}
return str.charAt(0).toLowerCase() + str.slice(1);
};
/**
* Checks if a string is null, undefined, or empty (including strings with only whitespace).
* @param {string} str - The string to check.
* @returns {boolean} - Returns true if the string is null, undefined, or empty.
*/
export const isEmpty = (str) => {
// Check if string is null, undefined, or empty (including whitespace only)
return str === null || typeof str === "undefined" || str.trim().length === 0;
};