From 60058749862469a7734e3ace755cbaa8bd6f36b2 Mon Sep 17 00:00:00 2001
From: Mitsutaka Takada <mtakada@nces.i.nagoya-u.ac.jp>
Date: Thu, 16 May 2024 10:42:15 +0000
Subject: [PATCH 1/2] Update Google Analytics ID in config.toml and add
 analytics partial template #160

---
 .devcontainer/devcontainer.json |  4 ++--
 config.toml                     |  2 +-
 layouts/_default/baseof.html    |  2 +-
 layouts/partials/analytics.html | 13 +++++++++++++
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 layouts/partials/analytics.html

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 26339226..46edc24e 100644
--- 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
index 77097671..80da4994 100644
--- 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/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 770c53d4..b7c6df3d 100644
--- 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
new file mode 100644
index 00000000..ec3a7ec8
--- /dev/null
+++ 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 }}
\ No newline at end of file

From 7a8403c6852c8eb2fd9ad368a05a59b763e1fd98 Mon Sep 17 00:00:00 2001
From: Mitsutaka Takada <mtakada@nces.i.nagoya-u.ac.jp>
Date: Thu, 16 May 2024 10:42:47 +0000
Subject: [PATCH 2/2] Update link to toppers/hakoniwa-ros-multiplay repository

---
 content/en/prototypes/multi-robot.md | 2 +-
 content/prototypes/multi-robot.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/en/prototypes/multi-robot.md b/content/en/prototypes/multi-robot.md
index cecd470c..2d42f20c 100644
--- 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
index 18231731..747f63d0 100644
--- 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による複数ロボットの連携