diff --git a/src/components/Adsense/adsense.tsx b/src/components/Adsense/adsense.tsx index c5f1cc4..b95ceb2 100644 --- a/src/components/Adsense/adsense.tsx +++ b/src/components/Adsense/adsense.tsx @@ -6,6 +6,13 @@ export function Adsense(): React.ReactNode { const [useGA, setUseGA] = React.useState(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"); @@ -13,12 +20,6 @@ export function Adsense(): React.ReactNode { 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 index f0bb09d..83191ee 100644 --- a/src/components/Analytics/analytics.tsx +++ b/src/components/Analytics/analytics.tsx @@ -67,6 +67,13 @@ 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"); @@ -74,12 +81,6 @@ export function Analytics(): React.ReactNode { 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);