From 23672cbf34503427a96642a45685c9d307612024 Mon Sep 17 00:00:00 2001 From: Jasneet Singh Date: Sat, 22 Feb 2025 10:15:17 -0500 Subject: [PATCH 01/25] Enhance wallet button layout for better responsiveness and alignment. --- src/Pages/Settings/index.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Pages/Settings/index.jsx b/src/Pages/Settings/index.jsx index 04b8658dc..a8fc3c3c0 100644 --- a/src/Pages/Settings/index.jsx +++ b/src/Pages/Settings/index.jsx @@ -375,9 +375,10 @@ const Settings = () => { - - + + From 591c531192116d1e5e0b0ebfe76ad353e24f0262 Mon Sep 17 00:00:00 2001 From: Jasneet Singh Date: Sat, 22 Feb 2025 16:00:10 -0500 Subject: [PATCH 02/25] updated --- src/Pages/Settings/index.jsx | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/Pages/Settings/index.jsx b/src/Pages/Settings/index.jsx index a8fc3c3c0..dbc59073d 100644 --- a/src/Pages/Settings/index.jsx +++ b/src/Pages/Settings/index.jsx @@ -371,15 +371,32 @@ const Settings = () => { monitor to connect to multiple nodes globally. - - - - - + + + )} From 64166d25394df499e46ff540deb55b8410a61f3c Mon Sep 17 00:00:00 2001 From: Jasneet Singh Date: Mon, 24 Feb 2025 18:51:33 -0500 Subject: [PATCH 03/25] updated --- src/Pages/Settings/index.jsx | 46 +++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/src/Pages/Settings/index.jsx b/src/Pages/Settings/index.jsx index dbc59073d..b7104d71e 100644 --- a/src/Pages/Settings/index.jsx +++ b/src/Pages/Settings/index.jsx @@ -373,28 +373,46 @@ const Settings = () => { From 4b63076acc08699267faad23ce149b38038e2c31 Mon Sep 17 00:00:00 2001 From: Jasneet Singh Date: Fri, 28 Feb 2025 21:13:03 -0500 Subject: [PATCH 04/25] Add responsive styles for wallet components and integrate CSS --- src/Components/WalletProvider/index.css | 41 +++++++++++++++++++ src/Components/WalletProvider/index.jsx | 1 + src/Pages/Settings/index.jsx | 53 +++++-------------------- 3 files changed, 51 insertions(+), 44 deletions(-) create mode 100644 src/Components/WalletProvider/index.css diff --git a/src/Components/WalletProvider/index.css b/src/Components/WalletProvider/index.css new file mode 100644 index 000000000..2ba40c8b3 --- /dev/null +++ b/src/Components/WalletProvider/index.css @@ -0,0 +1,41 @@ +.wallet-adapter-dropdown { + width: 100%; +} + +.wallet-adapter-button { + width: 100%; + justify-content: center; + height: var(--button-height) !important; + font-size: var(--font-size-body) !important; + font-weight: var(--font-weight-medium) !important; + margin: var(--spacing-xs) 0; + white-space: nowrap; +} + +.wallet-adapter-modal-title { + font-size: var(--font-size-h5) !important; +} + +/* Separator styling */ +.wallet-adapter-modal-divider { + background-color: var(--border-color) !important; + margin: var(--spacing-md) 0 !important; +} + +/* Responsive fixes */ +@media (max-width: 1093px) { + .wallet-adapter-button { + padding: var(--spacing-xs) var(--spacing-sm) !important; + font-size: calc(var(--font-size-body) * 0.9) !important; + } +} + +@media (max-width: 910px) { + .wallet-adapter-modal-wrapper { + flex-direction: column !important; + } + + .wallet-adapter-modal-divider { + margin: var(--spacing-sm) 0 !important; + } +} \ No newline at end of file diff --git a/src/Components/WalletProvider/index.jsx b/src/Components/WalletProvider/index.jsx index a24124d93..9491c1d39 100644 --- a/src/Components/WalletProvider/index.jsx +++ b/src/Components/WalletProvider/index.jsx @@ -9,6 +9,7 @@ import { import { WalletModalProvider } from "@solana/wallet-adapter-react-ui"; import { clusterApiUrl } from "@solana/web3.js"; import PropTypes from "prop-types"; +import "./index.css"; // Default styles that can be overridden by your app import "@solana/wallet-adapter-react-ui/styles.css"; diff --git a/src/Pages/Settings/index.jsx b/src/Pages/Settings/index.jsx index b7104d71e..34a82204c 100644 --- a/src/Pages/Settings/index.jsx +++ b/src/Pages/Settings/index.jsx @@ -371,54 +371,19 @@ const Settings = () => { monitor to connect to multiple nodes globally. - - - + + + + + )} + About From da989a7708fdf4e139ef37951c36086db4b9c1d2 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Mon, 3 Mar 2025 11:27:43 -0500 Subject: [PATCH 05/25] Add Sidebar and StarPrompt components --- src/Components/Sidebar/index.jsx | 3 + src/Components/StarPrompt/index.jsx | 142 ++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 src/Components/StarPrompt/index.jsx diff --git a/src/Components/Sidebar/index.jsx b/src/Components/Sidebar/index.jsx index ee0071d4f..e1623e425 100644 --- a/src/Components/Sidebar/index.jsx +++ b/src/Components/Sidebar/index.jsx @@ -17,6 +17,7 @@ import { } from "@mui/material"; import ThemeSwitch from "../ThemeSwitch"; import Avatar from "../Avatar"; +import StarPrompt from "../StarPrompt"; import LockSvg from "../../assets/icons/lock.svg?react"; import UserSvg from "../../assets/icons/user.svg?react"; import TeamSvg from "../../assets/icons/user-two.svg?react"; @@ -590,6 +591,8 @@ function Sidebar() { + {!collapsed && } + { + const [isVisible, setIsVisible] = useState(false); + const [starCount, setStarCount] = useState('0'); + + useEffect(() => { + const fetchStarCount = async () => { + try { + const owner = 'bluewave-labs'; + const repo = 'checkmate'; + + const response = await fetch(`https://api.github.com/repos/${owner}/${repo}`); + const data = await response.json(); + + const count = data.stargazers_count; + const formattedCount = count >= 1000 + ? `${(count / 1000).toFixed(1)}k` + : count.toString(); + + setStarCount(formattedCount); + } catch (error) { + console.error('Error fetching star count:', error); + } + }; + + fetchStarCount(); + + const hasClosedPrompt = localStorage.getItem(storageKey); + if (!hasClosedPrompt) { + setIsVisible(true); + } + }, [storageKey]); + + const handleClose = () => { + localStorage.setItem(storageKey, 'true'); + setIsVisible(false); + }; + + const handleStarClick = () => { + window.open(repoUrl, '_blank'); + }; + + if (!isVisible) return null; + + return ( + + + + + {title} + + + + + + + + {description} + + + + + + Checkmate + + + {starCount} + + + + + ); +}; + +export default StarPrompt; From da2d41ca078282839e3c3ef44f405e3cd8df6038 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Mon, 3 Mar 2025 15:58:03 -0500 Subject: [PATCH 06/25] Modify --- src/Components/StarPrompt/index.css | 3 + src/Components/StarPrompt/index.jsx | 165 ++++++++++++---------------- 2 files changed, 74 insertions(+), 94 deletions(-) create mode 100644 src/Components/StarPrompt/index.css diff --git a/src/Components/StarPrompt/index.css b/src/Components/StarPrompt/index.css new file mode 100644 index 000000000..21f3b7237 --- /dev/null +++ b/src/Components/StarPrompt/index.css @@ -0,0 +1,3 @@ +.star-prompt .MuiTypography-root { + font-size: var(--env-var-font-size-medium); +} diff --git a/src/Components/StarPrompt/index.jsx b/src/Components/StarPrompt/index.jsx index 3f7b08f43..135a703d5 100644 --- a/src/Components/StarPrompt/index.jsx +++ b/src/Components/StarPrompt/index.jsx @@ -1,141 +1,118 @@ import React, { useState, useEffect } from 'react'; -import { Box, Typography, IconButton, Paper } from '@mui/material'; +import { Box, Typography, IconButton } from '@mui/material'; import CloseIcon from '@mui/icons-material/Close'; -import GitHubIcon from '@mui/icons-material/GitHub'; +import { useTheme } from '@emotion/react'; +import './index.css'; -const StarPrompt = ({ - repoUrl = 'https://github.com/bluewave-labs/checkmate', - title = 'Star Checkmate', - description = 'See the latest releases and help grow the community on GitHub', - storageKey = 'starPromptClosed' -}) => { +const StarPrompt = () => { const [isVisible, setIsVisible] = useState(false); - const [starCount, setStarCount] = useState('0'); + const STORAGE_KEY = 'starPromptClosed'; + const theme = useTheme(); useEffect(() => { - const fetchStarCount = async () => { - try { - const owner = 'bluewave-labs'; - const repo = 'checkmate'; - - const response = await fetch(`https://api.github.com/repos/${owner}/${repo}`); - const data = await response.json(); - - const count = data.stargazers_count; - const formattedCount = count >= 1000 - ? `${(count / 1000).toFixed(1)}k` - : count.toString(); - - setStarCount(formattedCount); - } catch (error) { - console.error('Error fetching star count:', error); - } - }; - - fetchStarCount(); - - const hasClosedPrompt = localStorage.getItem(storageKey); + const hasClosedPrompt = localStorage.getItem(STORAGE_KEY); if (!hasClosedPrompt) { setIsVisible(true); } - }, [storageKey]); + }, []); const handleClose = () => { - localStorage.setItem(storageKey, 'true'); + localStorage.setItem(STORAGE_KEY, 'true'); setIsVisible(false); }; const handleStarClick = () => { - window.open(repoUrl, '_blank'); + window.open('https://github.com/bluewave-labs/checkmate', '_blank'); }; if (!isVisible) return null; return ( - - - - - {title} + + + + Star Checkmate - + - - - {description} + + + See the latest releases and help grow the community on GitHub - - - Checkmate - - - {starCount} - - + /> - + ); }; From 825a2e2bc46dbe72bd7d8ac1f9f06335e45df30e Mon Sep 17 00:00:00 2001 From: Jasneet Singh Date: Tue, 4 Mar 2025 08:36:50 -0500 Subject: [PATCH 07/25] Refactor wallet component styles for improved responsiveness and alignment --- src/Components/WalletProvider/index.css | 34 ++++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/Components/WalletProvider/index.css b/src/Components/WalletProvider/index.css index 2ba40c8b3..784c75ace 100644 --- a/src/Components/WalletProvider/index.css +++ b/src/Components/WalletProvider/index.css @@ -1,15 +1,23 @@ .wallet-adapter-dropdown { - width: 100%; + width: 100%; + display: flex; + flex-wrap: wrap; + justify-content: center; + align-items: center; + gap: var(--env-var-spacing-1); } .wallet-adapter-button { - width: 100%; - justify-content: center; - height: var(--button-height) !important; - font-size: var(--font-size-body) !important; - font-weight: var(--font-weight-medium) !important; - margin: var(--spacing-xs) 0; - white-space: nowrap; + display: flex; + align-items: center; + justify-content: center; + width: auto; + height: var(--env-var-height-2) !important; + font-size: var(--env-var-font-size-medium-plus) !important; + font-weight: 500 !important; + margin: 0; + padding: calc((var(--env-var-height-2) - var(--env-var-font-size-medium-plus) * 1.2) / 2) var(--env-var-spacing-1); + white-space: nowrap; } .wallet-adapter-modal-title { @@ -24,10 +32,12 @@ /* Responsive fixes */ @media (max-width: 1093px) { - .wallet-adapter-button { - padding: var(--spacing-xs) var(--spacing-sm) !important; - font-size: calc(var(--font-size-body) * 0.9) !important; - } + .wallet-adapter-button { + font-size: var(--env-var-font-size-medium) !important; + padding: calc((var(--env-var-height-2) - var(--env-var-font-size-medium) * 1.2) / 2) + var(--env-var-spacing-1-minus) !important; + + } } @media (max-width: 910px) { From 6825f72808faa7983eb426bd928778885f539367 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Wed, 5 Mar 2025 20:36:52 -0500 Subject: [PATCH 08/25] StarPrompt typography changes --- src/Components/StarPrompt/index.css | 8 ++++++++ src/Components/StarPrompt/index.jsx | 9 +-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Components/StarPrompt/index.css b/src/Components/StarPrompt/index.css index 21f3b7237..29c5e4706 100644 --- a/src/Components/StarPrompt/index.css +++ b/src/Components/StarPrompt/index.css @@ -1,3 +1,11 @@ .star-prompt .MuiTypography-root { font-size: var(--env-var-font-size-medium); } + +.star-prompt .description { + font-family: Inter; + font-weight: 400; + font-size: 12px; + line-height: 14.53px; + letter-spacing: 0%; +} diff --git a/src/Components/StarPrompt/index.jsx b/src/Components/StarPrompt/index.jsx index 135a703d5..59ee4a796 100644 --- a/src/Components/StarPrompt/index.jsx +++ b/src/Components/StarPrompt/index.jsx @@ -53,10 +53,6 @@ const StarPrompt = () => { }}> { Date: Fri, 7 Mar 2025 10:08:55 -0500 Subject: [PATCH 09/25] Used default MUI Breakpoints and adjusted spacing between the wallet buttons --- src/Components/WalletProvider/index.css | 4 ++-- src/Pages/Settings/index.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/WalletProvider/index.css b/src/Components/WalletProvider/index.css index 784c75ace..15fb9d816 100644 --- a/src/Components/WalletProvider/index.css +++ b/src/Components/WalletProvider/index.css @@ -31,7 +31,7 @@ } /* Responsive fixes */ -@media (max-width: 1093px) { +@media (max-width: 1200px) { .wallet-adapter-button { font-size: var(--env-var-font-size-medium) !important; padding: calc((var(--env-var-height-2) - var(--env-var-font-size-medium) * 1.2) / 2) @@ -40,7 +40,7 @@ } } -@media (max-width: 910px) { +@media (max-width: 900px) { .wallet-adapter-modal-wrapper { flex-direction: column !important; } diff --git a/src/Pages/Settings/index.jsx b/src/Pages/Settings/index.jsx index 34a82204c..ab3799e76 100644 --- a/src/Pages/Settings/index.jsx +++ b/src/Pages/Settings/index.jsx @@ -371,7 +371,7 @@ const Settings = () => { monitor to connect to multiple nodes globally. - + Date: Fri, 7 Mar 2025 15:34:30 -0500 Subject: [PATCH 10/25] fix: improve StarPrompt component and remove unused CSS --- src/Components/StarPrompt/index.css | 11 -- src/Components/StarPrompt/index.jsx | 153 +++++++++++++--------------- src/Features/UI/uiSlice.js | 7 ++ src/locales/gb.json | 6 +- src/locales/tr.json | 6 +- 5 files changed, 88 insertions(+), 95 deletions(-) delete mode 100644 src/Components/StarPrompt/index.css diff --git a/src/Components/StarPrompt/index.css b/src/Components/StarPrompt/index.css deleted file mode 100644 index 29c5e4706..000000000 --- a/src/Components/StarPrompt/index.css +++ /dev/null @@ -1,11 +0,0 @@ -.star-prompt .MuiTypography-root { - font-size: var(--env-var-font-size-medium); -} - -.star-prompt .description { - font-family: Inter; - font-weight: 400; - font-size: 12px; - line-height: 14.53px; - letter-spacing: 0%; -} diff --git a/src/Components/StarPrompt/index.jsx b/src/Components/StarPrompt/index.jsx index 59ee4a796..74362c64c 100644 --- a/src/Components/StarPrompt/index.jsx +++ b/src/Components/StarPrompt/index.jsx @@ -1,111 +1,100 @@ -import React, { useState, useEffect } from 'react'; -import { Box, Typography, IconButton } from '@mui/material'; +import React from 'react'; +import { Typography, IconButton, Stack, Box } from '@mui/material'; import CloseIcon from '@mui/icons-material/Close'; import { useTheme } from '@emotion/react'; -import './index.css'; +import { useSelector, useDispatch } from 'react-redux'; +import { useTranslation } from 'react-i18next'; +import { setStarPromptClosed } from '../../Features/UI/uiSlice'; -const StarPrompt = () => { - const [isVisible, setIsVisible] = useState(false); - const STORAGE_KEY = 'starPromptClosed'; +const StarPrompt = ({ + repoUrl = 'https://github.com/bluewave-labs/checkmate' +}) => { const theme = useTheme(); - - useEffect(() => { - const hasClosedPrompt = localStorage.getItem(STORAGE_KEY); - if (!hasClosedPrompt) { - setIsVisible(true); - } - }, []); + const dispatch = useDispatch(); + const { t } = useTranslation(); + const isClosed = useSelector((state) => state.ui?.starPrompt?.closed ?? false); + const mode = useSelector((state) => state.ui.mode); const handleClose = () => { - localStorage.setItem(STORAGE_KEY, 'true'); - setIsVisible(false); + dispatch(setStarPromptClosed(true)); }; const handleStarClick = () => { - window.open('https://github.com/bluewave-labs/checkmate', '_blank'); + window.open(repoUrl, '_blank'); }; - if (!isVisible) return null; + if (isClosed) return null; return ( - - - - - Star Checkmate - - - - - - + - See the latest releases and help grow the community on GitHub + {t('starPrompt.title')} - - - - + > + + + + + + {t('starPrompt.description')} + + + + ); }; diff --git a/src/Features/UI/uiSlice.js b/src/Features/UI/uiSlice.js index ebafdbbf6..8f0e38ff1 100644 --- a/src/Features/UI/uiSlice.js +++ b/src/Features/UI/uiSlice.js @@ -24,6 +24,9 @@ const initialState = { timezone: "America/Toronto", distributedUptimeEnabled: false, language: "gb", + starPrompt: { + closed: false + }, }; const uiSlice = createSlice({ @@ -55,6 +58,9 @@ const uiSlice = createSlice({ setLanguage(state, action) { state.language = action.payload; }, + setStarPromptClosed(state, action) { + state.starPrompt.closed = action.payload; + }, }, }); @@ -67,4 +73,5 @@ export const { setTimezone, setDistributedUptimeEnabled, setLanguage, + setStarPromptClosed, } = uiSlice.actions; diff --git a/src/locales/gb.json b/src/locales/gb.json index cf7711fa8..36cc1d9ad 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -107,5 +107,9 @@ "settingsDemoMonitorsAdded": "Successfully added demo monitors", "settingsFailedToAddDemoMonitors": "Failed to add demo monitors", "settingsMonitorsDeleted": "Successfully deleted all monitors", - "settingsFailedToDeleteMonitors": "Failed to delete all monitors" + "settingsFailedToDeleteMonitors": "Failed to delete all monitors", + "starPrompt": { + "title": "Star Checkmate", + "description": "See the latest releases and help grow the community on GitHub" + } } diff --git a/src/locales/tr.json b/src/locales/tr.json index abd358548..c88287151 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -101,5 +101,9 @@ "settingsDemoMonitorsAdded": "Demo monitörler başarıyla eklendi", "settingsFailedToAddDemoMonitors": "Demo monitörler eklenemedi", "settingsMonitorsDeleted": "Tüm monitörler başarıyla silindi", - "settingsFailedToDeleteMonitors": "Monitörler silinemedi" + "settingsFailedToDeleteMonitors": "Monitörler silinemedi", + "starPrompt": { + "title": "Checkmate yıldızla değerlendirin", + "description": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun" + } } From c185979479bfba96e38e263871eebf76deddb607 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Fri, 7 Mar 2025 15:46:13 -0500 Subject: [PATCH 11/25] fix: handle undefined starPrompt state in Redux --- src/Features/UI/uiSlice.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Features/UI/uiSlice.js b/src/Features/UI/uiSlice.js index 8f0e38ff1..7ce9298b4 100644 --- a/src/Features/UI/uiSlice.js +++ b/src/Features/UI/uiSlice.js @@ -59,6 +59,9 @@ const uiSlice = createSlice({ state.language = action.payload; }, setStarPromptClosed(state, action) { + if (!state.starPrompt) { + state.starPrompt = {}; + } state.starPrompt.closed = action.payload; }, }, From 0f2832b728233670f044d5b49678deb0923ea06e Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Mon, 10 Mar 2025 14:23:09 -0400 Subject: [PATCH 12/25] simplify star prompt translations and state --- src/Components/StarPrompt/index.jsx | 12 ++++++------ src/Features/UI/uiSlice.js | 13 ++++--------- src/locales/gb.json | 2 ++ src/locales/tr.json | 2 ++ 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/Components/StarPrompt/index.jsx b/src/Components/StarPrompt/index.jsx index 74362c64c..8cbdd9da9 100644 --- a/src/Components/StarPrompt/index.jsx +++ b/src/Components/StarPrompt/index.jsx @@ -4,7 +4,7 @@ import CloseIcon from '@mui/icons-material/Close'; import { useTheme } from '@emotion/react'; import { useSelector, useDispatch } from 'react-redux'; import { useTranslation } from 'react-i18next'; -import { setStarPromptClosed } from '../../Features/UI/uiSlice'; +import { setStarPromptOpen } from '../../Features/UI/uiSlice'; const StarPrompt = ({ repoUrl = 'https://github.com/bluewave-labs/checkmate' @@ -12,18 +12,18 @@ const StarPrompt = ({ const theme = useTheme(); const dispatch = useDispatch(); const { t } = useTranslation(); - const isClosed = useSelector((state) => state.ui?.starPrompt?.closed ?? false); + const isOpen = useSelector((state) => state.ui?.starPromptOpen ?? true); const mode = useSelector((state) => state.ui.mode); const handleClose = () => { - dispatch(setStarPromptClosed(true)); + dispatch(setStarPromptOpen(false)); }; const handleStarClick = () => { window.open(repoUrl, '_blank'); }; - if (isClosed) return null; + if (!isOpen) return null; return ( - {t('starPrompt.title')} + {t('starPromptTitle')} - {t('starPrompt.description')} + {t('starPromptDescription')} { + state.starPromptOpen = action.payload; }, }, }); @@ -76,5 +71,5 @@ export const { setTimezone, setDistributedUptimeEnabled, setLanguage, - setStarPromptClosed, + setStarPromptOpen, } = uiSlice.actions; diff --git a/src/locales/gb.json b/src/locales/gb.json index 36cc1d9ad..fd12ee227 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -108,6 +108,8 @@ "settingsFailedToAddDemoMonitors": "Failed to add demo monitors", "settingsMonitorsDeleted": "Successfully deleted all monitors", "settingsFailedToDeleteMonitors": "Failed to delete all monitors", + "starPromptTitle": "Star Checkmate", + "starPromptDescription": "See the latest releases and help grow the community on GitHub", "starPrompt": { "title": "Star Checkmate", "description": "See the latest releases and help grow the community on GitHub" diff --git a/src/locales/tr.json b/src/locales/tr.json index c88287151..1c055216a 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -102,6 +102,8 @@ "settingsFailedToAddDemoMonitors": "Demo monitörler eklenemedi", "settingsMonitorsDeleted": "Tüm monitörler başarıyla silindi", "settingsFailedToDeleteMonitors": "Monitörler silinemedi", + "starPromptTitle": "Checkmate yıldızla değerlendirin", + "starPromptDescription": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun", "starPrompt": { "title": "Checkmate yıldızla değerlendirin", "description": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun" From 5c1976e10563c1786ac3b8a6ac0467067a79eef4 Mon Sep 17 00:00:00 2001 From: "Gorkem Cetin (BWL)" <167266851+gorkem-bwl@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:59:51 -0400 Subject: [PATCH 13/25] Create a workflow for first issue/pr. --- .github/workflows/first-issue-first-pr.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/workflows/first-issue-first-pr.yml diff --git a/.github/workflows/first-issue-first-pr.yml b/.github/workflows/first-issue-first-pr.yml new file mode 100644 index 000000000..98f6ef9de --- /dev/null +++ b/.github/workflows/first-issue-first-pr.yml @@ -0,0 +1,9 @@ + - name: First interaction + uses: actions/first-interaction@v1.3.0 + with: + # Token for the repository. Can be passed in using {{ secrets.GITHUB_TOKEN }} + repo-token: + # Comment to post on an individual's first issue + issue-message: Thanks for opening your first issue! :) # optional + # Comment to post on an individual's first pull request + pr-message: Thanks for creating your first PR! :) # optional From ffa9ddaf242cdb814e6ab6052a0f9d4eb8db5658 Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Mon, 10 Mar 2025 17:33:04 -0400 Subject: [PATCH 14/25] Modify json --- src/locales/gb.json | 7 ++----- src/locales/tr.json | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/locales/gb.json b/src/locales/gb.json index fd12ee227..0f4734ed9 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -109,9 +109,6 @@ "settingsMonitorsDeleted": "Successfully deleted all monitors", "settingsFailedToDeleteMonitors": "Failed to delete all monitors", "starPromptTitle": "Star Checkmate", - "starPromptDescription": "See the latest releases and help grow the community on GitHub", - "starPrompt": { - "title": "Star Checkmate", - "description": "See the latest releases and help grow the community on GitHub" - } + "starPromptDescription": "See the latest releases and help grow the community on GitHub" + } diff --git a/src/locales/tr.json b/src/locales/tr.json index 1c055216a..320c89c18 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -103,9 +103,5 @@ "settingsMonitorsDeleted": "Tüm monitörler başarıyla silindi", "settingsFailedToDeleteMonitors": "Monitörler silinemedi", "starPromptTitle": "Checkmate yıldızla değerlendirin", - "starPromptDescription": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun", - "starPrompt": { - "title": "Checkmate yıldızla değerlendirin", - "description": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun" - } + "starPromptDescription": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun" } From 1745faf70cec4ac8bc0157b98594c745a12e38eb Mon Sep 17 00:00:00 2001 From: mohadeseh safari Date: Mon, 10 Mar 2025 17:36:38 -0400 Subject: [PATCH 15/25] ti.json --- src/locales/tr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/tr.json b/src/locales/tr.json index 320c89c18..d93083871 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -102,6 +102,6 @@ "settingsFailedToAddDemoMonitors": "Demo monitörler eklenemedi", "settingsMonitorsDeleted": "Tüm monitörler başarıyla silindi", "settingsFailedToDeleteMonitors": "Monitörler silinemedi", - "starPromptTitle": "Checkmate yıldızla değerlendirin", - "starPromptDescription": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun" + "starPromptTitle": "Checkmate yıldızla değerlendirin", + "starPromptDescription": "En son sürümleri görün ve GitHub'daki topluluğun büyümesine yardımcı olun" } From cfb5cf024bfff49a908f03d43012f8d7a2084fcc Mon Sep 17 00:00:00 2001 From: Cihat ATA Date: Tue, 11 Mar 2025 00:43:37 +0300 Subject: [PATCH 16/25] Update poeditor-sync.yml --- .github/workflows/poeditor-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/poeditor-sync.yml b/.github/workflows/poeditor-sync.yml index 984b27f4f..1f1194e3e 100644 --- a/.github/workflows/poeditor-sync.yml +++ b/.github/workflows/poeditor-sync.yml @@ -55,7 +55,7 @@ jobs: - name: Download translations from POEditor env: - POEDITOR_API_TOKEN: ${{ secrets.POEDITOR_API }} + POEDITOR_API: ${{ secrets.POEDITOR_API }} POEDITOR_PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }} LANGUAGES: ${{ github.event.inputs.languages || 'tr,en' }} EXPORT_FORMAT: ${{ github.event.inputs.format || 'key_value_json' }} From 5958d4b81c743b998a93792775f5988247b39064 Mon Sep 17 00:00:00 2001 From: Br0wnHammer Date: Tue, 11 Mar 2025 03:23:04 +0530 Subject: [PATCH 17/25] Fix: Uptime UseChecks Hook --- src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx | 7 +++++-- src/Pages/Uptime/Details/index.jsx | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx index 51da1a20b..c067b1d2b 100644 --- a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx @@ -2,18 +2,21 @@ import { useState } from "react"; import { useEffect } from "react"; import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; -export const useChecksFetch = ({ monitorId, dateRange, page, rowsPerPage }) => { +export const useChecksFetch = ({ monitorId, monitorType, dateRange, page, rowsPerPage }) => { const [checks, setChecks] = useState(undefined); const [checksCount, setChecksCount] = useState(undefined); const [isLoading, setIsLoading] = useState(false); const [networkError, setNetworkError] = useState(false); useEffect(() => { + if (!monitorType) return; + const fetchChecks = async () => { try { setIsLoading(true); const res = await networkService.getChecksByMonitor({ monitorId: monitorId, + type: monitorType, sortOrder: "desc", limit: null, dateRange: dateRange, @@ -31,7 +34,7 @@ export const useChecksFetch = ({ monitorId, dateRange, page, rowsPerPage }) => { } }; fetchChecks(); - }, [monitorId, dateRange, page, rowsPerPage]); + }, [monitorId, monitorType, dateRange, page, rowsPerPage]); return [checks, checksCount, isLoading, networkError]; }; diff --git a/src/Pages/Uptime/Details/index.jsx b/src/Pages/Uptime/Details/index.jsx index d170f7b18..672640d67 100644 --- a/src/Pages/Uptime/Details/index.jsx +++ b/src/Pages/Uptime/Details/index.jsx @@ -59,8 +59,11 @@ const UptimeDetails = () => { uiTimezone, }); + const monitorType = monitor?.type; + const [checks, checksCount, checksAreLoading, checksNetworkError] = useChecksFetch({ monitorId, + monitorType, dateRange, page, rowsPerPage, From a24d7a91691c7cb74dbcc72eabe7a0cee7491828 Mon Sep 17 00:00:00 2001 From: Pratham Date: Tue, 11 Mar 2025 13:00:30 +0530 Subject: [PATCH 18/25] Fix Open public url in new tab --- .../StatusPages/Components/StatusPagesTable/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx b/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx index 7bee4be8f..6772dcdb7 100644 --- a/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx +++ b/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx @@ -25,7 +25,7 @@ const StatusPagesTable = ({ data }) => { row.type === "distributed" ? `/status/distributed/public/${row.url}` : `/status/uptime/public/${row.url}`; - navigate(url); + window.open(url, "_blank", "noopener,noreferrer") } }, render: (row) => { From 5fddefc64fce8566835fabc705c80ff2c8ef098f Mon Sep 17 00:00:00 2001 From: Owaise Imdad Date: Tue, 11 Mar 2025 22:19:13 +0530 Subject: [PATCH 19/25] FIX-1907 drop downs are of common color now. --- src/Components/Inputs/Search/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Inputs/Search/index.jsx b/src/Components/Inputs/Search/index.jsx index 662ade695..683ac960a 100644 --- a/src/Components/Inputs/Search/index.jsx +++ b/src/Components/Inputs/Search/index.jsx @@ -188,8 +188,8 @@ const Search = ({ color: "red", }, "& li.MuiAutocomplete-option:hover:not([aria-selected='true'])": { - color: theme.palette.primary.main, - backgroundColor: theme.palette.primary.contrastTextSecondary, + color: theme.palette.secondary.contrastText, + backgroundColor: theme.palette.secondary.main, }, "& .MuiAutocomplete-noOptions": { px: theme.spacing(6), From c9e604efed003b7fd69fdde0b97f69ab16b961d6 Mon Sep 17 00:00:00 2001 From: Br0wnHammer Date: Tue, 11 Mar 2025 22:27:43 +0530 Subject: [PATCH 20/25] Fix: Uptime UseChecks Hook --- src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx index c067b1d2b..afdc5ed6b 100644 --- a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx @@ -9,7 +9,9 @@ export const useChecksFetch = ({ monitorId, monitorType, dateRange, page, rowsPe const [networkError, setNetworkError] = useState(false); useEffect(() => { - if (!monitorType) return; + if (!monitorType) { + throw new Error('Monitor Type is not provided. Fetching checks will not proceed.'); + } const fetchChecks = async () => { try { From ee4c15907eb522677049ae4e84936dec63459ad7 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 11 Mar 2025 10:15:47 -0700 Subject: [PATCH 21/25] replace throwing error with console.warn --- src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx index afdc5ed6b..23c66b084 100644 --- a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx @@ -2,7 +2,13 @@ import { useState } from "react"; import { useEffect } from "react"; import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; -export const useChecksFetch = ({ monitorId, monitorType, dateRange, page, rowsPerPage }) => { +export const useChecksFetch = ({ + monitorId, + monitorType, + dateRange, + page, + rowsPerPage, +}) => { const [checks, setChecks] = useState(undefined); const [checksCount, setChecksCount] = useState(undefined); const [isLoading, setIsLoading] = useState(false); @@ -10,7 +16,8 @@ export const useChecksFetch = ({ monitorId, monitorType, dateRange, page, rowsPe useEffect(() => { if (!monitorType) { - throw new Error('Monitor Type is not provided. Fetching checks will not proceed.'); + console.warn("Monitor Type is not provided. Fetching checks will not proceed."); + return; } const fetchChecks = async () => { From 67a6588bd6c7ee7cd39709b874d4c2b2b051b9ca Mon Sep 17 00:00:00 2001 From: Owaise Imdad Date: Tue, 11 Mar 2025 23:30:41 +0530 Subject: [PATCH 22/25] FIX for error in maintenance page. --- src/Components/Inputs/Search/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Inputs/Search/index.jsx b/src/Components/Inputs/Search/index.jsx index 662ade695..79e34058a 100644 --- a/src/Components/Inputs/Search/index.jsx +++ b/src/Components/Inputs/Search/index.jsx @@ -128,7 +128,7 @@ const Search = ({ Date: Tue, 11 Mar 2025 23:33:51 +0530 Subject: [PATCH 23/25] FIX for global theme for error based helper text. --- src/Utils/Theme/globalTheme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Utils/Theme/globalTheme.js b/src/Utils/Theme/globalTheme.js index 6e05fa592..490a5baea 100644 --- a/src/Utils/Theme/globalTheme.js +++ b/src/Utils/Theme/globalTheme.js @@ -332,13 +332,13 @@ const baseTheme = (palette) => ({ color: palette.error.main, opacity: 0.8, fontSize: "var(--env-var-font-size-medium)", - marginLeft: 0, }, "& .MuiFormHelperText-root.Mui-error": { opacity: 0.8, fontSize: "var(--env-var-font-size-medium)", color: palette.error.main, + whiteSpace: 'nowrap', }, }), }, From 3595e02cae2cc8cbf79c069fc0f09f0162d4b2d6 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 11 Mar 2025 11:38:44 -0700 Subject: [PATCH 24/25] fix uptime percentage --- .../Details/Components/StatusHeader/index.jsx | 4 ++-- src/Pages/StatusPage/Status/index.jsx | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx b/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx index 8f188c970..22a56bd7e 100644 --- a/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx +++ b/src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx @@ -30,7 +30,6 @@ const StatusHeader = ({ monitor, connectionStatus, elementToCapture }) => { }; let bgColor = COLOR_MAP[connectionStatus]; - return ( { backgroundColor={theme.palette.successSecondary.lowContrast} color={theme.palette.success.lowContrast} > - {t("distributedUptimeDetailsStatusHeaderUptime")} {(monitor.totalUptime * 100).toFixed(2)}% + {t("distributedUptimeDetailsStatusHeaderUptime")}{" "} + {(monitor.uptimePercentage * 100).toFixed(2)}% { const [isDeleteOpen, setIsDeleteOpen] = useState(false); // Utils const theme = useTheme(); - const isAdmin = useIsAdmin(); const location = useLocation(); const navigate = useNavigate(); @@ -33,7 +32,6 @@ const PublicStatus = () => { const [deleteStatusPage, isDeleting] = useStatusPageDelete(fetchStatusPage, url); // Setup - const currentPath = location.pathname; let sx = { paddingLeft: theme.spacing(20), paddingRight: theme.spacing(20) }; let link = undefined; const isPublic = location.pathname.startsWith("/status/uptime/public"); From 2b6625fe5521391991632b1e3c9ea03c596bed69 Mon Sep 17 00:00:00 2001 From: Owaise Imdad Date: Wed, 12 Mar 2025 00:14:27 +0530 Subject: [PATCH 25/25] FIX link in maintenance page. --- src/Components/Link/index.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Components/Link/index.jsx b/src/Components/Link/index.jsx index 6a317502b..7a623a3b0 100644 --- a/src/Components/Link/index.jsx +++ b/src/Components/Link/index.jsx @@ -14,7 +14,14 @@ const Link = ({ level, label, url }) => { const theme = useTheme(); const levelConfig = { - primary: {}, + primary: { + color: theme.palette.primary.contrastTextTertiary, + sx: { + ":hover": { + color: theme.palette.primary.contrastTextSecondary, + }, + }, + }, secondary: { color: theme.palette.primary.contrastTextSecondary, sx: {