From a8c47d717cb00fa75d5ee62e55a3a94e27a8724b Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 29 Jul 2025 12:35:53 +0200 Subject: [PATCH] remove unused google analytics support --- commafeed-client/package-lock.json | 7 ------- commafeed-client/package.json | 1 - commafeed-client/src/App.tsx | 19 +------------------ commafeed-client/src/app/types.ts | 1 - .../com/commafeed/CommaFeedConfiguration.java | 5 ----- .../commafeed/frontend/model/ServerInfo.java | 3 --- .../frontend/resource/ServerREST.java | 1 - 7 files changed, 1 insertion(+), 36 deletions(-) diff --git a/commafeed-client/package-lock.json b/commafeed-client/package-lock.json index 7495695b..b9b0697f 100644 --- a/commafeed-client/package-lock.json +++ b/commafeed-client/package-lock.json @@ -32,7 +32,6 @@ "react-device-detect": "^2.2.3", "react-dom": "^19.1.1", "react-draggable": "^4.5.0", - "react-ga4": "^2.1.0", "react-icons": "^5.5.0", "react-infinite-scroller": "^1.2.6", "react-redux": "^9.2.0", @@ -4950,12 +4949,6 @@ "react-dom": ">= 16.3.0" } }, - "node_modules/react-ga4": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-ga4/-/react-ga4-2.1.0.tgz", - "integrity": "sha512-ZKS7PGNFqqMd3PJ6+C2Jtz/o1iU9ggiy8Y8nUeksgVuvNISbmrQtJiZNvC/TjDsqD0QlU5Wkgs7i+w9+OjHhhQ==", - "license": "MIT" - }, "node_modules/react-icons": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz", diff --git a/commafeed-client/package.json b/commafeed-client/package.json index caa2fcf9..b421f38c 100644 --- a/commafeed-client/package.json +++ b/commafeed-client/package.json @@ -39,7 +39,6 @@ "react-device-detect": "^2.2.3", "react-dom": "^19.1.1", "react-draggable": "^4.5.0", - "react-ga4": "^2.1.0", "react-icons": "^5.5.0", "react-infinite-scroller": "^1.2.6", "react-redux": "^9.2.0", diff --git a/commafeed-client/src/App.tsx b/commafeed-client/src/App.tsx index 7b4c4ddd..1af48190 100644 --- a/commafeed-client/src/App.tsx +++ b/commafeed-client/src/App.tsx @@ -6,8 +6,7 @@ import { Notifications } from "@mantine/notifications" import type React from "react" import { useEffect, useState } from "react" import { isSafari } from "react-device-detect" -import ReactGA from "react-ga4" -import { HashRouter, Navigate, Route, Routes, useLocation, useNavigate } from "react-router-dom" +import { HashRouter, Navigate, Route, Routes, useNavigate } from "react-router-dom" import Tinycon from "tinycon" import { Constants } from "@/app/constants" import { redirectTo } from "@/app/redirect/slice" @@ -125,21 +124,6 @@ function RedirectHandler() { return null } -function GoogleAnalyticsHandler() { - const location = useLocation() - const googleAnalyticsCode = useAppSelector(state => state.server.serverInfos?.googleAnalyticsCode) - - useEffect(() => { - if (googleAnalyticsCode) ReactGA.initialize(googleAnalyticsCode) - }, [googleAnalyticsCode]) - - useEffect(() => { - if (ReactGA.isInitialized) ReactGA.send({ hitType: "pageview", page: location.pathname }) - }, [location]) - - return null -} - function UnreadCountTitleHandler({ enabled }: { enabled?: boolean }) { const root = useAppSelector(state => state.tree.rootCategory) const unreadCount = categoryUnreadCount(root) @@ -229,7 +213,6 @@ export function App() { {!isSafari && } - diff --git a/commafeed-client/src/app/types.ts b/commafeed-client/src/app/types.ts index 4db37f19..fc59dc2e 100644 --- a/commafeed-client/src/app/types.ts +++ b/commafeed-client/src/app/types.ts @@ -214,7 +214,6 @@ export interface ServerInfo { version: string gitCommit: string allowRegistrations: boolean - googleAnalyticsCode?: string smtpEnabled: boolean demoAccountEnabled: boolean websocketEnabled: boolean diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java index dbbd3e4d..214a1943 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java +++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java @@ -51,11 +51,6 @@ public interface CommaFeedConfiguration { */ Optional announcement(); - /** - * Google Analytics tracking code. - */ - Optional googleAnalyticsTrackingCode(); - /** * Google Auth key for fetching Youtube channel favicons. */ diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java index 72b91ed6..484a9d4f 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java @@ -25,9 +25,6 @@ public class ServerInfo implements Serializable { @Schema(required = true) private boolean allowRegistrations; - @Schema - private String googleAnalyticsCode; - @Schema(required = true) private boolean smtpEnabled; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java index cd005c69..f1547e11 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java @@ -51,7 +51,6 @@ public class ServerREST { infos.setVersion(version.getVersion()); infos.setGitCommit(version.getGitCommit()); infos.setAllowRegistrations(config.users().allowRegistrations()); - infos.setGoogleAnalyticsCode(config.googleAnalyticsTrackingCode().orElse(null)); infos.setSmtpEnabled(config.passwordRecoveryEnabled()); infos.setDemoAccountEnabled(config.users().createDemoAccount()); infos.setWebsocketEnabled(config.websocket().enabled());