Update/recaptcha script (#1680)

* chore:NEXT_PUBLIC_GA_MEASUREMENT_ID to constants * update:wrapper recaptcha script in conditional * Update _app.tsx --------- Co-authored-by: Ruslan K <[email protected]>
ever-co · Oct 30, 2023 · b027fd4 · b027fd4
1 parent b922350
commit b027fd4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
@@ -36,6 +36,7 @@ export const INVITE_CALLBACK_URL = process.env.INVITE_CALLBACK_URL;
 export const INVITE_CALLBACK_PATH = '/auth/passcode';
 export const VERIFY_EMAIL_CALLBACK_URL = process.env.VERIFY_EMAIL_CALLBACK_URL;
 export const VERIFY_EMAIL_CALLBACK_PATH = '/verify-email';
+export const GA_MEASUREMENT_ID = process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID
 
 export const SMTP_FROM_ADDRESS = process.env.SMTP_FROM_ADDRESS || '[email protected]';
 export const SMTP_HOST = process.env.SMTP_HOST || '';

diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx
@@ -1,8 +1,7 @@
 /* eslint-disable no-mixed-spaces-and-tabs */
 import 'react-loading-skeleton/dist/skeleton.css';
 import '../styles/globals.css';
-
-import { jitsuConfiguration } from '@app/constants';
+import { GA_MEASUREMENT_ID, RECAPTCHA_SITE_KEY, jitsuConfiguration } from '@app/constants';
 import { JitsuProvider } from '@jitsu/jitsu-react';
 import { Analytics } from '@vercel/analytics/react';
 import { AppState } from 'lib/app/init-state';
@@ -16,20 +15,27 @@ import { SkeletonTheme } from 'react-loading-skeleton';
 import { RecoilRoot } from 'recoil';
 import { JitsuAnalytics } from '../lib/components/services/jitsu-analytics';
 import i18n from '../ni18n.config';
+
 const MyApp = ({ Component, pageProps }: AppProps) => {
 	const isJitsuEnvsPresent = jitsuConfiguration.host && jitsuConfiguration.writeKey;
 	return (
 		<>
-			<Script
-				strategy="lazyOnload"
-				src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID}`}
-			/>
-			<Script strategy="lazyOnload" id="google-analytic-script">
-				{` window.dataLayer = window.dataLayer || [];
-  				function gtag(){dataLayer.push(arguments);}
-  				gtag('js', new Date());
-  				gtag('config', '${process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID}');`}
-			</Script>
+
+			{GA_MEASUREMENT_ID && (
+				<>
+					<Script
+					strategy="lazyOnload"
+					src={`https://www.googletagmanager.com/gtag/js?id=${GA_MEASUREMENT_ID}`}
+				/>
+				<Script strategy="lazyOnload" id="google-analytic-script">
+					{` window.dataLayer = window.dataLayer || [];
+					  function gtag(){dataLayer.push(arguments);}
+					  gtag('js', new Date());
+					  gtag('config', '${GA_MEASUREMENT_ID}');`}
+				</Script>
+				</>
+			)}
+
 			<Head>
 				<link rel="preconnect" href="https://fonts.googleapis.com" />
 				<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />