From 84e13a2a105ee74c02420c54586624cf3470540c Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 18 Sep 2023 09:51:43 -0700
Subject: [PATCH] Add external analytics url.

---
 .gitignore                                                | 5 +----
 src/components/pages/settings/websites/TrackingCode.js    | 6 ++++--
 src/components/pages/settings/websites/WebsiteSettings.js | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99087ab5..32e3ef0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,10 +33,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env
-.env.development.local
-.env.test.local
-.env.production.local
+*.env
 
 *.dev.yml
 
diff --git a/src/components/pages/settings/websites/TrackingCode.js b/src/components/pages/settings/websites/TrackingCode.js
index d22f0d59..a666476d 100644
--- a/src/components/pages/settings/websites/TrackingCode.js
+++ b/src/components/pages/settings/websites/TrackingCode.js
@@ -3,7 +3,7 @@ import useMessages from 'components/hooks/useMessages';
 import useConfig from 'components/hooks/useConfig';
 import { useRouter } from 'next/router';
 
-export function TrackingCode({ websiteId }) {
+export function TrackingCode({ websiteId, analyticsUrl }) {
   const { formatMessage, messages } = useMessages();
   const { basePath } = useRouter();
   const config = useConfig();
@@ -13,7 +13,9 @@ export function TrackingCode({ websiteId }) {
 
   const url = trackerScriptName?.startsWith('http')
     ? trackerScriptName
-    : `${process.env.analyticsUrl || location.origin}${basePath}/${trackerScriptName}`;
+    : `${
+        analyticsUrl || process.env.analyticsUrl || location.origin
+      }${basePath}/${trackerScriptName}`;
 
   const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;
 
diff --git a/src/components/pages/settings/websites/WebsiteSettings.js b/src/components/pages/settings/websites/WebsiteSettings.js
index f73e0a87..3cd4185c 100644
--- a/src/components/pages/settings/websites/WebsiteSettings.js
+++ b/src/components/pages/settings/websites/WebsiteSettings.js
@@ -11,7 +11,7 @@ import ShareUrl from 'components/pages/settings/websites/ShareUrl';
 import useApi from 'components/hooks/useApi';
 import useMessages from 'components/hooks/useMessages';
 
-export function WebsiteSettings({ websiteId, openExternal = false }) {
+export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl }) {
   const router = useRouter();
   const { formatMessage, labels, messages } = useMessages();
   const { get, useQuery } = useApi();
@@ -68,7 +68,7 @@ export function WebsiteSettings({ websiteId, openExternal = false }) {
       {tab === 'details' && (
         <WebsiteEditForm websiteId={websiteId} data={values} onSave={handleSave} />
       )}
-      {tab === 'tracking' && <TrackingCode websiteId={websiteId} data={values} />}
+      {tab === 'tracking' && <TrackingCode websiteId={websiteId} analyticsUrl={analyticsUrl} />}
       {tab === 'share' && <ShareUrl websiteId={websiteId} data={values} onSave={handleSave} />}
       {tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleReset} />}
     </Page>