Merge branch 'main' into fix-issue-6

sourceguidehq · Jan 8, 2024 · b22b01a · b22b01a
2 parents 603cea8 + 5875f4a
commit b22b01a
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 15 deletions.
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -5,7 +5,8 @@ import './globals.css';
 import Navbar from '@/comps/navbar';
 import Footer from '@/comps/Footer';
 import Script from 'next/script';
-
+import Head from 'next/head';
+import GoogleAnalytics from '@/comps/GoogleAnalytics';
 const inter = Poppins({
   subsets: ['latin'],
   display: 'swap',
@@ -25,30 +26,26 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en" className="dark:bg-[#09090B]">
+      <Head>
       <link rel="icon" type="image/x-icon" href="favicon.svg" />
       <link rel="preconnect" href="https://fonts.gstatic.com" />
       <link rel="preconnect" href="https://api.github.com" />
+
 
-      <Script
-        strategy="lazyOnload"
-        src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}`}
-      />
+      </Head>
+
 
-      <Script strategy="lazyOnload">
-        {`
-                    window.dataLayer = window.dataLayer || [];
-                    function gtag(){dataLayer.push(arguments);}
-                    gtag('js', new Date());
-                    gtag('config', '${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}', {
-                    page_path: window.location.pathname,
-                    });
-                `}
-      </Script>
+
 
       <body className={inter.className}>
+
         <Navbar />
         {children}
         <Analytics />
+        {process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS ? (
+            <GoogleAnalytics ga_id= 
+            {process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS} />
+          ) : null}
         <div className=" my-14"></div>
         <Footer />
       </body>

diff --git a/comps/GoogleAnalytics.tsx b/comps/GoogleAnalytics.tsx
@@ -0,0 +1,24 @@
+import Script from "next/script";
+
+const GoogleAnalytics = ({ ga_id }: { ga_id: string }) => (
+  <>
+    <Script
+      async
+      src={`https://www.googletagmanager.com/gtag/js? 
+      id=${ga_id}`}
+    ></Script>
+    <Script
+      id="google-analytics"
+      dangerouslySetInnerHTML={{
+        __html: `
+          window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+
+          gtag('config', '${ga_id}');
+        `,
+      }}
+    ></Script>
+  </>
+);
+export default GoogleAnalytics;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,6 +9,9 @@
     "lint": "next lint"
   },
   "dependencies": {
+
+    "@bradgarropy/next-google-analytics": "^1.0.2",
+    "@next/font": "^14.0.4",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-icons": "^1.3.0",