Merge branch 'bluewave-labs:develop' into Maintenance-start-time-style
This commit is contained in:
6 files changed
+34
-33
No files matched your search
Generated
+25
-24
@@ -16,9 +16,9 @@
|
|||||||
"@mui/lab": "6.0.0-beta.30",
|
"@mui/lab": "6.0.0-beta.30",
|
||||||
"@mui/material": "6.4.7",
|
"@mui/material": "6.4.7",
|
||||||
"@mui/x-charts": "^7.5.1",
|
"@mui/x-charts": "^7.5.1",
|
||||||
"@mui/x-data-grid": "7.27.2",
|
"@mui/x-data-grid": "7.27.3",
|
||||||
"@mui/x-date-pickers": "7.27.1",
|
"@mui/x-date-pickers": "7.27.3",
|
||||||
"@reduxjs/toolkit": "2.6.0",
|
"@reduxjs/toolkit": "2.6.1",
|
||||||
"@solana/wallet-adapter-base": "0.9.23",
|
"@solana/wallet-adapter-base": "0.9.23",
|
||||||
"@solana/wallet-adapter-material-ui": "0.16.34",
|
"@solana/wallet-adapter-material-ui": "0.16.34",
|
||||||
"@solana/wallet-adapter-react": "0.15.35",
|
"@solana/wallet-adapter-react": "0.15.35",
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
"joi": "17.13.3",
|
"joi": "17.13.3",
|
||||||
"jwt-decode": "^4.0.0",
|
"jwt-decode": "^4.0.0",
|
||||||
"maplibre-gl": "5.2.0",
|
"maplibre-gl": "5.2.0",
|
||||||
"mui-color-input": "^5.0.1",
|
"mui-color-input": "^6.0.0",
|
||||||
"react": "18.3.1",
|
"react": "18.3.1",
|
||||||
"react-dnd": "^16.0.1",
|
"react-dnd": "^16.0.1",
|
||||||
"react-dnd-html5-backend": "^16.0.1",
|
"react-dnd-html5-backend": "^16.0.1",
|
||||||
@@ -3861,9 +3861,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mui/x-data-grid": {
|
"node_modules/@mui/x-data-grid": {
|
||||||
"version": "7.27.2",
|
"version": "7.27.3",
|
||||||
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.27.2.tgz",
|
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-7.27.3.tgz",
|
||||||
"integrity": "sha512-Nj6PWp6WN0gkps676j1Jai3mP1fQotJbqMTvllU7LwQp09S/RE/uJicYdqfeWQLxtQipWm5dnAY63gzsTiAHGA==",
|
"integrity": "sha512-7zbDbFrhV6ODjyn3ImOZG34nbMbCvmHgqYTYP273TNAj8hMy4BiLyiKFFZTzVddIj3KQ6qLzBpByhqifGgEDOg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.25.7",
|
"@babel/runtime": "^7.25.7",
|
||||||
@@ -3899,9 +3899,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mui/x-date-pickers": {
|
"node_modules/@mui/x-date-pickers": {
|
||||||
"version": "7.27.1",
|
"version": "7.27.3",
|
||||||
"resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.27.1.tgz",
|
"resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.27.3.tgz",
|
||||||
"integrity": "sha512-2YPhTM9TM39dmIkEQdSB6P6NASePB9LuhXXKQqq0PX4FXGymYEPz/acQXkk617zwfxJJaDhJZ6g8SAv5pklTJQ==",
|
"integrity": "sha512-igfKTPC4ZVCmS5j/NXcXBtj/hHseQHzRpCpIB1PMnJGhMdRYXnz8qZz5XhlNBKlzJVXkGu6Uil+obZpCLNj1xg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.25.7",
|
"@babel/runtime": "^7.25.7",
|
||||||
@@ -4692,9 +4692,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@reduxjs/toolkit": {
|
"node_modules/@reduxjs/toolkit": {
|
||||||
"version": "2.6.0",
|
"version": "2.6.1",
|
||||||
"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.1.tgz",
|
||||||
"integrity": "sha512-mWJCYpewLRyTuuzRSEC/IwIBBkYg2dKtQas8mty5MaV2iXzcmicS3gW554FDeOvLnY3x13NIk8MB1e8wHO7rqQ==",
|
"integrity": "sha512-SSlIqZNYhqm/oMkXbtofwZSt9lrncblzo6YcZ9zoX+zLngRBrCOjK4lNLdkNucJF58RHOWrD9txT3bT3piH7Zw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"immer": "^10.0.3",
|
"immer": "^10.0.3",
|
||||||
@@ -9189,9 +9189,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/axios": {
|
"node_modules/axios": {
|
||||||
"version": "1.8.1",
|
"version": "1.8.2",
|
||||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz",
|
"resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz",
|
||||||
"integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==",
|
"integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"follow-redirects": "^1.15.6",
|
"follow-redirects": "^1.15.6",
|
||||||
@@ -14848,19 +14848,20 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/mui-color-input": {
|
"node_modules/mui-color-input": {
|
||||||
"version": "5.0.1",
|
"version": "6.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/mui-color-input/-/mui-color-input-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/mui-color-input/-/mui-color-input-6.0.0.tgz",
|
||||||
"integrity": "sha512-50Ws4vhg4UPQSZEZDCNc7vyUBSb9x1bK+bO1o0wxJvQYgeSyg2r7mYDlavpCh+ZvisgBL/98y0GVN6M9901JWg==",
|
"integrity": "sha512-F9n/RqPLq7fnPWeF53/qssbIHvart7clpOfE+f+dsM+3ddfawwg98+PEhzv3cdAYlJLE9zfVViVTsp/ckUUd3g==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ctrl/tinycolor": "^4.1.0"
|
"@ctrl/tinycolor": "^4.1.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@emotion/react": "^11.5.0",
|
"@emotion/react": "^11.13.0",
|
||||||
"@emotion/styled": "^11.3.0",
|
"@emotion/styled": "^11.13.0",
|
||||||
"@mui/material": "^6.0.0",
|
"@mui/material": "^6.0.0",
|
||||||
"@types/react": "^18.0.0",
|
"@types/react": "^18.0.0 || ^19.0.0",
|
||||||
"react": "^18.0.0",
|
"react": "^18.0.0 || ^19.0.0",
|
||||||
"react-dom": "^18.0.0"
|
"react-dom": "^18.0.0 || ^19.0.0"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
"@types/react": {
|
"@types/react": {
|
||||||
|
|||||||
+4
-4
@@ -16,12 +16,12 @@
|
|||||||
"@fontsource/roboto": "^5.0.13",
|
"@fontsource/roboto": "^5.0.13",
|
||||||
"@hello-pangea/dnd": "^18.0.0",
|
"@hello-pangea/dnd": "^18.0.0",
|
||||||
"@mui/x-charts": "^7.5.1",
|
"@mui/x-charts": "^7.5.1",
|
||||||
"@mui/x-data-grid": "7.27.2",
|
"@mui/x-data-grid": "7.27.3",
|
||||||
"@mui/x-date-pickers": "7.27.1",
|
"@mui/x-date-pickers": "7.27.3",
|
||||||
"@mui/icons-material": "6.4.7",
|
"@mui/icons-material": "6.4.7",
|
||||||
"@mui/lab": "6.0.0-beta.30",
|
"@mui/lab": "6.0.0-beta.30",
|
||||||
"@mui/material": "6.4.7",
|
"@mui/material": "6.4.7",
|
||||||
"@reduxjs/toolkit": "2.6.0",
|
"@reduxjs/toolkit": "2.6.1",
|
||||||
"@solana/wallet-adapter-base": "0.9.23",
|
"@solana/wallet-adapter-base": "0.9.23",
|
||||||
"@solana/wallet-adapter-material-ui": "0.16.34",
|
"@solana/wallet-adapter-material-ui": "0.16.34",
|
||||||
"@solana/wallet-adapter-react": "0.15.35",
|
"@solana/wallet-adapter-react": "0.15.35",
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
"immutability-helper": "^3.1.1",
|
"immutability-helper": "^3.1.1",
|
||||||
"joi": "17.13.3",
|
"joi": "17.13.3",
|
||||||
"maplibre-gl": "5.2.0",
|
"maplibre-gl": "5.2.0",
|
||||||
"mui-color-input": "^5.0.1",
|
"mui-color-input": "^6.0.0",
|
||||||
"react": "18.3.1",
|
"react": "18.3.1",
|
||||||
"react-dnd": "^16.0.1",
|
"react-dnd": "^16.0.1",
|
||||||
"react-dnd-html5-backend": "^16.0.1",
|
"react-dnd-html5-backend": "^16.0.1",
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ const DistributedUptimeMap = ({
|
|||||||
type: "Feature",
|
type: "Feature",
|
||||||
geometry: {
|
geometry: {
|
||||||
type: "Point",
|
type: "Point",
|
||||||
coordinates: [check.lng, check.lat],
|
coordinates: [check._id.lng, check._id.lat],
|
||||||
},
|
},
|
||||||
properties: {
|
properties: {
|
||||||
color: theme.palette.accent.main,
|
color: theme.palette.accent.main,
|
||||||
|
|||||||
+1
-1
@@ -75,7 +75,7 @@ CustomToolTip.propTypes = {
|
|||||||
PropTypes.shape({
|
PropTypes.shape({
|
||||||
value: PropTypes.number,
|
value: PropTypes.number,
|
||||||
payload: PropTypes.shape({
|
payload: PropTypes.shape({
|
||||||
_id: PropTypes.string,
|
_id: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
|
||||||
avgResponseTime: PropTypes.number,
|
avgResponseTime: PropTypes.number,
|
||||||
originalAvgResponseTime: PropTypes.number,
|
originalAvgResponseTime: PropTypes.number,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ const StatBoxes = ({ monitor, lastUpdateTrigger }) => {
|
|||||||
heading={"Last check"}
|
heading={"Last check"}
|
||||||
subHeading={
|
subHeading={
|
||||||
<LastUpdate
|
<LastUpdate
|
||||||
lastUpdateTime={monitor?.timeSinceLastCheck ?? 0}
|
lastUpdateTime={monitor?.timeSinceLastCheck}
|
||||||
suffix={"seconds ago"}
|
suffix={"seconds ago"}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ const StatusHeader = ({ monitor, connectionStatus, elementToCapture }) => {
|
|||||||
backgroundColor={theme.palette.successSecondary.lowContrast}
|
backgroundColor={theme.palette.successSecondary.lowContrast}
|
||||||
color={theme.palette.success.lowContrast}
|
color={theme.palette.success.lowContrast}
|
||||||
>
|
>
|
||||||
Uptime: {(monitor.totalUptime * 100).toFixed(2)}%
|
Uptime: {(monitor.uptimePercentage * 100).toFixed(2)}%
|
||||||
</Typography>
|
</Typography>
|
||||||
</Stack>
|
</Stack>
|
||||||
<Typography
|
<Typography
|
||||||
@@ -69,7 +69,7 @@ const StatusHeader = ({ monitor, connectionStatus, elementToCapture }) => {
|
|||||||
Last updated{" "}
|
Last updated{" "}
|
||||||
<LastUpdate
|
<LastUpdate
|
||||||
suffix={"seconds ago"}
|
suffix={"seconds ago"}
|
||||||
lastUpdateTime={monitor.timeSinceLastCheck}
|
lastUpdateTime={monitor?.timeSinceLastCheck}
|
||||||
/>
|
/>
|
||||||
</Typography>
|
</Typography>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
Reference in new issue
Block a user