Update Analytics Script (#367)

trimble-oss · Feb 6, 2024 · 2f8fb09 · 2f8fb09
1 parent 805b882
commit 2f8fb09
Show file tree

Hide file tree

Showing 19 changed files with 55 additions and 31 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -21,6 +21,7 @@
     "getenv",
     "horiz",
     "iframe",
+    "incab",
     "jquery",
     "labelledby",
     "liga",
@@ -33,6 +34,7 @@
     "noopener",
     "noscript",
     "npmjs",
+    "onclick",
     "paren",
     "pe-none",
     "picocolors",
@@ -60,6 +62,7 @@
     "trimbleinc",
     "twbs",
     "uncombine",
+    "uncompiled",
     "undock",
     "urlize",
     "versioner",
@@ -73,6 +76,7 @@
     ".cspell.json",
     "**/node_modules/**",
     "*.min.*",
+    "*.js",
     ".github/CODEOWNERS",
     "{coverage,.cache,.git,.vscode,.DS_Store,tests}/**/*",
     "app-components/preview/app-components.js"

diff --git a/.ncurc.json b/.ncurc.json
@@ -1,3 +1,11 @@
 {
-  "reject": ["file-type", "mkdirp", "read-chunk", "svgicons2svgfont", "ttf2eot", "ttf2woff", "url-join"]
+  "reject": [
+    "file-type",
+    "mkdirp",
+    "read-chunk",
+    "svgicons2svgfont",
+    "ttf2eot",
+    "ttf2woff",
+    "url-join"
+  ]
 }
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16
+16.20.2
diff --git a/.prettierignore b/.prettierignore
@@ -4,4 +4,3 @@ _modus-bootstrap-dark.scss
 hugo.yml
 package.json
 package-lock.json
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,6 +4,8 @@
 
 To get started, clone the repo, install dependencies, and run the build script.
 
+You must use Node v16 to build the project.
+
 ```shell
 git clone https://github.com/trimble-oss/modus-icons/
 cd modus-icons

diff --git a/app-components/preview/index.html b/app-components/preview/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en-US">
   <head>
     <meta charset="utf-8">
     <title>Site Search</title>

diff --git a/app-components/src/index.html b/app-components/src/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US">
 <head>
   <meta charset="utf-8">
   <title>SiteSearch</title>

diff --git a/docs/layouts/_default/404.html b/docs/layouts/_default/404.html
@@ -3,6 +3,7 @@
 {{ $external := resources.Get "js/app-components.js" }}
 {{ $appComponentsJs := slice $external | resources.Concat "js/app-components.js" | resources.Minify | resources.Fingerprint }}
 <script src="{{- $appComponentsJs.RelPermalink -}}" defer fetchpriority="high"></script>
+<script>document.addEventListener('DOMContentLoaded', function () { plausible('404', { props: { path: document.location.pathname } }); });</script>
 
 {{- .Content -}}
 
@@ -28,5 +29,4 @@ <h2 class="display-1 text-center mx-auto pt-5">
   Looking for an icon? Use the search above!
 </p>
 
-<script>plausible("404", { props: { path: document.location.pathname } });</script>
 {{ end }}
diff --git a/docs/layouts/_default/baseof.html b/docs/layouts/_default/baseof.html
@@ -1,8 +1,9 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US">
 
 <head>
   {{- partial "head" . }}
+  {{ partial "analytics" . }}
 </head>
 
 <body class="{{ if .IsPage }}single{{ else }}list{{ end }}">
@@ -16,7 +17,6 @@
 
   {{ partialCached "footer" . }}
   {{ partialCached "scripts" . }}
-  {{ partial "analytics" . }}
 </body>
 
 </html>
diff --git a/docs/layouts/_default/font.html b/docs/layouts/_default/font.html
@@ -1,7 +1,8 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US">
   <head>
     {{ partial "head" . }}
+    {{ partial "analytics" . }}
   </head>
   <body class="text-center">
     {{ partialCached "skippy" . }}

diff --git a/docs/layouts/_default/home.html b/docs/layouts/_default/home.html
@@ -1,7 +1,8 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US">
   <head>
     {{ partial "head" . }}
+    {{ partial "analytics" . }}
   </head>
 
 <body class="home">
@@ -96,6 +97,5 @@ <h2 class="fw-bold">Modus Icons by Sector</h2>
 
     {{- partialCached "footer" . }}
     {{- partialCached "scripts" . }}
-    {{ partial "analytics" . }}
     </body>
 </html>
diff --git a/docs/layouts/modus-outlined/home.html b/docs/layouts/modus-outlined/home.html
@@ -1,8 +1,9 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US">
 
 <head>
   {{ partial "head" . }}
+  {{ partial "analytics" . }}
 </head>
 
 <body>
@@ -18,7 +19,6 @@
 
   {{- partialCached "footer" . }}
   {{- partialCached "scripts" . }}
-  {{ partial "analytics" . }}
 
 </body>
 

diff --git a/docs/layouts/modus-solid/home.html b/docs/layouts/modus-solid/home.html
@@ -1,8 +1,9 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US">
 
 <head>
   {{ partial "head" . }}
+  {{ partial "analytics" . }}
 </head>
 
 <body>
@@ -18,7 +19,6 @@
 
   {{- partialCached "footer" . }}
   {{- partialCached "scripts" . }}
-  {{ partial "analytics" . }}
 </body>
 
 </html>
diff --git a/docs/layouts/partials/analytics.html b/docs/layouts/partials/analytics.html
@@ -1,18 +1,27 @@
 {{- if not .Site.IsServer -}}
-<script id="plausible" defer data-domain="modus-icons.trimble.com"
-  src="https://plausible.io/js/script.outbound-links.js" fetchpriority="low"></script>
+<script>
+  if (window.location.host === 'modus-icons.trimble.com') {
+    var script = document.createElement('script');
+    script.defer = true;
+    script.setAttribute('data-domain', 'modus-icons.trimble.com');
+    script.src = 'https://plausible.io/js/script.outbound-links.file-downloads.js';
+    document.head.appendChild(script);
+  }
+</script>
 <script>window.plausible = window.plausible || function () { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
 
-<script src="/js/trimble-insights.min.js"></script>
+<script src="/js/trimble-insights.min.js" async></script>
 <script>
-  window.tdcafLogger.init({
-    appname: 'trimble-tux-modusicons-web-dev',
-    headers: {
-      'x-app-name': 'trimble-tux-modusicons-web-dev',
-      'x-api-key': '{{- .Site.Params.trimble_insights_key -}}'
-    },
-    interval: 2000
+  document.addEventListener("DOMContentLoaded", function() {
+    window.tdcafLogger.init({
+      appname: 'trimble-tux-modusicons-web-dev',
+      headers: {
+        'x-app-name': 'trimble-tux-modusicons-web-dev',
+        'x-api-key': '{{- .Site.Params.trimble_insights_key -}}'
+      },
+      interval: 2000
+    });
+    window.tdcafLogger.trackEvents();
   });
-  window.tdcafLogger.trackEvents();
 </script>
 {{ end }}
diff --git a/docs/layouts/transportation/home.html b/docs/layouts/transportation/home.html
@@ -1,8 +1,9 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US">
 
 <head>
   {{ partial "head" . }}
+  {{ partial "analytics" . }}
 </head>
 
 <body id="icons-body">

diff --git a/hugo.yml b/hugo.yml
@@ -1,4 +1,4 @@
-languageCode:           "en"
+languageCode:           "en-US"
 title:                  "Modus Icons"
 baseURL:                "https://modus-icons.trimble.com/"
 enableInlineShortcodes: true

diff --git a/icons/modus-outlined/drivers.svg b/icons/modus-outlined/drivers.svg
diff --git a/icons/modus-outlined/less-than-equal-to.svg b/icons/modus-outlined/less-than-equal-to.svg
diff --git a/icons/modus-solid/less-than-equal-to.svg b/icons/modus-solid/less-than-equal-to.svg