Merge pull request #176 from toppers/update-GA4

GA4対応
toppers · May 19, 2024 · d07ff80 · d07ff80
2 parents 480928d + 7a8403c
commit d07ff80
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -14,7 +14,7 @@
 			// Rebuild the container if it already exists to update.
 			"VERSION": "latest",
 			// Update NODE_VERSION to pick the Node.js version: 12, 14
-			"NODE_VERSION": "14"
+			"NODE_VERSION": "20"
 		}
 	},
 
@@ -42,7 +42,7 @@
 
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "uname -a",
-	"postCreateCommand": "git submodule update --init",
+	// "postCreateCommand": "git submodule update --init",
 
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node"

diff --git a/config.toml b/config.toml
@@ -4,7 +4,7 @@ title = "箱庭"
 theme = "kube"
 description = "IoT／クラウドロボティクス時代の仮想シミュレーション環境"
 Paginate = 4
-googleAnalytics = "UA-169187702-1"
+GoogleAnalytics = "G-57DLKTNNK8"
 
 DefaultContentLanguage = "ja"
 

diff --git a/content/en/prototypes/multi-robot.md b/content/en/prototypes/multi-robot.md
@@ -29,7 +29,7 @@ This prototype uses Unity's Photon library to synchronize multiple Unity environ
 
 Various demos are available at the following Github repository. Try them out.
 
-‐ [toppers/hakoniwa-ros-multiplay]("https://github.com/toppers/hakoniwa-ros-multiplay")
+‐ [toppers/hakoniwa-ros-multiplay](https://github.com/toppers/hakoniwa-ros-multiplay)
 
 ### Demonstration of examples
 - Multiple robot collaboration with photon

diff --git a/content/prototypes/multi-robot.md b/content/prototypes/multi-robot.md
@@ -30,7 +30,7 @@ UnityのPhotonライブラリを用いて複数のUnity環境の同期を行っ
 
 以下のGithubリポジトリにて，各種デモを公開しています．ぜひお試し下さい．
 
-‐ [toppers/hakoniwa-ros-multiplay]("https://github.com/toppers/hakoniwa-ros-multiplay")
+‐ [toppers/hakoniwa-ros-multiplay](https://github.com/toppers/hakoniwa-ros-multiplay)
 
 ### 動作例のデモ
 - photonによる複数ロボットの連携

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -24,7 +24,7 @@
   <!-- Site verification -->
   {{ if .IsHome }} {{ partial "site-verification" . }} {{ end }}
   <!-- add googleAnalytics in config.toml -->
-  {{ template "_internal/google_analytics_async.html" . }}
+  {{- partial "analytics" . -}}
   {{ with .OutputFormats.Get "RSS" }} <link href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" title="{{ site.Title }}" /> {{ end }}
 
   <link rel="canonical" href="{{ .Permalink }}"> {{ if (isset .Params "prev") }}

diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
@@ -0,0 +1,13 @@
+{{ if not hugo.IsServer }}
+{{ with .Site.GoogleAnalytics }}
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.GoogleAnalytics }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '{{ .Site.GoogleAnalytics }}');
+</script>
+{{ end }}
+{{ end }}