🐞 Remove deprecated Site.GoogleAnalytics #205/#204 (#206)

colinwilson · web-flow · commit 975da91e839c · 2025-02-04T07:14:19.000-04:00
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
@@ -27,7 +27,7 @@
     {{ end }}
 
     {{ if .Site.Params.feedback.enabled | default false -}}
-        {{ if or (.Site.Params.plausible.dataDomain) (.Site.GoogleAnalytics) }}
+        {{ if or (.Site.Params.plausible.dataDomain) (.Site.Config.Services.GoogleAnalytics.ID) }}
             {{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "footer/feedback.html") . -}}
         {{ else }}
             {{ errorf "Either Google Analytics or Plausible Analytics must be configured before enabling the Feedback Widget." }}
diff --git a/layouts/partials/docs/footer/feedback.html b/layouts/partials/docs/footer/feedback.html
@@ -253,7 +253,7 @@
         }
         try {
             if (formType == "positive") {
-                {{ if .Site.GoogleAnalytics -}}
+                {{ if .Site.Config.Services.GoogleAnalytics.ID -}}
                 {{ if not .Site.Params.feedback.eventDest | or (in .Site.Params.feedback.eventDest "google") -}}
                 gtag('event', '{{ replaceRE `( {1,})` "_" (.Site.Params.feedback.positiveEventName | default "Positive Feedback" | lower) }}',
                     {
@@ -279,7 +279,7 @@
                 {{ end -}}
                 {{ end -}}
             } else if (formType == "negative") {
-                {{ if .Site.GoogleAnalytics -}}
+                {{ if .Site.Config.Services.GoogleAnalytics.ID -}}
                 {{ if not .Site.Params.feedback.eventDest | or (in .Site.Params.feedback.eventDest "google") -}}
                 gtag('event', '{{ replaceRE `( {1,})` "_" (.Site.Params.feedback.negativeEventName | default "Positive Feedback" | lower) }}',
                     {

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@`
`253`	`253`	`}`
`254`	`254`	`try {`
`255`	`255`	`if (formType == "positive") {`
`256`		`- {{ if .Site.GoogleAnalytics -}}`
	`256`	`+ {{ if .Site.Config.Services.GoogleAnalytics.ID -}}`
`257`	`257`	`{{ if not .Site.Params.feedback.eventDest \| or (in .Site.Params.feedback.eventDest "google") -}}`
`258`	`258`	gtag('event', '{{ replaceRE `( {1,})` "_" (.Site.Params.feedback.positiveEventName \| default "Positive Feedback" \| lower) }}',
`259`	`259`	`{`
`@@ -279,7 +279,7 @@`
`279`	`279`	`{{ end -}}`
`280`	`280`	`{{ end -}}`
`281`	`281`	`} else if (formType == "negative") {`
`282`		`- {{ if .Site.GoogleAnalytics -}}`
	`282`	`+ {{ if .Site.Config.Services.GoogleAnalytics.ID -}}`
`283`	`283`	`{{ if not .Site.Params.feedback.eventDest \| or (in .Site.Params.feedback.eventDest "google") -}}`
`284`	`284`	gtag('event', '{{ replaceRE `( {1,})` "_" (.Site.Params.feedback.negativeEventName \| default "Positive Feedback" \| lower) }}',
`285`	`285`	`{`