enable analytics

raymonstah · Apr 2, 2024 · d957161 · d957161
1 parent 9b4cf45
commit d957161
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 12 deletions.
diff --git a/functions/api/server/public/templates/about.html b/functions/api/server/public/templates/about.html
@@ -8,6 +8,8 @@
     <link href="/output.css" rel="stylesheet" />
     <script src="/1.9.10.htmx.min.js"></script>
 
+    {{ template "rollbar.html" . }}
+    {{ template "google-analytics.html" . }}
     {{ template "dark-mode.html" . }}
 
   </head>

diff --git a/functions/api/server/public/templates/error.html b/functions/api/server/public/templates/error.html
@@ -8,6 +8,8 @@
     <link href="/output.css" rel="stylesheet" />
     <script src="/1.9.10.htmx.min.js"></script>
 
+    {{ template "rollbar.html" . }}
+    {{ template "google-analytics.html" . }}
     {{ template "google-ads.html" . }}
     {{ template "dark-mode.html" . }}
 

diff --git a/functions/api/server/public/templates/google-analytics.html b/functions/api/server/public/templates/google-analytics.html
@@ -0,0 +1,12 @@
+<!-- For Google Analytics -->
+{{ if .EnableAnalytics }}
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-DNWC1SD6ZZ"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-DNWC1SD6ZZ');
+</script>
+{{ end }}
diff --git a/functions/api/server/public/templates/humans-id.html b/functions/api/server/public/templates/humans-id.html
@@ -7,6 +7,7 @@
     <link rel="icon" href="/favicon.ico" type="image/x-icon" />
     <link href="/output.css" rel="stylesheet" />
     {{ template "rollbar.html" . }}
+    {{ template "google-analytics.html" . }}
     <script src="/1.9.10.htmx.min.js"></script>
 
     {{ template "google-ads.html" . }}

diff --git a/functions/api/server/public/templates/humans.html b/functions/api/server/public/templates/humans.html
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" href="/favicon.ico" type="image/x-icon" />
     {{ template "rollbar.html" . }}
+    {{ template "google-analytics.html" . }}
     <link href="/output.css" rel="stylesheet" />
     <script src="/1.9.10.htmx.min.js"></script>
 

diff --git a/functions/api/server/public/templates/index.html b/functions/api/server/public/templates/index.html
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" href="/favicon.ico" type="image/x-icon" />
     {{ template "rollbar.html" . }}
+    {{ template "google-analytics.html" . }}
     <link href="/output.css" rel="stylesheet" />
     <script src="/1.9.10.htmx.min.js"></script>
 

diff --git a/functions/api/server/server-html.go b/functions/api/server/server-html.go
@@ -202,10 +202,11 @@ func (s *ServerHTML) HandlerError(w http.ResponseWriter, r *http.Request, e Erro
 }
 
 type Base struct {
-	Local        bool
-	EnableAds    bool
-	RollbarToken string
-	Admin        bool
+	Local           bool
+	EnableAds       bool
+	EnableAnalytics bool
+	RollbarToken    string
+	Admin           bool
 }
 
 type HTMLResponseHumans struct {
@@ -338,9 +339,10 @@ func (s *ServerHTML) HandlerHumans(w http.ResponseWriter, r *http.Request) error
 
 	response := HTMLResponseHumans{
 		Base: Base{
-			Local:        s.local,
-			EnableAds:    !s.local,
-			RollbarToken: s.rollbarToken,
+			Local:           s.local,
+			EnableAds:       !s.local,
+			EnableAnalytics: !s.local,
+			RollbarToken:    s.rollbarToken,
 		},
 		Count:       len(humans),
 		Humans:      humans,
@@ -404,7 +406,7 @@ func (s *ServerHTML) HandlerHuman(w http.ResponseWriter, r *http.Request) error
 		return NewNotFoundError(fmt.Errorf("%w: %v", humandao.ErrHumanNotFound, path))
 	}
 
-	base := Base{EnableAds: !s.local, Admin: admin, RollbarToken: s.rollbarToken, Local: s.local}
+	base := Base{EnableAds: !s.local, EnableAnalytics: !s.local, Admin: admin, RollbarToken: s.rollbarToken, Local: s.local}
 	response := HTMLResponseHuman{Human: human, Base: base}
 	if err := s.template.ExecuteTemplate(w, "humans-id.html", response); err != nil {
 		s.logger.Error().Err(err).Msg("unable to execute humans-id template")
@@ -449,7 +451,7 @@ func (s *ServerHTML) HandlerHumanEdit(w http.ResponseWriter, r *http.Request) er
 		return err
 	}
 
-	base := Base{EnableAds: !s.local, Admin: admin, RollbarToken: s.rollbarToken, Local: s.local}
+	base := Base{EnableAds: !s.local, EnableAnalytics: !s.local, Admin: admin, RollbarToken: s.rollbarToken, Local: s.local}
 	response := HTMLResponseHuman{Human: human, Base: base}
 	if err := s.template.ExecuteTemplate(w, "humans-id-edit.html", response); err != nil {
 		s.logger.Error().Err(err).Msg("unable to execute humans-id-edit.html template")
@@ -495,7 +497,7 @@ func (s *ServerHTML) HandlerHumanUpdate(w http.ResponseWriter, r *http.Request)
 		return err
 	}
 
-	base := Base{EnableAds: !s.local, Admin: s.local, RollbarToken: s.rollbarToken, Local: s.local}
+	base := Base{EnableAds: !s.local, EnableAnalytics: !s.local, Admin: s.local, RollbarToken: s.rollbarToken, Local: s.local}
 	response := HTMLResponseHuman{Human: human, Base: base}
 	if err := s.template.ExecuteTemplate(w, "humans-id.html", response); err != nil {
 		s.logger.Error().Err(err).Msg("unable to execute humans-id template")
@@ -543,12 +545,12 @@ func (s *ServerHTML) HandlerLogin(w http.ResponseWriter, r *http.Request) error
 			referer = "/admin"
 		}
 
-		w.Header().Add("HX-Redirect", referer) // not needed, but just in case I decide to switch to htmx.ajax()
+		w.Header().Add("HX-Redirect", referer)
 		http.Redirect(w, r, referer, http.StatusFound)
 		return nil
 	}
 
-	base := Base{EnableAds: !s.local, Admin: s.local, RollbarToken: s.rollbarToken, Local: s.local}
+	base := Base{EnableAds: !s.local, EnableAnalytics: !s.local, Admin: s.local, RollbarToken: s.rollbarToken, Local: s.local}
 	response := HTMLResponseLogin{Base: base}
 	if err := s.template.ExecuteTemplate(w, "login.html", response); err != nil {
 		s.logger.Error().Err(err).Msg("unable to execute login template")