Merge branch 'master' into 593-google-analytics-not-displaying-page-s…

…pecific-hits
neurostuff · Aug 7, 2024 · 419b878 · 419b878
2 parents 7e3a542 + a19dd3f
commit 419b878
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/compose/neurosynth-frontend/public/index.html b/compose/neurosynth-frontend/public/index.html
@@ -28,14 +28,12 @@
         <!-- Google tag (gtag.js) -->
         <script async src="https://www.googletagmanager.com/gtag/js?id=G-0L9Y0HT9NR"></script>
         <script type="text/javascript">
-            // if (document.location.hostname === "compose.neurosynth.org") {
+            if (document.location.hostname === "compose.neurosynth.org") {
                 window.dataLayer = window.dataLayer || [];
                 function gtag(){dataLayer.push(arguments);}
                 gtag('js', new Date());
-                gtag('config', 'G-0L9Y0HT9NR', {
-                    'send_page_view': false
-                });
-            // }
+                gtag('config', 'G-0L9Y0HT9NR');
+            }
         </script>
 
         <!-- Appzi: Capture Insightful Feedback -->

diff --git a/compose/neurosynth-frontend/src/App.tsx b/compose/neurosynth-frontend/src/App.tsx
@@ -3,11 +3,12 @@ import { IconButton } from '@mui/material';
 import { AxiosError } from 'axios';
 import useGoogleAnalytics from 'hooks/useGoogleAnalytics';
 import { SnackbarKey, SnackbarProvider } from 'notistack';
-import { useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import { QueryCache, QueryClient, QueryClientProvider } from 'react-query';
 import Navbar from './components/Navbar/Navbar';
 import useGetToken from './hooks/useGetToken';
 import BaseNavigation from './pages/BaseNavigation/BaseNavigation';
+import { useLocation } from 'react-router-dom';
 
 const queryClient = new QueryClient({
     defaultOptions: {
@@ -42,6 +43,15 @@ function App() {
     useGetToken();
     useGoogleAnalytics();
 
+    const location = useLocation();
+    useEffect(() => {
+        if (window.gtag) {
+            window.gtag('event', 'page_view', {
+                page_path: `${location.pathname}${location.search}`,
+            });
+        }
+    }, [location]);
+
     const handleCloseSnackbar = (key: SnackbarKey) => (_event: React.MouseEvent) => {
         if (notistackRef?.current?.closeSnackbar) notistackRef.current?.closeSnackbar(key);
     };