Actually not enable Adsense or Analytics

UnsignedArduino · Jul 13, 2024 · 836f5e3 · 836f5e3
1 parent 12f32d1
commit 836f5e3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/components/Adsense/adsense.tsx b/src/components/Adsense/adsense.tsx
@@ -6,19 +6,20 @@ export function Adsense(): React.ReactNode {
   const [useGA, setUseGA] = React.useState<boolean>(false);
 
   React.useEffect(() => {
+    if (
+      process.env.NEXT_PUBLIC_ADSENSE_PUBLISHER_ID === "pub-XXXXXXXXXXXXXXXX" ||
+      !process.env.NEXT_PUBLIC_ADSENSE_PUBLISHER_ID
+    ) {
+      // console.info("No publisher ID provided, disabling Google Adsense");
+      return;
+    }
     if (getEnvironment() === "development") {
       if (process.env.NEXT_PUBLIC_ENABLE_ADS) {
         console.info("Enabling Google Adsense during development");
       } else {
         console.info("Google Adsense disabled during development");
         return;
       }
-    } else if (
-      process.env.NEXT_PUBLIC_ADSENSE_PUBLISHER_ID === "pub-XXXXXXXXXXXXXXXX" ||
-      !process.env.NEXT_PUBLIC_ADSENSE_PUBLISHER_ID
-    ) {
-      // console.info("No publisher ID provided, disabling Google Adsense");
-      return;
     }
 
     setUseGA(true);

diff --git a/src/components/Analytics/analytics.tsx b/src/components/Analytics/analytics.tsx
@@ -67,19 +67,20 @@ export function Analytics(): React.ReactNode {
       analytics_storage: getAnalyticsStorageConsent(),
     });
 
+    if (
+      process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID === "G-XXXXXXXXXX" ||
+      !process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID
+    ) {
+      console.info("No measurement ID provided, disabling Google Analytics");
+      return;
+    }
     if (getEnvironment() === "development") {
       if (process.env.NEXT_PUBLIC_ENABLE_ANALYTICS) {
         console.info("Enabling Google Analytics during development");
       } else {
         console.info("Google Analytics disabled during development");
         return;
       }
-    } else if (
-      process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID === "G-XXXXXXXXXX" ||
-      !process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID
-    ) {
-      console.info("No measurement ID provided, disabling Google Analytics");
-      return;
     }
 
     setUseGA(true);