From ecd1282c4d5ee81d21ff8168d174fdcf96f246e3 Mon Sep 17 00:00:00 2001 From: Shaikh Mohd Mudassir Hussain <84413543+Shaikh-Mudassir@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:27:02 -0700 Subject: [PATCH 01/16] Added a gap between label and inputs #1270 --- .../src/Components/TabPanels/Account/PasswordPanel.jsx | 10 +++++++--- .../src/Components/TabPanels/Account/ProfilePanel.jsx | 5 ++++- Client/src/Components/TabPanels/Account/TeamPanel.jsx | 9 ++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx index ae322156c..0ea48138e 100644 --- a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx +++ b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx @@ -21,6 +21,10 @@ const PasswordPanel = () => { const theme = useTheme(); const dispatch = useDispatch(); + // Define the constant for consistent gap + const SPACING_GAP = theme.spacing(12); // EDITED: Added a constant for gap size. + + //redux state const { authToken, isLoading } = useSelector((state) => state.auth); @@ -127,7 +131,7 @@ const PasswordPanel = () => { direction="row" justifyContent={"flex-start"} alignItems={"center"} - gap={theme.spacing(8)} + gap={SPACING_GAP} // Replaced gap with SPACING_GAP constant flexWrap={"wrap"} > { { { const theme = useTheme(); const dispatch = useDispatch(); + + // Define the constant for consistent gap + const SPACING_GAP = theme.spacing(12); //redux state const { user, authToken, isLoading } = useSelector((state) => state.auth); @@ -223,7 +226,7 @@ const ProfilePanel = () => { className="edit-profile-form" noValidate spellCheck="false" - gap={theme.spacing(20)} + gap={SPACING_GAP} // Applied SPACING_GAP for consistent spacing > diff --git a/Client/src/Components/TabPanels/Account/TeamPanel.jsx b/Client/src/Components/TabPanels/Account/TeamPanel.jsx index 74fae01c6..6e2337370 100644 --- a/Client/src/Components/TabPanels/Account/TeamPanel.jsx +++ b/Client/src/Components/TabPanels/Account/TeamPanel.jsx @@ -30,6 +30,9 @@ const TeamPanel = () => { const theme = useTheme(); + // Define the constant for consistent gap + const SPACING_GAP = theme.spacing(12); + const { authToken, user } = useSelector((state) => state.auth); //TODO // const [orgStates, setOrgStates] = useState({ @@ -228,7 +231,7 @@ const TeamPanel = () => { {/* Organization name - + { component="form" noValidate spellCheck="false" - gap={theme.spacing(12)} + gap={SPACING_GAP} // Added a constant Spacing gap > Team members { theme={theme} > Date: Thu, 5 Dec 2024 07:20:38 +0530 Subject: [PATCH 02/16] feat: design corrected #1275 : Current Password Field BG color --- Client/src/Utils/Theme/globalTheme.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js index 95f6bf578..d0ae1610a 100644 --- a/Client/src/Utils/Theme/globalTheme.js +++ b/Client/src/Utils/Theme/globalTheme.js @@ -237,6 +237,11 @@ const baseTheme = (palette) => ({ WebkitTextFillColor: "unset", }, }, + "& .MuiInputBase-input:-webkit-autofill": { + transition: "background-color 5000s ease-in-out 0s", // Long transition to override autofill background + WebkitBoxShadow: `0 0 0px 1000px ${theme.palette.background.main} inset`, // Match your theme's background color + WebkitTextFillColor: theme.palette.text.primary, // Match text color + }, "& .MuiInputBase-input.MuiOutlinedInput-input": { padding: "0 var(--env-var-spacing-1-minus) !important", }, From 09a704775a286de42a2c42bf808dd5f65d2cd5c6 Mon Sep 17 00:00:00 2001 From: Saksham Date: Thu, 5 Dec 2024 07:30:28 +0530 Subject: [PATCH 03/16] feat: design corrected #1275 : Current Password Field BG color:updated-removed comments --- Client/src/Utils/Theme/globalTheme.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Client/src/Utils/Theme/globalTheme.js b/Client/src/Utils/Theme/globalTheme.js index d0ae1610a..eafe2f859 100644 --- a/Client/src/Utils/Theme/globalTheme.js +++ b/Client/src/Utils/Theme/globalTheme.js @@ -238,9 +238,9 @@ const baseTheme = (palette) => ({ }, }, "& .MuiInputBase-input:-webkit-autofill": { - transition: "background-color 5000s ease-in-out 0s", // Long transition to override autofill background - WebkitBoxShadow: `0 0 0px 1000px ${theme.palette.background.main} inset`, // Match your theme's background color - WebkitTextFillColor: theme.palette.text.primary, // Match text color + transition: "background-color 5000s ease-in-out 0s", + WebkitBoxShadow: `0 0 0px 1000px ${theme.palette.background.main} inset`, + WebkitTextFillColor: theme.palette.text.primary, }, "& .MuiInputBase-input.MuiOutlinedInput-input": { padding: "0 var(--env-var-spacing-1-minus) !important", From d188efa9eeb43d9c434827d946cf69670cf7b29f Mon Sep 17 00:00:00 2001 From: Gaurav Date: Thu, 5 Dec 2024 17:29:12 +0530 Subject: [PATCH 04/16] fixed issue with the alignment in JWT section --- Client/src/Components/Inputs/Select/index.jsx | 6 ++++-- Client/src/Pages/AdvancedSettings/index.jsx | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Client/src/Components/Inputs/Select/index.jsx b/Client/src/Components/Inputs/Select/index.jsx index 8517c3214..2804a76f3 100644 --- a/Client/src/Components/Inputs/Select/index.jsx +++ b/Client/src/Components/Inputs/Select/index.jsx @@ -49,6 +49,7 @@ const Select = ({ onBlur, sx, name = "", + labelControlSpacing = 2, }) => { const theme = useTheme(); const itemStyles = { @@ -57,10 +58,10 @@ const Select = ({ borderRadius: theme.shape.borderRadius, margin: theme.spacing(2), }; - + return ( {label && ( @@ -144,6 +145,7 @@ Select.propTypes = { onChange: PropTypes.func.isRequired, onBlur: PropTypes.func, sx: PropTypes.object, + labelControlSpacing:PropTypes.number, }; export default Select; diff --git a/Client/src/Pages/AdvancedSettings/index.jsx b/Client/src/Pages/AdvancedSettings/index.jsx index 35f0e4c85..90bcf21d6 100644 --- a/Client/src/Pages/AdvancedSettings/index.jsx +++ b/Client/src/Pages/AdvancedSettings/index.jsx @@ -270,6 +270,7 @@ const AdvancedSettings = ({ isAdmin }) => { onChange={handleJWTTTLUnits} onBlur={handleBlur} error={errors.jwtTTLUnits} + labelControlSpacing={0} /> Date: Thu, 5 Dec 2024 17:46:55 +0530 Subject: [PATCH 05/16] added a space before proptype --- Client/src/Components/Inputs/Select/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Components/Inputs/Select/index.jsx b/Client/src/Components/Inputs/Select/index.jsx index 2804a76f3..ea9509c87 100644 --- a/Client/src/Components/Inputs/Select/index.jsx +++ b/Client/src/Components/Inputs/Select/index.jsx @@ -145,7 +145,7 @@ Select.propTypes = { onChange: PropTypes.func.isRequired, onBlur: PropTypes.func, sx: PropTypes.object, - labelControlSpacing:PropTypes.number, + labelControlSpacing: PropTypes.number, }; export default Select; From a912b6752cd8f5f0210a086bdb3c40d06c5e28f8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 6 Dec 2024 05:01:19 +0000 Subject: [PATCH 06/16] chore(deps): update react monorepo --- Client/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index b24ef8cad..1cd33ee81 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -2360,9 +2360,9 @@ "license": "MIT" }, "node_modules/@types/react": { - "version": "18.3.13", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.13.tgz", - "integrity": "sha512-ii/gswMmOievxAJed4PAHT949bpYjPKXvXo1v6cRB/kqc2ZR4n+SgyCyvyc5Fec5ez8VnUumI1Vk7j6fRyRogg==", + "version": "18.3.14", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.14.tgz", + "integrity": "sha512-NzahNKvjNhVjuPBQ+2G7WlxstQ+47kXZNHlUvFakDViuIEfGY926GqhMueQFZ7woG+sPiQKlF36XfrIUVSUfFg==", "license": "MIT", "dependencies": { "@types/prop-types": "*", @@ -2370,13 +2370,13 @@ } }, "node_modules/@types/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==", + "version": "18.3.2", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.2.tgz", + "integrity": "sha512-Fqp+rcvem9wEnGr3RY8dYNvSQ8PoLqjZ9HLgaPUOjJJD120uDyOxOjc/39M4Kddp9JQCxpGQbnhVQF0C0ncYVg==", "dev": true, "license": "MIT", "dependencies": { - "@types/react": "*" + "@types/react": "^18" } }, "node_modules/@types/react-transition-group": { From 707a13c3c51b21c73dbef28b4f442e76acd9c6ff Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 6 Dec 2024 05:01:27 +0000 Subject: [PATCH 07/16] fix(deps): update dependency bullmq to v5.31.2 --- Server/package-lock.json | 8 ++++---- Server/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Server/package-lock.json b/Server/package-lock.json index f2d3c7983..06ba3d77b 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "axios": "^1.7.2", "bcrypt": "^5.1.1", - "bullmq": "5.31.1", + "bullmq": "5.31.2", "cors": "^2.8.5", "dockerode": "4.0.2", "dotenv": "^16.4.5", @@ -1218,9 +1218,9 @@ } }, "node_modules/bullmq": { - "version": "5.31.1", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.31.1.tgz", - "integrity": "sha512-otkHjMd0pscUgqDBTjGchdBCavB0ZQRNN/YLsJ4kKw0rf1NpXJOyORjOQVkypLffu/06IuXII3ZN+kJqD+Wo8g==", + "version": "5.31.2", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.31.2.tgz", + "integrity": "sha512-MUW6j1V79NRnrGZtxKyfyTv/YJ5Ljy0IrbMElpuQNCaLXoXEcCtU6kwdGiHxso9dUi1Wp4yo3GYEGg8vyWWLsw==", "license": "MIT", "dependencies": { "cron-parser": "^4.6.0", diff --git a/Server/package.json b/Server/package.json index 2e131f0e2..bd18b3c3b 100644 --- a/Server/package.json +++ b/Server/package.json @@ -14,7 +14,7 @@ "dependencies": { "axios": "^1.7.2", "bcrypt": "^5.1.1", - "bullmq": "5.31.1", + "bullmq": "5.31.2", "cors": "^2.8.5", "dockerode": "4.0.2", "dotenv": "^16.4.5", From b4cce16931544319fdf47a1ee3e40af91b8909fc Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 6 Dec 2024 13:18:59 +0800 Subject: [PATCH 08/16] fix links in create infra monitor page --- Client/src/Pages/Infrastructure/CreateMonitor/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx b/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx index f89e21915..f1d2d0ce2 100644 --- a/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx +++ b/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx @@ -210,8 +210,8 @@ const CreateInfrastructureMonitor = () => { Date: Fri, 6 Dec 2024 01:47:47 -0700 Subject: [PATCH 09/16] Comments were removed and spacing was added to all the stacks issue #1270 --- .../Components/TabPanels/Account/PasswordPanel.jsx | 9 ++++----- .../src/Components/TabPanels/Account/ProfilePanel.jsx | 11 +++++------ Client/src/Components/TabPanels/Account/TeamPanel.jsx | 5 ++--- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx index 0ea48138e..32ab131b8 100644 --- a/Client/src/Components/TabPanels/Account/PasswordPanel.jsx +++ b/Client/src/Components/TabPanels/Account/PasswordPanel.jsx @@ -21,9 +21,8 @@ const PasswordPanel = () => { const theme = useTheme(); const dispatch = useDispatch(); - // Define the constant for consistent gap - const SPACING_GAP = theme.spacing(12); // EDITED: Added a constant for gap size. + const SPACING_GAP = theme.spacing(12); //redux state const { authToken, isLoading } = useSelector((state) => state.auth); @@ -131,7 +130,7 @@ const PasswordPanel = () => { direction="row" justifyContent={"flex-start"} alignItems={"center"} - gap={SPACING_GAP} // Replaced gap with SPACING_GAP constant + gap={SPACING_GAP} flexWrap={"wrap"} > { { { const theme = useTheme(); const dispatch = useDispatch(); - // Define the constant for consistent gap const SPACING_GAP = theme.spacing(12); //redux state @@ -226,9 +225,9 @@ const ProfilePanel = () => { className="edit-profile-form" noValidate spellCheck="false" - gap={SPACING_GAP} // Applied SPACING_GAP for consistent spacing + gap={SPACING_GAP} > - + First name @@ -243,7 +242,7 @@ const ProfilePanel = () => { flex={1} /> - + Last name @@ -258,7 +257,7 @@ const ProfilePanel = () => { flex={1} /> - + Email { flex={1} /> - + Your photo { const theme = useTheme(); - // Define the constant for consistent gap const SPACING_GAP = theme.spacing(12); const { authToken, user } = useSelector((state) => state.auth); @@ -278,7 +277,7 @@ const TeamPanel = () => { component="form" noValidate spellCheck="false" - gap={SPACING_GAP} // Added a constant Spacing gap + gap={SPACING_GAP} > Team members { theme={theme} > Date: Sun, 8 Dec 2024 18:01:50 +0000 Subject: [PATCH 10/16] fix(deps): update dependency bullmq to v5.32.0 --- Server/package-lock.json | 8 ++++---- Server/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Server/package-lock.json b/Server/package-lock.json index 06ba3d77b..11081ae2a 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "axios": "^1.7.2", "bcrypt": "^5.1.1", - "bullmq": "5.31.2", + "bullmq": "5.32.0", "cors": "^2.8.5", "dockerode": "4.0.2", "dotenv": "^16.4.5", @@ -1218,9 +1218,9 @@ } }, "node_modules/bullmq": { - "version": "5.31.2", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.31.2.tgz", - "integrity": "sha512-MUW6j1V79NRnrGZtxKyfyTv/YJ5Ljy0IrbMElpuQNCaLXoXEcCtU6kwdGiHxso9dUi1Wp4yo3GYEGg8vyWWLsw==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.32.0.tgz", + "integrity": "sha512-zNf/DrbCbH+H8fgMshu33OGwrkUZP3c/CyJeFHauglEy5U6Fd9r52ujItRiT1PIODHIG6pCIdWMbpJGCf+Wuxg==", "license": "MIT", "dependencies": { "cron-parser": "^4.6.0", diff --git a/Server/package.json b/Server/package.json index bd18b3c3b..eacbd77b1 100644 --- a/Server/package.json +++ b/Server/package.json @@ -14,7 +14,7 @@ "dependencies": { "axios": "^1.7.2", "bcrypt": "^5.1.1", - "bullmq": "5.31.2", + "bullmq": "5.32.0", "cors": "^2.8.5", "dockerode": "4.0.2", "dotenv": "^16.4.5", From 7e9383d0ebe15b6faab37dedef6b43edad3110f7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 9 Dec 2024 10:06:23 +0000 Subject: [PATCH 11/16] fix(deps): update dependency bullmq to v5.33.0 --- Server/package-lock.json | 8 ++++---- Server/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Server/package-lock.json b/Server/package-lock.json index 11081ae2a..fc62aa925 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "axios": "^1.7.2", "bcrypt": "^5.1.1", - "bullmq": "5.32.0", + "bullmq": "5.33.0", "cors": "^2.8.5", "dockerode": "4.0.2", "dotenv": "^16.4.5", @@ -1218,9 +1218,9 @@ } }, "node_modules/bullmq": { - "version": "5.32.0", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.32.0.tgz", - "integrity": "sha512-zNf/DrbCbH+H8fgMshu33OGwrkUZP3c/CyJeFHauglEy5U6Fd9r52ujItRiT1PIODHIG6pCIdWMbpJGCf+Wuxg==", + "version": "5.33.0", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.33.0.tgz", + "integrity": "sha512-dICdidv1x+umYyA0DqlnCPa1sgHjtHo6gzyww5E10OQq+k9saT2B/rIP8pQbo8HhN/fRViYjJP/+7s8594/xdw==", "license": "MIT", "dependencies": { "cron-parser": "^4.6.0", diff --git a/Server/package.json b/Server/package.json index eacbd77b1..44a02a5ae 100644 --- a/Server/package.json +++ b/Server/package.json @@ -14,7 +14,7 @@ "dependencies": { "axios": "^1.7.2", "bcrypt": "^5.1.1", - "bullmq": "5.32.0", + "bullmq": "5.33.0", "cors": "^2.8.5", "dockerode": "4.0.2", "dotenv": "^16.4.5", From d649c53249904a6e5e35d1acc690eb1c2d501b81 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 9 Dec 2024 10:06:34 +0000 Subject: [PATCH 12/16] fix(deps): update emotion monorepo to v11.14.0 --- Client/package-lock.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index 1cd33ee81..14e12ccae 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -352,9 +352,9 @@ } }, "node_modules/@emotion/cache": { - "version": "11.13.5", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.5.tgz", - "integrity": "sha512-Z3xbtJ+UcK76eWkagZ1onvn/wAVb1GOMuR15s30Fm2wrMgC7jzpnO2JZXr4eujTTqoQFUrZIw/rT0c6Zzjca1g==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz", + "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==", "license": "MIT", "dependencies": { "@emotion/memoize": "^0.9.0", @@ -386,16 +386,16 @@ "license": "MIT" }, "node_modules/@emotion/react": { - "version": "11.13.5", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.5.tgz", - "integrity": "sha512-6zeCUxUH+EPF1s+YF/2hPVODeV/7V07YU5x+2tfuRL8MdW6rv5vb2+CBEGTGwBdux0OIERcOS+RzxeK80k2DsQ==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz", + "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", - "@emotion/cache": "^11.13.5", + "@emotion/cache": "^11.14.0", "@emotion/serialize": "^1.3.3", - "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", "@emotion/utils": "^1.4.2", "@emotion/weak-memoize": "^0.4.0", "hoist-non-react-statics": "^3.3.1" @@ -429,16 +429,16 @@ "license": "MIT" }, "node_modules/@emotion/styled": { - "version": "11.13.5", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.13.5.tgz", - "integrity": "sha512-gnOQ+nGLPvDXgIx119JqGalys64lhMdnNQA9TMxhDA4K0Hq5+++OE20Zs5GxiCV9r814xQ2K5WmtofSpHVW6BQ==", + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.0.tgz", + "integrity": "sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.13.5", "@emotion/is-prop-valid": "^1.3.0", "@emotion/serialize": "^1.3.3", - "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0", + "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0", "@emotion/utils": "^1.4.2" }, "peerDependencies": { @@ -458,9 +458,9 @@ "license": "MIT" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz", - "integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz", + "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==", "license": "MIT", "peerDependencies": { "react": ">=16.8.0" From dc81a0e51b02a4dabc731356c9f35c8fd90b3a82 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 9 Dec 2024 20:38:33 +0000 Subject: [PATCH 13/16] chore(deps): update dependency @types/react-dom to v18.3.3 --- Client/package-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Client/package-lock.json b/Client/package-lock.json index 1cd33ee81..b1da81440 100644 --- a/Client/package-lock.json +++ b/Client/package-lock.json @@ -2370,13 +2370,13 @@ } }, "node_modules/@types/react-dom": { - "version": "18.3.2", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.2.tgz", - "integrity": "sha512-Fqp+rcvem9wEnGr3RY8dYNvSQ8PoLqjZ9HLgaPUOjJJD120uDyOxOjc/39M4Kddp9JQCxpGQbnhVQF0C0ncYVg==", + "version": "18.3.3", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.3.tgz", + "integrity": "sha512-uTYkxTLkYp41nq/ULXyXMtkNT1vu5fXJoqad6uTNCOGat5t9cLgF4vMNLBXsTOXpdOI44XzKPY1M5RRm0bQHuw==", "dev": true, "license": "MIT", - "dependencies": { - "@types/react": "^18" + "peerDependencies": { + "@types/react": "^18.0.0" } }, "node_modules/@types/react-transition-group": { From 97b565a6ad93d7909d3409483d7daeb068ff938c Mon Sep 17 00:00:00 2001 From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:20:18 -0500 Subject: [PATCH 14/16] Update README.md --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dd04bbbfb..5d6ec2922 100644 --- a/README.md +++ b/README.md @@ -68,11 +68,12 @@ We pride ourselves on building strong connections with contributors at every lev Here's how you can contribute: -- Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md). -- Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only. -- Open an issue if you believe you've encountered a bug -- Check for good-first-issue's if you are a newcomer -- Make a pull request to add new features/make quality-of-life improvements/fix bugs. +0. Star this repo :) +1. Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md). +2. Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only. +3. Open an issue if you believe you've encountered a bug +4. Check for good-first-issue's if you are a newcomer +5. Make a pull request to add new features/make quality-of-life improvements/fix bugs. From 1622e48fc0c3f0058fddfcb6f020eab9ba6a8610 Mon Sep 17 00:00:00 2001 From: Rishistav Date: Mon, 9 Dec 2024 16:31:36 -0500 Subject: [PATCH 15/16] Fix Sidebar height to occupy viewport height --- Client/src/Components/Sidebar/index.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index 4c274409b..00a32a8d3 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -262,7 +262,11 @@ function Sidebar() { Menu } - sx={{ px: theme.spacing(6) }} + sx={{ + px: theme.spacing(6), + height: "100%", + overflow: "hidden" + }} > {menu.map((item) => item.path ? ( From 151500def6940b92ec13f58021a737f077ddd07c Mon Sep 17 00:00:00 2001 From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com> Date: Tue, 10 Dec 2024 01:31:40 -0500 Subject: [PATCH 16/16] Add screenshots --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 5d6ec2922..aec89be80 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,14 @@ We've just launched our [Discussions](https://github.com/bluewave-labs/bluewave- - DNS monitoring - SSL monitoring +## 🏗️ Screenshots + +![Group 3765](https://github.com/user-attachments/assets/8e8144f2-a769-4707-8ea1-99cf758284a8) + +![Group 3768](https://github.com/user-attachments/assets/05aed2f2-2cf7-487f-879b-cf8bfb0e9241) + +![Group 3768-1](https://github.com/user-attachments/assets/d4ee4bcf-4d69-4e4a-9bce-fd3541129c24) + ## 🏗️ Tech stack - [ReactJs](https://react.dev/)