Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX-1848 UI design changes #1850

Merged
merged 8 commits into from
Mar 3, 2025
Merged

FIX-1848 UI design changes #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4820c1e
FIX-1848 made changes in the contents tab in the status page.
Owaiseimdad Mar 1, 2025
b6726fb
FIX-1848 removed the unwanted box element as it does not serve any pu…
Owaiseimdad Mar 1, 2025
d123bed
FIX-1848 minor theme fixes.
Owaiseimdad Mar 1, 2025
9edfd71
Merge branch 'bluewave-labs:develop' into FIX_1848_smallUIFixes
Owaiseimdad Mar 2, 2025
649b5ad
FIX-1848 removed the border and background colour.
Owaiseimdad Mar 2, 2025
95ccccc
FIX-1848 added theme for alerts specfic.
Owaiseimdad Mar 2, 2025
641aeff
FIX-1484 added in new colors for extensibility and maintainability.
Owaiseimdad Mar 2, 2025
8f9c388
FIX-1848 addressed the comments in order to modify the theme implemen…
Owaiseimdad Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Components/Alert/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ const Alert = ({ variant, title, body, isToast, hasIcon = true, onClick }) => {
*/

const text = theme.palette.secondary.contrastText;
const bg = theme.palette.secondary.main;
const border = theme.palette.secondary.contrastText;
const border = theme.palette.alert.contrastText;
const bg = theme.palette.alert.main;
const icon = icons[variant];

return (
Expand Down
4 changes: 0 additions & 4 deletions src/Pages/Account/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ const Account = ({ open = "profile" }) => {
className="account"
px={theme.spacing(20)}
py={theme.spacing(12)}
backgroundColor={theme.palette.primary.main}
border={1}
borderColor={theme.palette.primary.lowContrast}
borderRadius={theme.shape.borderRadius}
>
<TabContext value={tab}>
<Box
Expand Down
26 changes: 26 additions & 0 deletions src/Pages/StatusPage/Create/Components/Tabs/ConfigStack.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { Stack, Typography } from "@mui/material";
import ConfigBox from "../../../../../Components/ConfigBox";
import PropTypes from "prop-types";
import { useTheme } from "@emotion/react";

// This can be used to add any extra/additional section/stacks on top of existing sections on the tab
const ConfigStack = ({ title, description, children }) => {
const theme = useTheme();
return (
<ConfigBox>
<Stack gap={theme.spacing(6)}>
<Typography component="h2">{title}</Typography>
<Typography component="p">{description}</Typography>
</Stack>
{children}
</ConfigBox>
);
};

ConfigStack.propTypes = {
title: PropTypes.string.isRequired, // Title must be a string and is required
description: PropTypes.string.isRequired, // Description must be a string and is required
children: PropTypes.node.isRequired,
};

export default ConfigStack;
32 changes: 13 additions & 19 deletions src/Pages/StatusPage/Create/Components/Tabs/Content.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Components
import { Stack, Typography, Button } from "@mui/material";
import { Stack, Typography } from "@mui/material";
import { TabPanel } from "@mui/lab";
import ConfigBox from "../../../../../Components/ConfigBox";
import MonitorList from "../MonitorList";
import Search from "../../../../../Components/Inputs/Search";
import Checkbox from "../../../../../Components/Inputs/Checkbox";
// Utils
import { useState } from "react";
import { useTheme } from "@emotion/react";
import ConfigStack from "./ConfigStack";
const Content = ({
tabValue,
form,
Expand All @@ -34,14 +34,10 @@ const Content = ({
return (
<TabPanel value={tabValue}>
<Stack gap={theme.spacing(10)}>
<ConfigBox>
<Stack gap={theme.spacing(6)}>
<Typography component="h2">Status page servers</Typography>
<Typography component="p">
You can add any number of servers that you monitor to your status page. You
can also reorder them for the best viewing experience.
</Typography>
</Stack>
<ConfigStack
title="Status page servers"
description="You can add any number of servers that you monitor to your status page. You can also reorder them for the best viewing experience."
>
<Stack>
<Stack
direction="row"
Expand Down Expand Up @@ -72,13 +68,12 @@ const Content = ({
setSelectedMonitors={handleMonitorsChange}
/>
</Stack>
</ConfigBox>{" "}
<ConfigBox>
<Stack gap={theme.spacing(6)}>
<Typography component="h2">Features</Typography>
<Typography component="p">Show more details on the status page</Typography>
</Stack>
<Stack sx={{ margin: theme.spacing(6) }}>
</ConfigStack>
<ConfigStack
title="Features"
description="Show more details on the status page"
>
<Stack>
<Checkbox
id="showCharts"
name="showCharts"
Expand All @@ -94,9 +89,8 @@ const Content = ({
onChange={handleFormChange}
/>
</Stack>
</ConfigBox>
</ConfigStack>
</Stack>
<Stack gap={theme.spacing(6)}></Stack>
</TabPanel>
);
};
Expand Down
13 changes: 12 additions & 1 deletion src/Utils/Theme/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ const paletteColors = {
blueGray150: "#667085",
blueGray200: "#475467",
blueGray400: "#344054",
blueGray900: "#1c2130",
blueBlueWave: "#1570EF",
blue700: "#4E5BA6",
purple300: "#664EFF",
Expand Down Expand Up @@ -89,10 +88,12 @@ const newColors = {
gray100: "#F3F3F3",
gray200: "#EFEFEF",
gray500: "#A2A3A3",
gray900: "#1c1c1c",
blueGray50: "#E8F0FE",
blueGray500: "#475467",
blueGray600: "#344054",
blueGray800: "#1C2130",
blueGray900: "#515151",
blueBlueWave: "#1570EF",
/* I changed green 100 and green 700. Need to change red and warning as well, and refactor the object following the structure */
green100: "#67cd78",
Expand Down Expand Up @@ -290,6 +291,16 @@ const newSemanticColors = {
dark: "#C084FC",
},
},
alert: {
main: {
light: newColors.gray200,
dark: newColors.gray900,
},
contrastText: {
light: newColors.blueGray600,
dark: newColors.blueGray900,
},
},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These values will not work with MUI components which is the purpose of the theme.

Please see theme docs and be familiar with how the theme works before modifying the theme.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ajhollid , yep thanks for providing reference here.

};

export { typographyLevels, semanticColors as colors, newSemanticColors };