Merge branch 'develop' into fix/missing-strings
This commit is contained in:
6 files changed
+20
-5
No files matched your search
@@ -26,7 +26,8 @@ const ActionMenu = ({ notification, onDelete }) => {
|
|||||||
setAnchorEl(null);
|
setAnchorEl(null);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleRemove = () => {
|
const handleRemove = (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
onDelete(notification._id);
|
onDelete(notification._id);
|
||||||
handleClose();
|
handleClose();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -221,7 +221,15 @@ const PieChart = ({ audits }) => {
|
|||||||
const colorMap = getColors(performance);
|
const colorMap = getColors(performance);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box onMouseLeave={() => setExpand(false)}>
|
<Box
|
||||||
|
onMouseLeave={() => setExpand(false)}
|
||||||
|
sx={{
|
||||||
|
display: "flex",
|
||||||
|
justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
width: "100%",
|
||||||
|
}}
|
||||||
|
>
|
||||||
{expand ? (
|
{expand ? (
|
||||||
<MuiPieChart
|
<MuiPieChart
|
||||||
series={[
|
series={[
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ const PerformanceReport = ({ shouldRender, audits }) => {
|
|||||||
<Typography
|
<Typography
|
||||||
variant="body1"
|
variant="body1"
|
||||||
mt="auto"
|
mt="auto"
|
||||||
|
sx={{
|
||||||
|
textAlign: "center",
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{t("pageSpeedDetailsPerformanceReport")}{" "}
|
{t("pageSpeedDetailsPerformanceReport")}{" "}
|
||||||
<Typography
|
<Typography
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ const TabSettings = ({
|
|||||||
component="h2"
|
component="h2"
|
||||||
variant="h2"
|
variant="h2"
|
||||||
>
|
>
|
||||||
{t("settingsAppearance")}
|
{t("statusPageCreateAppearanceTitle")}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography component="p">
|
<Typography component="p">
|
||||||
{t("statusPageCreateAppearanceDescription")}
|
{t("statusPageCreateAppearanceDescription")}
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ const CreateStatusPage = () => {
|
|||||||
const [statusPage, statusPageMonitors, statusPageIsLoading, statusPageNetworkError] =
|
const [statusPage, statusPageMonitors, statusPageIsLoading, statusPageNetworkError] =
|
||||||
useStatusPageFetch(isCreate, url);
|
useStatusPageFetch(isCreate, url);
|
||||||
|
|
||||||
|
console.log(JSON.stringify(form, null, 2));
|
||||||
// Handlers
|
// Handlers
|
||||||
const handleFormChange = (e) => {
|
const handleFormChange = (e) => {
|
||||||
let { type, name, value, checked } = e.target;
|
let { type, name, value, checked } = e.target;
|
||||||
@@ -177,7 +178,7 @@ const CreateStatusPage = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let newLogo = undefined;
|
let newLogo = undefined;
|
||||||
if (statusPage.logo) {
|
if (statusPage.logo && Object.keys(statusPage.logo).length > 0) {
|
||||||
newLogo = {
|
newLogo = {
|
||||||
src: `data:${statusPage.logo.contentType};base64,${statusPage.logo.data}`,
|
src: `data:${statusPage.logo.contentType};base64,${statusPage.logo.data}`,
|
||||||
name: "logo",
|
name: "logo",
|
||||||
|
|||||||
@@ -495,6 +495,7 @@
|
|||||||
"failureAddDemoMonitors": "Failed to add demo monitors",
|
"failureAddDemoMonitors": "Failed to add demo monitors",
|
||||||
"successAddDemoMonitors": "Successfully added demo monitors"
|
"successAddDemoMonitors": "Successfully added demo monitors"
|
||||||
},
|
},
|
||||||
|
|
||||||
"monitorState": {
|
"monitorState": {
|
||||||
"active": "Active",
|
"active": "Active",
|
||||||
"paused": "Paused",
|
"paused": "Paused",
|
||||||
@@ -536,7 +537,7 @@
|
|||||||
"label": "Discord",
|
"label": "Discord",
|
||||||
"webhookLabel": "Discord Webhook URL",
|
"webhookLabel": "Discord Webhook URL",
|
||||||
"webhookPlaceholder": "https://discord.com/api/webhooks/...",
|
"webhookPlaceholder": "https://discord.com/api/webhooks/...",
|
||||||
"webhookRequired": "Discord webhook URL is f"
|
"webhookRequired": "Discord webhook URL is required"
|
||||||
},
|
},
|
||||||
"edit": {
|
"edit": {
|
||||||
"failed": "Failed to update notification",
|
"failed": "Failed to update notification",
|
||||||
@@ -785,6 +786,7 @@
|
|||||||
"buttonSave": "Save"
|
"buttonSave": "Save"
|
||||||
},
|
},
|
||||||
"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
|
"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
|
||||||
|
"statusPageCreateAppearanceTitle": "Appearance",
|
||||||
"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
|
"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
|
||||||
"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
|
"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
|
||||||
"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
|
"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",
|
||||||
|
|||||||
Reference in new issue
Block a user