diff --git a/.env b/.env index 172d6b3..4a10ac9 100644 --- a/.env +++ b/.env @@ -6,6 +6,3 @@ NEXT_PUBLIC_PROVIDER_ID=12527 NEXT_PUBLIC_SCIENTIST_API_VERSION=v2 NEXT_PUBLIC_WEBHOOK_URL=http://ss-mailer/webstore NEXT_PUBLIC_APP_BASE_URL=https://www.phenovista.vercel.app - -# optional/conditional variables -GOOGLE_TAG_MANAGER_ID=GTM-PQGCP24G diff --git a/charts/webstore/templates/deployment.yaml b/charts/webstore/templates/deployment.yaml index 3caf9e0..8e1cce7 100644 --- a/charts/webstore/templates/deployment.yaml +++ b/charts/webstore/templates/deployment.yaml @@ -38,6 +38,8 @@ spec: value: "{{ .Values.clientSecret }}" - name: CLIENT_ID value: "{{ .Values.clientId }}" + - name: GOOGLE_TAG_MANAGER_ID + value: "{{ .Values.googleTagManagerId }}" - name: NEXTAUTH_SECRET value: "{{ .Values.nextAuthSecret }}" - name: NEXTAUTH_URL diff --git a/charts/webstore/values.yaml b/charts/webstore/values.yaml index 9df206f..8aedb15 100644 --- a/charts/webstore/values.yaml +++ b/charts/webstore/values.yaml @@ -14,6 +14,7 @@ appBaseUrl: '' clientId: '' clientSecret: '' fullnameOverride: '' +googleTagManagerId: '' imagePullSecrets: [] nameOverride: '' nextAuthSecret: '' diff --git a/ops/production-deploy.tmpl.yaml b/ops/production-deploy.tmpl.yaml index 07e111d..1369cf6 100644 --- a/ops/production-deploy.tmpl.yaml +++ b/ops/production-deploy.tmpl.yaml @@ -1,6 +1,7 @@ appBaseUrl: 'https://phenovista.softserv.cloud' clientId: $CLIENT_ID clientSecret: $CLIENT_SECRET +googleTagManagerId: 'GTM-PQGCP24G' nextAuthSecret: $NEXTAUTH_SECRET nextAuthUrl: 'https://phenovista.softserv.cloud/api/auth' nextPublicToken: $NEXT_PUBLIC_TOKEN diff --git a/ops/staging-deploy.tmpl.yaml b/ops/staging-deploy.tmpl.yaml index 6c2d180..ebbc985 100644 --- a/ops/staging-deploy.tmpl.yaml +++ b/ops/staging-deploy.tmpl.yaml @@ -1,6 +1,7 @@ appBaseUrl: 'https://phenovista-staging.softserv.cloud' clientId: $CLIENT_ID clientSecret: $CLIENT_SECRET +googleTagManagerId: '' nextAuthSecret: $NEXTAUTH_SECRET nextAuthUrl: 'https://phenovista-staging.softserv.cloud/api/auth' nextPublicToken: $NEXT_PUBLIC_TOKEN diff --git a/pages/_app.js b/pages/_app.js index 9a638e0..9ede25e 100644 --- a/pages/_app.js +++ b/pages/_app.js @@ -21,7 +21,6 @@ import { headerAndFooterLinkColors, } from '../utils' import '../utils/theme/globals.scss' -const gtmId = process.env.NODE_ENV === 'production' ? process.env.GOOGLE_TAG_MANAGER_ID : '' const WebStore = ({ Component }) => { /** @@ -42,7 +41,7 @@ const WebStore = ({ Component }) => { enableCookies={enableCookies} getCookieConsent={getCookieConsent()} /> */} - +
signIn(process.env.NEXT_PUBLIC_PROVIDER_NAME),