fix: google analytics

mstark5652 · mstark5652 · commit 6f0ee518adbd · 2023-08-05T19:05:24.000-05:00
diff --git a/lib/components/GA.jsx b/lib/components/GA.jsx
@@ -2,9 +2,9 @@ import Script from "next/script"
 
 const GA = () => {
   return (
-    <>
+    <div id="ga">
       <Script async src="https://www.googletagmanager.com/gtag/js?id=G-ZS8DH79JJ7"></Script>
-      <Script id="ga" defer={false}>
+      <Script id="google-analytics">
         {`
         window.dataLayer = window.dataLayer || [];
         function gtag(){dataLayer.push(arguments);}
@@ -13,7 +13,7 @@ const GA = () => {
         gtag('config', 'G-ZS8DH79JJ7');
         `}
       </Script>
-    </>
+    </div>
   )
 }
 
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -3,6 +3,7 @@ import Container from "@mui/material/Container"
 import CssBaseline from "@mui/material/CssBaseline"
 import { ThemeProvider } from "@mui/material/styles"
 
+import GA from "@/lib/components/GA"
 import BusProvider from "@/lib/components/BusProvider/BusProvider"
 import Notification from "@/lib/components/Notification/Notification"
 import Header from "@/lib/components/Header/Header"
@@ -14,18 +15,21 @@ export default function App({ Component, pageProps }: AppProps) {
   const user = pageProps && pageProps.user
 
   return (
-    <ThemeProvider theme={theme}>
-      <CssBaseline />
-      <BusProvider>
-        <div className="app-container">
-          {!embed && <Header title="Link Flow" user={user} />}
-          <Container disableGutters maxWidth="xl">
-            <Component {...pageProps} />
-          </Container>
-          {!embed && <Footer />}
-          <Notification />
-        </div>
-      </BusProvider>
-    </ThemeProvider>
+    <>
+      <ThemeProvider theme={theme}>
+        <CssBaseline />
+        <BusProvider>
+          <div className="app-container">
+            {!embed && <Header title="Link Flow" user={user} />}
+            <Container disableGutters maxWidth="xl">
+              <Component {...pageProps} />
+            </Container>
+            {!embed && <Footer />}
+            <Notification />
+          </div>
+        </BusProvider>
+      </ThemeProvider>
+      <GA />
+    </>
   )
 }
diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -1,5 +1,4 @@
 import { Html, Head, Main, NextScript } from "next/document"
-import GA from "@/lib/components/GA"
 
 export default function Document() {
   return (
@@ -9,7 +8,6 @@ export default function Document() {
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="icon" href="/favicon.ico" />
         <meta name="theme-color" content="#202124" />
-        <GA />
       </Head>
       <body>
         <Main />
