From b0956d4f13abe38866fa7a541895ece0e1dff944 Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 00:05:32 +0900
Subject: [PATCH 1/8] =?UTF-8?q?refs=20#23=20=E6=A4=9C=E7=B4=A2=E4=BB=AE?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/search/_index.ja.md    | 36 ++++++++++++++++++++++++++++++++++
 layouts/partials/banner.html   | 29 +++++++++++++++++++++++----
 layouts/shortcodes/result.html | 20 +++++++++++++++++++
 3 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 content/search/_index.ja.md
 create mode 100644 layouts/shortcodes/result.html

diff --git a/content/search/_index.ja.md b/content/search/_index.ja.md
new file mode 100644
index 00000000..f9df4fd4
--- /dev/null
+++ b/content/search/_index.ja.md
@@ -0,0 +1,36 @@
+---
+title: "検索"
+draft: false
+---
+<input id = "query" onkeyup="search(this.value)" size="30" autocomplete="off" autofocus placeholder="検索キーワードを入れてください" />
+
+<script>
+    // 検索
+    function search(query) {
+        $(".card").each(function(i, elem) {
+            var question = $(elem).find("span").text().toLowerCase();
+            var answer = $(elem).find(".card-body").text().toLowerCase();
+            if (query == "" || (question.indexOf(query) == -1 && answer.indexOf(query) == -1)) {
+                $(elem).css("display", "none");
+            } else {
+                $(elem).css("display", "block");
+            }
+        })
+    }
+    // ハッシュフラグメントの値で検索を実行
+    function searchWithHash() {
+        const hash = decodeURI(location.hash.substring(1));
+        search(hash);
+        // 必要があれば input 要素の値を更新
+        const queryElem = document.getElementById('query');
+        if (queryElem.value !== hash) {
+        queryElem.value = hash;
+        }
+    }
+    // ハッシュフラグメント付きの URL でページを開いたときに検索
+    window.addEventListener('DOMContentLoaded', searchWithHash);
+    // ページ表示後にハッシュフラグメントが変化したら検索
+    window.addEventListener('hashchange', searchWithHash);
+</script>
+
+{{< result >}}
\ No newline at end of file
diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 5c084e92..3acae7a6 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -4,8 +4,29 @@
 		<div class="col-lg-8 text-center mx-auto">
 			<h1 class="text-white mb-3">{{ .Site.Params.banner.title | markdownify }}</h1>
 			<p class="text-white mb-4">{{ .Site.Params.banner.subtitle | markdownify }}</p>
-			<!-- <div class="position-relative">
-				<input id="search" class="form-control" placeholder="{{ .Site.Params.banner.placeholder }}">
+			<div class="position-relative">
+				<form>
+					<input id="searchKeyword" type="search" size="30" style="margin-top: 16px;">
+					<input id="searchButton" type="submit" value="検索">
+				</form>
+
+				<script>
+					const SEARCH_URL = '/vaccinecert-faq/search/';
+
+					window.addEventListener('DOMContentLoaded', () => {
+						const searchButton = document.getElementById('searchButton');
+						const searchKeyword = document.getElementById('searchKeyword');
+
+						// 検索ボタンのクリックで検索ページへジャンプ
+						searchButton.addEventListener('click', e => {
+							e.preventDefault();  // Prevent default form's behavior
+							const query = searchKeyword.value;
+							const url = query ? SEARCH_URL + '#' + query : SEARCH_URL;
+							location.href = url;
+						});
+					});
+				</script>
+				<!-- <input id="search" class="form-control" placeholder="{{ .Site.Params.banner.placeholder }}">
 				<i class="ti-search search-icon"></i> -->
 				<!-- Javascript -->
 				<!-- {{ $currentNode := . }}
@@ -31,8 +52,8 @@ <h1 class="text-white mb-3">{{ .Site.Params.banner.title | markdownify }}</h1>
 						.appendTo( ul );
 					};
 					});
-				</script>
-			</div> -->
+				</script> -->
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/layouts/shortcodes/result.html b/layouts/shortcodes/result.html
new file mode 100644
index 00000000..94555040
--- /dev/null
+++ b/layouts/shortcodes/result.html
@@ -0,0 +1,20 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
+{{ range $faq := (where $.Site.Data.faq.faq "カテゴリ名" "!=" "") }}
+<div class="card mb-4 rounded-0 shadow border-0" style="display: none;">
+  <div class="card-header rounded-0 bg-white border p-0 border-0">
+    <a class="card-link h4 d-flex tex-dark mb-0 py-3 px-4 justify-content-between" data-toggle="collapse"
+      href="#{{ $faq.質問 | sha1 }}">
+      <span>{{ $faq.質問 }}</span> <i class="ti-plus text-primary text-right"></i>
+    </a>
+  </div>
+  <div id="{{ $faq.質問 | sha1 }}" class="collapse" data-parent="#accordion">
+    <div class="card-body font-secondary text-color pt-0" style="white-space:pre-wrap; margin-bottom: 0px;">{{ $faq.回答 }}</div>
+    <div class="card-footer rounded-0 bg-white border p-0 border-0" style="text-align: right; margin-bottom: 0px; margin-right: 20px;">
+      {{ if eq (len $faq.更新日) 8 }}
+        最終更新日：{{ slicestr $faq.更新日 0 4 }}年{{ slicestr $faq.更新日 4 6 | strings.TrimLeft "0" }}月{{ slicestr $faq.更新日 6 | strings.TrimLeft "0" }}日&nbsp;
+      {{ end}}
+    </div>
+  </div>
+  {{ .Inner }}
+</div>
+{{ end }}

From 99321a50dda4641adeb7aa5eb473a22e6f8ade66 Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 00:11:46 +0900
Subject: [PATCH 2/8] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E7=AA=93=E3=81=8C?=
 =?UTF-8?q?=E9=95=B7=E3=81=99=E3=81=8E=E3=81=9F=E3=81=AE=E3=81=A7=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/search/_index.ja.md  | 2 +-
 layouts/partials/banner.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/search/_index.ja.md b/content/search/_index.ja.md
index f9df4fd4..e63bac91 100644
--- a/content/search/_index.ja.md
+++ b/content/search/_index.ja.md
@@ -2,7 +2,7 @@
 title: "検索"
 draft: false
 ---
-<input id = "query" onkeyup="search(this.value)" size="30" autocomplete="off" autofocus placeholder="検索キーワードを入れてください" />
+<input id = "query" onkeyup="search(this.value)" size="25" autocomplete="off" autofocus placeholder="キーワードを入れてください" />
 
 <script>
     // 検索
diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 3acae7a6..bb5bfa57 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -6,7 +6,7 @@ <h1 class="text-white mb-3">{{ .Site.Params.banner.title | markdownify }}</h1>
 			<p class="text-white mb-4">{{ .Site.Params.banner.subtitle | markdownify }}</p>
 			<div class="position-relative">
 				<form>
-					<input id="searchKeyword" type="search" size="30" style="margin-top: 16px;">
+					<input id="searchKeyword" type="search" size="25" style="margin-top: 16px;">
 					<input id="searchButton" type="submit" value="検索">
 				</form>
 

From 7eb025e991ef813f2b563de927cd52d138f908c9 Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 00:46:01 +0900
Subject: [PATCH 3/8] =?UTF-8?q?refs=20#23=20=E5=90=84=E3=82=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=AE=E4=B8=8B=E3=81=AE=E4=BD=99=E7=99=BD=E3=81=8C?=
 =?UTF-8?q?=E6=B6=88=E3=81=88=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/shortcodes/result.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/layouts/shortcodes/result.html b/layouts/shortcodes/result.html
index 94555040..11d95b8e 100644
--- a/layouts/shortcodes/result.html
+++ b/layouts/shortcodes/result.html
@@ -8,11 +8,13 @@
     </a>
   </div>
   <div id="{{ $faq.質問 | sha1 }}" class="collapse" data-parent="#accordion">
-    <div class="card-body font-secondary text-color pt-0" style="white-space:pre-wrap; margin-bottom: 0px;">{{ $faq.回答 }}</div>
+    <div class="card-body font-secondary text-color pt-0" style="white-space:pre-wrap; margin-bottom: 0px;">{{ $faq.回答 | markdownify }}</div>
     <div class="card-footer rounded-0 bg-white border p-0 border-0" style="text-align: right; margin-bottom: 0px; margin-right: 20px;">
       {{ if eq (len $faq.更新日) 8 }}
         最終更新日：{{ slicestr $faq.更新日 0 4 }}年{{ slicestr $faq.更新日 4 6 | strings.TrimLeft "0" }}月{{ slicestr $faq.更新日 6 | strings.TrimLeft "0" }}日&nbsp;
       {{ end}}
+      <br/>
+      <br/>
     </div>
   </div>
   {{ .Inner }}

From c0a6dee234b742d8074e2d5f53b1a3c768af168c Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 12:32:26 +0900
Subject: [PATCH 4/8] =?UTF-8?q?refs=20#23=20=E6=A4=9C=E7=B4=A2=E7=AA=93?=
 =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/search/_index.ja.md  | 4 ++--
 layouts/partials/banner.html | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/content/search/_index.ja.md b/content/search/_index.ja.md
index e63bac91..012b3b39 100644
--- a/content/search/_index.ja.md
+++ b/content/search/_index.ja.md
@@ -1,8 +1,8 @@
 ---
-title: "検索"
+title: "全てのカテゴリから検索"
 draft: false
 ---
-<input id = "query" onkeyup="search(this.value)" size="25" autocomplete="off" autofocus placeholder="キーワードを入れてください" />
+<input id = "query" onkeyup="search(this.value)" size="30" autocomplete="off" autofocus placeholder="検索キーワードを入れてください" />
 
 <script>
     // 検索
diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index bb5bfa57..8b55f8b3 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -6,8 +6,9 @@ <h1 class="text-white mb-3">{{ .Site.Params.banner.title | markdownify }}</h1>
 			<p class="text-white mb-4">{{ .Site.Params.banner.subtitle | markdownify }}</p>
 			<div class="position-relative">
 				<form>
-					<input id="searchKeyword" type="search" size="25" style="margin-top: 16px;">
-					<input id="searchButton" type="submit" value="検索">
+					<input id="searchKeyword" class="form-control" style="margin-top: 16px;" placeholder="検索キーワードを入れてください">
+					<i class="ti-search search-icon"></i>
+					<input id="searchButton" type="submit" value="" style="display: none;">
 				</form>
 
 				<script>

From c72f25adca2f23286cb9823ac14db01fdb5dcf57 Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 12:39:04 +0900
Subject: [PATCH 5/8] =?UTF-8?q?refs=20#23=20=E6=A4=9C=E7=B4=A2=E7=B5=90?=
 =?UTF-8?q?=E6=9E=9C=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E6=A4=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=AA=93=E3=81=AE=E5=B9=85=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/search/_index.ja.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/search/_index.ja.md b/content/search/_index.ja.md
index 012b3b39..e0439398 100644
--- a/content/search/_index.ja.md
+++ b/content/search/_index.ja.md
@@ -2,7 +2,7 @@
 title: "全てのカテゴリから検索"
 draft: false
 ---
-<input id = "query" onkeyup="search(this.value)" size="30" autocomplete="off" autofocus placeholder="検索キーワードを入れてください" />
+<input id = "query" onkeyup="search(this.value)" size="28" autocomplete="off" autofocus placeholder="検索キーワードを入れてください" />
 
 <script>
     // 検索

From 53231f79d2ac4b994591826c4abd43d892ff2c04 Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 13:14:57 +0900
Subject: [PATCH 6/8] =?UTF-8?q?refs=20#23=20=E3=83=88=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E6=A4=9C=E7=B4=A2=E3=81=8C?=
 =?UTF-8?q?=20Safari=20=E3=81=A7=E3=81=AF=E4=BD=BF=E3=81=88=E3=81=AA?=
 =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/partials/banner.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 8b55f8b3..7be813d0 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -8,7 +8,7 @@ <h1 class="text-white mb-3">{{ .Site.Params.banner.title | markdownify }}</h1>
 				<form>
 					<input id="searchKeyword" class="form-control" style="margin-top: 16px;" placeholder="検索キーワードを入れてください">
 					<i class="ti-search search-icon"></i>
-					<input id="searchButton" type="submit" value="" style="display: none;">
+					<input id="searchButton" type="submit" value="" style="background-color: transparent; border: transparent;">
 				</form>
 
 				<script>

From 501a9c1cb0a5254c04c62bfa42af6e46e2fedb30 Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 13:21:02 +0900
Subject: [PATCH 7/8] =?UTF-8?q?refs=20#23=20=E3=83=90=E3=83=8A=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E4=B8=8B=E5=81=B4=E3=81=AE=E5=8E=9A=E3=81=BF=E3=82=92?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/partials/banner.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 7be813d0..6ffadef6 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -1,5 +1,5 @@
 {{ "<!-- banner -->" | safeHTML }}
-<div class="container section">
+<div class="container section" style="padding-bottom: 24px;">
 	<div class="row">
 		<div class="col-lg-8 text-center mx-auto">
 			<h1 class="text-white mb-3">{{ .Site.Params.banner.title | markdownify }}</h1>

From b175ecee4e6c962719ae0e730aea5ebb63d5edfc Mon Sep 17 00:00:00 2001
From: hmatsu47 <hmatsu47@gmail.com>
Date: Tue, 21 Dec 2021 21:21:27 +0900
Subject: [PATCH 8/8] =?UTF-8?q?refs=20#23=20=E3=83=88=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E8=A1=A8=E7=A4=BA=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/partials/banner.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 6ffadef6..4225d4b5 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -8,11 +8,11 @@ <h1 class="text-white mb-3">{{ .Site.Params.banner.title | markdownify }}</h1>
 				<form>
 					<input id="searchKeyword" class="form-control" style="margin-top: 16px;" placeholder="検索キーワードを入れてください">
 					<i class="ti-search search-icon"></i>
-					<input id="searchButton" type="submit" value="" style="background-color: transparent; border: transparent;">
+					<input id="searchButton" type="submit" value="" style="color: transparent; background-color: transparent; border: transparent;">
 				</form>
 
 				<script>
-					const SEARCH_URL = '/vaccinecert-faq/search/';
+					const SEARCH_URL = '/search/';
 
 					window.addEventListener('DOMContentLoaded', () => {
 						const searchButton = document.getElementById('searchButton');