fixed merge conflict

.github/workflows/update-badge.yml

@@ -2,9 +2,10 @@ name: Update RMM Tools Badge
 
 on:
   push:
+    branches:
+      - main
     paths:
       - 'yaml/**'
-  workflow_dispatch:
 
 jobs:
   update-badge:
@@ -21,9 +22,11 @@ jobs:
         run: python bin/update_badge.py
 
       - name: Commit and push if changed
+        env:
+          GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
         run: |
-          git config --global user.email "action@github.com"
-          git config --global user.name "GitHub Action"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
           git add rmm-tools-count.json
           git commit -m "Update RMM Tools count badge" || exit 0
-          git push
+          git push https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git HEAD:${GITHUB_REF}

README.md

@@ -33,15 +33,15 @@ To begin working with LOLRMM, you can:
 To fetch the complete list of RMM tools in JSON format, you can use the following curl command:
 
 ```bash
-curl https://lolrmm.com/api/rmm_tools.json
+curl https://lolrmm.io/api/rmm_tools.json
 ```
 
 This will return a JSON array containing detailed information about all cataloged RMM tools.
 
 For CSV format, simply change the extension to `.csv`:
 
 ```bash
-curl https://lolrmm.com/api/rmm_tools.csv
+curl https://lolrmm.io/api/rmm_tools.csv
 ```
 
 These APIs provide an easy way to integrate LOLRMM data into your threat hunting, detection, and prevention workflows.

website/components/home.tsx

@@ -5,6 +5,7 @@ import {
 	EuiSpacer,
 	EuiTitle,
 	EuiToast,
+	EuiImage,
 } from "@elastic/eui";
 import "@elastic/eui/dist/eui_theme_dark.css";
 import { RMMTable } from "./tools";
@@ -35,22 +36,41 @@ function Contents() {
 					title={
 						<> 
 							You can also access the RMM tools list via API using{" "}
+							, or suggest new RMM tools to be added. You can also access the RMM tools list via API using{" "}
 							<EuiLink href="/api/rmm_tools.csv">CSV</EuiLink> or{" "}
 							<EuiLink href="/api/rmm_tools.json">JSON</EuiLink>. For users of
 							security monitoring tools, check out the pre-built{" "}
-							<EuiLink href="https://github.com/magicsword-io/lolrmm/blob/main/detections/configs">
-								configurations
-							</EuiLink>
-							. We also provide{" "}
 							<EuiLink href="https://github.com/magicsword-io/lolrmm/blob/main/detections/sigma">
-								Sigma rules{" "}
+									<EuiImage
+										alt="Sigma Logo"
+										src="/images/sigma_logo.png"
+										style={{ width: '20px', height: '20px', marginRight: '5px', verticalAlign: 'middle' }}
+									/>
+									Sigma rules
 							</EuiLink>
-							for SIEMs.
 						</>
 					}
 					color="primary"
 					iconType="iInCircle"
 				/>
+				<EuiToast
+					title={
+						<>
+							Interested in learning how to <span style={{ color: 'red' }}>block</span> these remote management tools natively on Windows?
+							<br />
+							<EuiLink href="https://www.magicsword.io/premium">
+								<EuiImage
+									alt="MagicSword Logo"
+									src="/images/magicsword.png"
+									style={{ width: '110px', height: '110px', verticalAlign: 'middle', display: 'inline-block', marginRight: '10px', marginTop: '10px' }}
+								/>
+								Explore MagicSword Premium
+							</EuiLink>
+						</>
+					}
+					color="warning"
+					iconType="lock"
+					/>
 			</EuiFlexGroup>
 			<EuiSpacer size="xxl" />
 
@@ -60,8 +80,8 @@ function Contents() {
 
 			<EuiSpacer size="xxl" />
 			<RMMTable />
-		</>
-	);
+			</>
+		);
 }
 
 export function App() {

website/package.json

@@ -30,6 +30,7 @@
 		"@fortawesome/free-brands-svg-icons": "^6.6.0",
 		"@fortawesome/free-solid-svg-icons": "^6.6.0",
 		"@fortawesome/react-fontawesome": "^0.2.2",
+		"@next/third-parties": "^14.2.13",
 		"@tanstack/react-query": "^5.52.2",
 		"@vercel/analytics": "^1.3.1",
 		"autoprefixer": "^10.4.20",

website/pages/_app.mdx

@@ -1,6 +1,7 @@
 import "../styles.css";
 import {useEffect, useState} from "react";
 import {EuiProvider} from "@elastic/eui";
+import { GoogleAnalytics } from '@next/third-parties/google'
 
 export default function Nextra({Component, pageProps}) {
   const [isClient, setIsClient] = useState(false);
@@ -9,9 +10,12 @@ export default function Nextra({Component, pageProps}) {
   }, []);
   if (isClient) {
     return (
-      <EuiProvider colorMode={"dark"}>
+      <>
+        <EuiProvider colorMode={"dark"}>
           <Component {...pageProps} />
-      </EuiProvider>
+        </EuiProvider>
+        <GoogleAnalytics gaId="G-D04FRZLYM5" />
+      </>
     );
   }
   return null;