From 6e906261f4e195a3a8e0184d03b25d20c00218a6 Mon Sep 17 00:00:00 2001 From: "plebeius.eth" <117766773+plebeius-eth@users.noreply.github.com> Date: Sat, 23 Sep 2023 11:00:49 +0200 Subject: [PATCH 1/7] Update index.html Add Google Analytics for 4chan ads --- public/index.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/public/index.html b/public/index.html index bedd85cc..5ad112b3 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,16 @@ + + + + From 9bc8941604b93dcb797049ec111776366d69748e Mon Sep 17 00:00:00 2001 From: "plebeius.eth" <117766773+plebeius-eth@users.noreply.github.com> Date: Sat, 23 Sep 2023 20:30:14 +0200 Subject: [PATCH 2/7] Create useGoogleAnalytics.js --- src/hooks/useGoogleAnalytics.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/hooks/useGoogleAnalytics.js diff --git a/src/hooks/useGoogleAnalytics.js b/src/hooks/useGoogleAnalytics.js new file mode 100644 index 00000000..83677038 --- /dev/null +++ b/src/hooks/useGoogleAnalytics.js @@ -0,0 +1,19 @@ +import { useEffect } from 'react'; +import { useLocation } from 'react-router-dom'; + +const GA_MEASUREMENT_ID = "G-2M2VYEFL7B"; + +const useGoogleAnalytics = () => { + const location = useLocation(); + + useEffect(() => { + if (typeof window.gtag === 'function') { + const fullPath = location.pathname + location.search + location.hash; + window.gtag('config', GA_MEASUREMENT_ID, { + 'page_path': fullPath, + }); + } + }, [location]); +}; + +export default useGoogleAnalytics; From 6873ca8f26824223c9d040e2d25e3f4853bec911 Mon Sep 17 00:00:00 2001 From: "plebeius.eth" <117766773+plebeius-eth@users.noreply.github.com> Date: Sat, 23 Sep 2023 20:32:42 +0200 Subject: [PATCH 3/7] Update App.js Google Analytics --- src/App.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/App.js b/src/App.js index e4c825ec..ab3fd1bc 100755 --- a/src/App.js +++ b/src/App.js @@ -22,6 +22,7 @@ import CaptchaModal from './components/modals/CaptchaModal'; import { importAll } from './components/ImageBanner'; import preloadImages from './utils/preloadImages'; import useError from './hooks/useError'; +import useGoogleAnalytics from './hooks/useGoogleAnalytics'; import useInfo from './hooks/useInfo'; import useSuccess from './hooks/useSuccess'; import packageJson from '../package.json'; @@ -44,6 +45,7 @@ export default function App() { const location = useLocation(); const isHomeRoute = location.pathname === '/'; const isElectron = window.electron && window.electron.isElectron; + useGoogleAnalytics(); const [, setNewErrorMessage] = useError(); const [, setNewSuccessMessage] = useSuccess(); From e518dedf388d961fb4123b417122622fd7dc1c89 Mon Sep 17 00:00:00 2001 From: "plebeius.eth" <117766773+plebeius-eth@users.noreply.github.com> Date: Sat, 23 Sep 2023 20:49:02 +0200 Subject: [PATCH 4/7] Update useGoogleAnalytics.js --- src/hooks/useGoogleAnalytics.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hooks/useGoogleAnalytics.js b/src/hooks/useGoogleAnalytics.js index 83677038..3e50ba68 100644 --- a/src/hooks/useGoogleAnalytics.js +++ b/src/hooks/useGoogleAnalytics.js @@ -12,6 +12,7 @@ const useGoogleAnalytics = () => { window.gtag('config', GA_MEASUREMENT_ID, { 'page_path': fullPath, }); + window.gtag('event', 'page_view', {'page_path': fullPath}); } }, [location]); }; From 93eb4d78cf424f0ddd816273c7875d8a104770ee Mon Sep 17 00:00:00 2001 From: "plebeius.eth" <117766773+plebeius-eth@users.noreply.github.com> Date: Sat, 23 Sep 2023 21:15:03 +0200 Subject: [PATCH 5/7] Update useGoogleAnalytics.js --- src/hooks/useGoogleAnalytics.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/hooks/useGoogleAnalytics.js b/src/hooks/useGoogleAnalytics.js index 3e50ba68..3203f3b5 100644 --- a/src/hooks/useGoogleAnalytics.js +++ b/src/hooks/useGoogleAnalytics.js @@ -6,15 +6,20 @@ const GA_MEASUREMENT_ID = "G-2M2VYEFL7B"; const useGoogleAnalytics = () => { const location = useLocation(); - useEffect(() => { - if (typeof window.gtag === 'function') { - const fullPath = location.pathname + location.search + location.hash; - window.gtag('config', GA_MEASUREMENT_ID, { - 'page_path': fullPath, - }); - window.gtag('event', 'page_view', {'page_path': fullPath}); - } - }, [location]); +useEffect(() => { + if (typeof window.gtag === 'function') { + const fullPath = location.pathname + location.search + location.hash; + window.gtag('config', GA_MEASUREMENT_ID, { + 'page_path': fullPath, + }); + window.gtag('event', 'page_view', { + 'page_path': fullPath, + 'page_location': window.location.href + }); + + } +}, [location]); + }; -export default useGoogleAnalytics; +export default useGoogleAnalytics;pat From 1ba5693f849d8a4a5b89b1ce923e1c29cb133a21 Mon Sep 17 00:00:00 2001 From: "plebeius.eth" <117766773+plebeius-eth@users.noreply.github.com> Date: Sat, 23 Sep 2023 21:16:39 +0200 Subject: [PATCH 6/7] Update useGoogleAnalytics.js --- src/hooks/useGoogleAnalytics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/useGoogleAnalytics.js b/src/hooks/useGoogleAnalytics.js index 3203f3b5..626d0d89 100644 --- a/src/hooks/useGoogleAnalytics.js +++ b/src/hooks/useGoogleAnalytics.js @@ -14,7 +14,7 @@ useEffect(() => { }); window.gtag('event', 'page_view', { 'page_path': fullPath, - 'page_location': window.location.href + 'page_location': window.location.href.replace('/#', '') }); } @@ -22,4 +22,4 @@ useEffect(() => { }; -export default useGoogleAnalytics;pat +export default useGoogleAnalytics; From 684a4264bbbc5ec54208f4ca87038dc57441078d Mon Sep 17 00:00:00 2001 From: "plebeius.eth" Date: Thu, 5 Oct 2023 21:16:30 +0200 Subject: [PATCH 7/7] Revert "Merge branch 'master' into master" This reverts commit 7dcadc4501ea024b1d472bd808054cce36bf489f, reversing changes made to 0c5774fbceb137ef2d140a0baf633fe109969477. --- public/index.html | 10 ---------- src/App.js | 3 --- src/hooks/useGoogleAnalytics.js | 25 ------------------------- 3 files changed, 38 deletions(-) delete mode 100644 src/hooks/useGoogleAnalytics.js diff --git a/public/index.html b/public/index.html index 5ad112b3..bedd85cc 100644 --- a/public/index.html +++ b/public/index.html @@ -1,16 +1,6 @@ - - - - diff --git a/src/App.js b/src/App.js index acb66aa2..eb2c5ca2 100755 --- a/src/App.js +++ b/src/App.js @@ -23,14 +23,12 @@ import { importAll } from './components/ImageBanner'; import preloadImages from './utils/preloadImages'; import showNewVersionToast from './utils/showNewVersionToast'; import useError from './hooks/useError'; -import useGoogleAnalytics from './hooks/useGoogleAnalytics'; import useInfo from './hooks/useInfo'; import useSuccess from './hooks/useSuccess'; import packageJson from '../package.json'; const commitRef = process?.env?.REACT_APP_COMMIT_REF || ''; export default function App() { - const { bodyStyle, setBodyStyle, @@ -46,7 +44,6 @@ export default function App() { const location = useLocation(); const isElectron = window.electron && window.electron.isElectron; - useGoogleAnalytics(); useEffect(() => { if (location.state?.scrollToTop) { diff --git a/src/hooks/useGoogleAnalytics.js b/src/hooks/useGoogleAnalytics.js deleted file mode 100644 index 626d0d89..00000000 --- a/src/hooks/useGoogleAnalytics.js +++ /dev/null @@ -1,25 +0,0 @@ -import { useEffect } from 'react'; -import { useLocation } from 'react-router-dom'; - -const GA_MEASUREMENT_ID = "G-2M2VYEFL7B"; - -const useGoogleAnalytics = () => { - const location = useLocation(); - -useEffect(() => { - if (typeof window.gtag === 'function') { - const fullPath = location.pathname + location.search + location.hash; - window.gtag('config', GA_MEASUREMENT_ID, { - 'page_path': fullPath, - }); - window.gtag('event', 'page_view', { - 'page_path': fullPath, - 'page_location': window.location.href.replace('/#', '') - }); - - } -}, [location]); - -}; - -export default useGoogleAnalytics;