Merge branch 'develop' into feat/fe/uptime-ignore-tsl-error

This commit is contained in:
Alexander Holliday authored and GitHub committed 2025-05-08 12:00:50 -07:00
commit a8f46d913d
37 files changed
+638 -194

No files matched your search

+10 -1
View File
@@ -45,9 +45,16 @@ class NetworkService {
this.axiosInstance.interceptors.response.use(
(response) => response,
(error) => {
// Handle network errors (server unreachable)
if (error.code === "ERR_NETWORK") {
// Do error handling here
// Navigate to server unreachable page
navigate("/server-unreachable");
// Return an empty resolved promise to stop the error propagation
return Promise.reject(error);
}
// Handle authentication errors
if (error.response && error.response.status === 401) {
dispatch(clearAuthState());
dispatch(clearUptimeMonitorState());
@@ -508,6 +515,8 @@ class NetworkService {
return this.axiosInstance.get("/auth/users/superadmin");
}
/**
* ************************************
* Get all users
+9 -3
View File
@@ -63,7 +63,6 @@ const paletteColors = {
orange500: "#E88C30",
orange600: "#DC6803",
orange800: "#624711",
};
const semanticColors = {
@@ -155,7 +154,6 @@ const newSemanticColors = {
light: newColors.blueGray600,
dark: newColors.gray200,
},
// CAIO_REVIEW, need a brighter color for dark bg
contrastTextSecondaryDarkBg: {
light: newColors.gray200,
dark: newColors.gray200,
@@ -164,6 +162,14 @@ const newSemanticColors = {
light: newColors.blueGray500,
dark: newColors.gray500,
},
contrastBorder: {
light: newColors.gray500,
dark: newColors.blueGray600,
},
contrastBorderDisabled: {
light: newColors.gray100,
dark: newColors.blueGray800,
},
lowContrast: {
light: newColors.gray200,
dark: newColors.blueGray600,
@@ -264,7 +270,7 @@ const newSemanticColors = {
dark: newColors.red600,
},
},
/* These are temporary, just for everything not to break */
gradient: {
color1: {
+16 -6
View File
@@ -1,5 +1,4 @@
import { typographyLevels } from "./constants";
const fontFamilyPrimary = '"Inter" , sans-serif';
// const fontFamilySecondary = '"Avenir", sans-serif';
@@ -300,13 +299,15 @@ const baseTheme = (palette) => ({
}),
},
},
MuiTextField: {
styleOverrides: {
root: ({ theme }) => ({
"& fieldset": {
borderColor: theme.palette.primary.lowContrast,
borderColor: theme.palette.primary.contrastBorder,
borderRadius: theme.shape.borderRadius,
},
"& .MuiInputBase-input": {
padding: ".75em",
minHeight: "var(--env-var-height-2)",
@@ -356,10 +357,19 @@ const baseTheme = (palette) => ({
MuiOutlinedInput: {
styleOverrides: {
root: {
color: palette.primary.contrastTextTertiary,
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
borderColor: palette.primary.contrastTextTertiary,
"&.Mui-disabled .MuiOutlinedInput-notchedOutline": {
borderColor: palette.primary.contrastBorderDisabled,
},
"&.Mui-disabled:hover .MuiOutlinedInput-notchedOutline": {
borderColor: palette.primary.contrastBorderDisabled,
},
"&:hover .MuiOutlinedInput-notchedOutline": {
borderColor: palette.primary.contrastText, // Adjust hover border color
},
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
borderColor: palette.accent.main, // Adjust focus border color
},
color: palette.primary.contrastTextTertiary,
},
},
},
@@ -510,7 +520,7 @@ const baseTheme = (palette) => ({
root: ({ theme }) => ({
ml: "auto",
"& .MuiButtonBase-root, & .MuiButtonBase-root:hover": {
borderColor: theme.palette.primary.lowContrast,
borderColor: theme.palette.primary.contrastBorder,
width: "auto",
whiteSpace: "nowrap",
},