Merge pull request #170 from UnsignedArduino/staging

GOOD BYE GOOGLE TAG MANAGER I HATED YOU
UnsignedArduino · Jul 13, 2024 · caf1553 · caf1553
2 parents a217248 + a406a17
commit caf1553
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 19 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,7 +1,12 @@
+// Enable analytics during development - for debugging purposes
+// Analytics are always enabled in non-dev environments
+NEXT_PUBLIC_ENABLE_ANALYTICS=false
+// Enables ads during development - for debugging purposes
+// Ads are always enabled in non-dev environments
+NEXT_PUBLIC_ENABLE_ADS=false
+
 // Google Analytics measurement ID - not required
 NEXT_PUBLIC_GA_MEASUREMENT_ID = "G-XXXXXXXXXX"
-// Google Tag Manager ID - not required
-NEXT_PUBLIC_GTM_ID = "GTM-XXXXXXXX"
 // Google Adsense publisher ID - not required
 NEXT_PUBLIC_ADSENSE_PUBLISHER_ID = "pub-XXXXXXXXXXXXXXXX"
 // GitHub OAuth

diff --git a/package.json b/package.json
@@ -52,7 +52,6 @@
   "dependencies": {
     "@codemirror/language": "6.0.0",
     "@growthbook/growthbook-react": "^1.1.0",
-    "@magicul/next-google-tag-manager": "^2.0.0",
     "@popperjs/core": "2.11.8",
     "@tippyjs/react": "^4.2.6",
     "@types/bootstrap": "^5.2.10",

diff --git a/src/components/Adsense/adsense.tsx b/src/components/Adsense/adsense.tsx
@@ -5,7 +5,12 @@ import { getEnvironment } from "@/scripts/Utils/Environment";
 export function Adsense(): React.ReactNode {
   React.useEffect(() => {
     if (getEnvironment() === "development") {
-      console.info("Google Adsense disabled during development");
+      if (process.env.NEXT_PUBLIC_ENABLE_ADS) {
+        console.info("Enabling Google Adsense during development");
+      } else {
+        console.info("Google Adsense disabled during development");
+        return;
+      }
     }
   }, []);
 

diff --git a/src/components/Analytics/analytics.tsx b/src/components/Analytics/analytics.tsx
@@ -68,14 +68,22 @@ export function Analytics(): React.ReactNode {
     });
 
     if (getEnvironment() === "development") {
-      console.info("Google Analytics disabled during development");
-      return;
+      if (process.env.NEXT_PUBLIC_ENABLE_ANALYTICS) {
+        console.info("Enabling Google Analytics during development");
+      } else {
+        console.info("Google Analytics disabled during development");
+        return;
+      }
     }
 
     setUseGA(true);
   }, []);
 
-  return useGA ? <GoogleAnalytics trackPageViews /> : <></>;
+  return useGA ? (
+    <GoogleAnalytics trackPageViews={{ ignoreHashChange: true }} />
+  ) : (
+    <></>
+  );
 }
 
 export default Analytics;

diff --git a/src/components/Navbar/ThemePicker/themePicker.tsx b/src/components/Navbar/ThemePicker/themePicker.tsx
@@ -158,13 +158,10 @@ export function ThemeProxy({
 
   React.useEffect(() => {
     if (loadedPreferredTheme) {
+      const osWantsDark = window.matchMedia("(prefers-color-scheme: dark)");
       switch (dropdownTheme) {
         case "Auto": {
-          setActualTheme(
-            window.matchMedia("(prefers-color-scheme: dark)").matches
-              ? "Dark"
-              : "Light",
-          );
+          setActualTheme(osWantsDark ? "Dark" : "Light");
           break;
         }
         default: {

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -7,7 +7,6 @@ import "katex/dist/katex.min.css";
 import "tippy.js/dist/tippy.css";
 import Adsense from "../components/Adsense";
 import Analytics from "../components/Analytics";
-import GoogleTagManager from "@magicul/next-google-tag-manager";
 import ErrorBoundary from "../components/ErrorBoundary";
 import { SessionProvider } from "next-auth/react";
 import { useRouter } from "next/router";
@@ -115,7 +114,6 @@ export default function AwesomeArcadeExtensions({
               options={{ showSpinner: false }}
             />
             <Analytics />
-            <GoogleTagManager id={process.env.NEXT_PUBLIC_GTM_ID!} />
             <Adsense />
             <GrowthBookProvider growthbook={growthbook}>
               <SessionProvider session={session}>

diff --git a/yarn.lock b/yarn.lock
@@ -1113,11 +1113,6 @@
   dependencies:
     "@lezer/common" "^1.0.0"
 
-"@magicul/next-google-tag-manager@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@magicul/next-google-tag-manager/-/next-google-tag-manager-2.0.0.tgz#04a77b506a4385f84cf637267984bd6f334f5ce0"
-  integrity sha512-NXp0iGxdcAZL9IkkWwh2GS3dE1qSn4hGxXADnvt1li4gAXyxJ9AEDTrgqMVXIDzkGTD7Q0n37BJoCZdmwIXE+g==
-
 "@monaco-editor/loader@^1.3.2":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.4.0.tgz#f08227057331ec890fa1e903912a5b711a2ad558"