diff --git a/.github/workflows/distribution-deploy.yml b/.github/workflows/distribution-deploy.yml index b96a0f3d7..55d7c5e4c 100644 --- a/.github/workflows/distribution-deploy.yml +++ b/.github/workflows/distribution-deploy.yml @@ -11,6 +11,9 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log in to GitHub Container Registry uses: docker/login-action@v3 with: @@ -20,7 +23,8 @@ jobs: - name: Build Client Docker image run: | - docker build \ + docker buildx build \ + --platform linux/amd64,linux/arm64 \ -t ghcr.io/bluewave-labs/checkmate:frontend-dist \ -f ./docker/dist/client.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ @@ -36,6 +40,9 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log in to GitHub Container Registry uses: docker/login-action@v3 with: @@ -45,7 +52,8 @@ jobs: - name: Build Server Docker image run: | - docker build \ + docker buildx build \ + --platform linux/amd64,linux/arm64 \ -t ghcr.io/bluewave-labs/checkmate:backend-dist \ -f ./docker/dist/server.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ @@ -56,7 +64,8 @@ jobs: - name: Build Mongo Docker image run: | - docker build \ + docker buildx build \ + --platform linux/amd64,linux/arm64 \ -t ghcr.io/bluewave-labs/checkmate:mongo-dist \ -f ./docker/dist/mongoDB.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ @@ -67,7 +76,8 @@ jobs: - name: Build Redis Docker image run: | - docker build \ + docker buildx build \ + --platform linux/amd64,linux/arm64 \ -t ghcr.io/bluewave-labs/checkmate:redis-dist \ -f ./docker/dist/redis.Dockerfile \ --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 201199e81..702436b38 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -123,9 +123,15 @@ If one or more of these are missing, we may ask you to update your pull request ## Branching model + - Code contributions should go to the `develop` branch. - `master` is used for stable releases. - Use descriptive branch names, like `fix/login-error` or `feat/add-alerts`. +- Make sure that you are using the latest version. +- Make sure you run the code locally. The Checkmate [documentation](https://docs.checkmate.so) covers it. +- Find out if the functionality is already covered, maybe by an individual configuration. +- Perform a [search](/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one. +- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library. --- @@ -133,8 +139,11 @@ If one or more of these are missing, we may ask you to update your pull request Thanks for making Checkmate better. We mean it. Whether itโ€™s your first pull request or your 50th, weโ€™re excited to build with you. + PS: feel free to introduce yourself on [Discord](https://discord.gg/YOUR-DISCORD-LINK) and say hi. -- Checkmate team +Also make sure you read the [document about how to make a good pull request](/PULLREQUESTS.md). + diff --git a/README.md b/README.md index 1217bf02d..b1330a17a 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ ![](https://img.shields.io/github/issues/bluewave-labs/checkmate) ![](https://img.shields.io/github/issues-pr/bluewave-labs/checkmate) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9901/badge)](https://www.bestpractices.dev/projects/9901) +[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/bluewave-labs/checkmate)

Checkmate

@@ -29,11 +30,11 @@ You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs. ## ๐Ÿ”— User's guide -Usage instructions can be found [here](https://docs.checkmate.so/). It's still WIP and some of the information there might be outdated as we continuously add features weekly. Rest assured, we are doing our best! :) +Usage instructions can be found [here](https://docs.checkmate.so/checkmate-2.1). It's still WIP and some of the information there might be outdated as we continuously add features weekly. Rest assured, we are doing our best! :) ## ๐Ÿ› ๏ธ Installation -See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/quickstart). Alternatively, you can also use [Coolify](https://coolify.io/) or [Elestio](https://elest.io/open-source/checkmate) for a one-click Docker deployment. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions. +See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). Alternatively, you can also use [Coolify](https://coolify.io/) or [Elestio](https://elest.io/open-source/checkmate) for a one-click Docker deployment. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions. ## ๐Ÿ Translations @@ -117,7 +118,7 @@ Here's how you can contribute: 0. Star this repo :) 1. Check [Contributor's guideline](https://github.com/bluewave-labs/Checkmate/blob/develop/CONTRIBUTING.md). First timers are encouraged to check `good-first-issue` tag. -2. Check [project structure](https://docs.checkmate.so/developers-guide/general-project-structure) and [high level overview](https://bluewavelabs.gitbook.io/checkmate/developers-guide/high-level-overview). +2. Check [project structure](https://docs.checkmate.so/checkmate-2.1/developers-guide/general-project-structure) and [high level overview](https://bluewavelabs.gitbook.io/checkmate/developers-guide/high-level-overview). 3. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture. 4. Open an issue if you believe you've encountered a bug. 5. Check for good-first-issue's if you are a newcomer. diff --git a/client/src/Components/Alert/index.jsx b/client/src/Components/Alert/index.jsx index 0b32fe2b1..921d4fd6e 100644 --- a/client/src/Components/Alert/index.jsx +++ b/client/src/Components/Alert/index.jsx @@ -111,7 +111,7 @@ const Alert = ({ variant, title, body, isToast, hasIcon = true, onClick }) => { Alert.propTypes = { variant: PropTypes.oneOf(["info", "error", "warning"]).isRequired, title: PropTypes.string, - body: PropTypes.string, + body: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), isToast: PropTypes.bool, hasIcon: PropTypes.bool, onClick: function (props, propName, componentName) { diff --git a/client/src/Components/Fallback/index.jsx b/client/src/Components/Fallback/index.jsx index 5b6da7062..b00ddbecc 100644 --- a/client/src/Components/Fallback/index.jsx +++ b/client/src/Components/Fallback/index.jsx @@ -11,7 +11,8 @@ import { useSelector } from "react-redux"; import Alert from "../Alert"; import { useTranslation } from "react-i18next"; import "./index.css"; - +import { useFetchSettings } from "../../Hooks/useFetchSettings"; +import { useState } from "react"; /** * Fallback component to display a fallback UI with a title, a list of checks, and a navigation button. * @@ -24,32 +25,41 @@ import "./index.css"; * @returns {JSX.Element} The rendered fallback UI. */ -const Fallback = ({ title, checks, link = "/", isAdmin, vowelStart = false, showPageSpeedWarning = false }) => { +const Fallback = ({ + title, + checks, + link = "/", + isAdmin, + vowelStart = false, + showPageSpeedWarning = false, +}) => { const theme = useTheme(); const navigate = useNavigate(); const mode = useSelector((state) => state.ui.mode); const { t } = useTranslation(); + const [settingsData, setSettingsData] = useState(undefined); + const [isLoading, error] = useFetchSettings({ setSettingsData }); // Custom warning message with clickable link const renderWarningMessage = () => { return ( <> - {t("pageSpeedWarning")} {" "} - {t("pageSpeedLearnMoreLink")} - - {" "}{t("pageSpeedAddApiKey")} + {" "} + {t("pageSpeedAddApiKey")} ); }; @@ -120,7 +130,7 @@ const Fallback = ({ title, checks, link = "/", isAdmin, vowelStart = false, show {/* Bulk create of uptime monitors */} {title === "uptime monitor" && ( -