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.

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

Create status page PR2 #1494

Open
wants to merge 56 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
136ed04
- Update status home page to connect to create status page
jennifer-gan Nov 26, 2024
4345d69
- Fix the checkbox position to be conditional on non string label
jennifer-gan Nov 28, 2024
5adffd8
- WIP general setting panel
jennifer-gan Nov 28, 2024
2405d01
- update to match BE
jennifer-gan Nov 28, 2024
8506291
- Fix the component not showing the file text and logo section issue
jennifer-gan Nov 28, 2024
df36f87
- Add log and general settins tab validation
jennifer-gan Dec 2, 2024
5df7ddb
- WIP Replace Field with TextInput , HttpAdornment seems not working
jennifer-gan Dec 2, 2024
0759b16
- add lower case first letter string util func
jennifer-gan Dec 4, 2024
cc2187d
- add routes to status page nested pages
jennifer-gan Dec 4, 2024
b275bdc
- Link general settings and contens to status page in navigation
jennifer-gan Dec 4, 2024
35a981a
- Update icons etc
jennifer-gan Dec 4, 2024
b651369
- WIP Server list tab
jennifer-gan Dec 5, 2024
cbec5fd
- Change "Next" to "Save"
jennifer-gan Dec 6, 2024
2825ff4
- WIP contents tab adding servers list
jennifer-gan Dec 5, 2024
03ce805
- Add React DND related libraries
jennifer-gan Dec 9, 2024
b1f0568
- Created Card type
jennifer-gan Dec 9, 2024
1ab4bd7
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Dec 10, 2024
9370db6
- Fix the suburl prefix via extending existing HttpAdorment
jennifer-gan Dec 10, 2024
00be6c2
- Fix the warning button can not be descendant of button
jennifer-gan Dec 12, 2024
c61d1ac
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Dec 12, 2024
9d212c9
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Dec 12, 2024
fdca92e
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Dec 13, 2024
406fa6e
- Merge feedback works from status page 1 and status page 2 branches
jennifer-gan Dec 13, 2024
c1dc049
- Remove nested routes for tabs
jennifer-gan Dec 13, 2024
8292654
- Add context provider for both tabs
jennifer-gan Dec 13, 2024
5045eaf
- useContext from parent page for form fields
jennifer-gan Dec 13, 2024
219bcd4
- Add GetStatusPageByUrl to networkservice
jennifer-gan Dec 17, 2024
c9b804a
- Update getStatusPageByUrl to match BE
jennifer-gan Dec 17, 2024
3a00742
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Dec 17, 2024
11154ad
- Code clean up
jennifer-gan Dec 20, 2024
feaf1e3
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Dec 24, 2024
c535a6f
- Update path
jennifer-gan Dec 24, 2024
d844078
- Update validation
jennifer-gan Dec 24, 2024
23d97f8
- Replace Doc icon with Reorder icon
jennifer-gan Dec 28, 2024
a5df7be
- Create new status page and retrieval are now working end to end, ex…
jennifer-gan Dec 30, 2024
d8da182
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Dec 30, 2024
1206451
- Update JSDoc
jennifer-gan Dec 30, 2024
8b72f84
- Update logo handling and validation
jennifer-gan Jan 2, 2025
5226f3c
- Update to add status page subdomain as env variable
jennifer-gan Jan 3, 2025
a544a0f
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Jan 3, 2025
ff7fe7f
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Jan 9, 2025
e8d9f31
- Pass custom file size to ImageField
jennifer-gan Jan 9, 2025
a1d4ec4
Update based on meeting
jennifer-gan Jan 10, 2025
df4a7f6
- Add MUI Color Picker component
jennifer-gan Jan 10, 2025
df86c92
- Make status page url disabled and read from env
jennifer-gan Jan 10, 2025
6f4c606
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Jan 10, 2025
b5409f0
- Made the reorder icon having indicator and move it outside the sear…
jennifer-gan Jan 14, 2025
e8a9c0d
- Use React beautiful dnd library for servers list section
jennifer-gan Jan 14, 2025
642c5f0
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Jan 14, 2025
045a9cf
- Remove Color picker OOTB label, add custom label
jennifer-gan Jan 17, 2025
f0352cc
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Jan 17, 2025
dba8517
- add onBlur to handle Serverslist validation
jennifer-gan Jan 19, 2025
66325bd
- Adjust logo and Remove log button margins
jennifer-gan Jan 21, 2025
083a134
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Jan 22, 2025
b7a70c4
-Fix Tab color
jennifer-gan Jan 27, 2025
12b14e1
Merge branch 'develop' into feat/fe/statuspage-3
jennifer-gan Jan 28, 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
1 change: 1 addition & 0 deletions Client/.env.production
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VITE_APP_API_BASE_URL=UPTIME_APP_API_BASE_URL
VITE_STATUS_PAGE_SUBDOMAIN_PREFIX=UPTIME_STATUS_PAGE_SUBDOMAIN_PREFIX
81 changes: 81 additions & 0 deletions Client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fontsource/roboto": "^5.0.13",
"@hello-pangea/dnd": "^17.0.0",
"@mui/icons-material": "6.4.1",
"@mui/lab": "6.0.0-beta.24",
"@mui/material": "6.4.1",
Expand All @@ -23,8 +24,10 @@
"@reduxjs/toolkit": "2.5.0",
"axios": "^1.7.4",
"dayjs": "1.11.13",
"immutability-helper": "^3.1.1",
"joi": "17.13.3",
"jwt-decode": "^4.0.0",
"mui-color-input": "^5.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "9.2.0",
Expand Down
1 change: 1 addition & 0 deletions Client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { logger } from "./Utils/Logger"; // Import the logger
import { networkService } from "./main";
import { Routes } from "./Routes";

import CreateStatus from "./Pages/Status/CreateStatus";
function App() {
const mode = useSelector((state) => state.ui.mode);
const { authToken } = useSelector((state) => state.auth);
Expand Down
5 changes: 1 addition & 4 deletions Client/src/Components/ConfigBox/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ const ConfigBox = styled(Stack)(({ theme }) => ({
},
"& h1, & h2": {
color: theme.palette.primary.contrastTextSecondary,
},
"& p": {
color: theme.palette.primary.contrastTextTertiary,
},
}
}));

export default ConfigBox;
9 changes: 7 additions & 2 deletions Client/src/Components/Inputs/Checkbox/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import "./index.css";
* @param {string} [props.value] - Optional value associated with the checkbox
* @param {Function} [props.onChange] - Callback function triggered when checkbox state changes
* @param {boolean} [props.isDisabled] - Determines if the checkbox is disabled
* @param {boolean} [props.alignSelf] - Whether the checkbox label should be positioned on flex-start.
*
* @returns {React.ReactElement} Rendered Checkbox component
*
Expand All @@ -42,6 +43,7 @@ import "./index.css";
* isChecked={isAdvanced}
* isDisabled={!canModify}
* onChange={handleAdvancedToggle}
* alignSelf = {alignSelf}
* />
*/
const Checkbox = ({
Expand All @@ -53,10 +55,12 @@ const Checkbox = ({
value,
onChange,
isDisabled,
alignSelf
}) => {
/* TODO move sizes to theme */
const sizes = { small: "14px", medium: "16px", large: "18px" };
const theme = useTheme();
const override = alignSelf? { alignSelf: "flex-start" } : {}
return (
<FormControlLabel
className="checkbox-wrapper"
Expand All @@ -75,7 +79,7 @@ const Checkbox = ({
sx={{
"&:hover": { backgroundColor: "transparent" },
"& svg": { width: sizes[size], height: sizes[size] },
alignSelf: "flex-start",
...override
}}
/>
}
Expand Down Expand Up @@ -111,9 +115,10 @@ Checkbox.propTypes = {
label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
size: PropTypes.oneOf(["small", "medium", "large"]),
isChecked: PropTypes.bool.isRequired,
value: PropTypes.string,
value: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
onChange: PropTypes.func,
isDisabled: PropTypes.bool,
alignSelf: PropTypes.bool,
};

export default Checkbox;
60 changes: 60 additions & 0 deletions Client/src/Components/Inputs/ColorPicker/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import PropTypes from "prop-types";
import { Stack, Typography } from "@mui/material";
import { useTheme } from "@emotion/react";
import { MuiColorInput } from "mui-color-input";

/**
*
* @param {*} id The ID of the component
* @param {*} value The color value of the component
* @param {*} error The error of the component
* @param {*} onChange The Change handler function
* @param {*} onBlur The Blur handler function
* @returns The ColorPicker component
* Example usage:
* <ColorPicker
* id="color"
* value={form.color}
* error={errors["color"]}
* onChange={handleColorChange}
* onBlur={handleBlur}
* >
* </ColorPicker>
*/
const ColorPicker = ({ id, value, error, onChange, onBlur }) => {
const theme = useTheme();
return (
<Stack gap={theme.spacing(4)}>
<MuiColorInput
format="hex"
value={value}
id={id}
onChange={onChange}
onBlur={onBlur}
/>
{error && (
<Typography
component="span"
className="input-error"
color={theme.palette.error.main}
mt={theme.spacing(2)}
sx={{
opacity: 0.8,
}}
>
{error}
</Typography>
)}
</Stack>
);
};

ColorPicker.propTypes = {
id: PropTypes.string.isRequired,
value: PropTypes.string,
error: PropTypes.string,
onChange: PropTypes.func.isRequired,
onBlur: PropTypes.func.isRequired,
};

export default ColorPicker;
Loading