From d93a75b615b36fdf2275f10cf85b7812a06ec048 Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <egrep@protonmail.ch>
Date: Mon, 4 Jul 2022 18:51:24 +0200
Subject: WIP: Implementing search

---
 layouts/partials/scripts.html        | 10 +++++++++-
 layouts/partials/search-results.html | 12 ++++++++++++
 layouts/shortcodes/form-search.html  | 20 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 layouts/partials/search-results.html
 create mode 100644 layouts/shortcodes/form-search.html

(limited to 'layouts')

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 8d51a70..d04bfbe 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,6 +1,6 @@
 {{- $vendors := slice -}}
 
-{{- $vendorNames := slice "jquery.min" -}}
+{{- $vendorNames := slice "jquery.min" "lunr.min" -}}
 {{- range $vendorNames -}}
     {{ $vendors = $vendors | append (resources.Get (printf "js/vendor/%s.js" .) ) }}
 {{- end -}}
@@ -14,6 +14,14 @@
     <script src="{{ $vendors.RelPermalink }}"></script>
 {{- end -}}
 
+{{- $search := resources.Get "js/search.js" | minify -}}
+{{- if not site.Params.assets.disable_fingerprinting -}}
+    {{- $search = $search | fingerprint -}}
+    <script src="{{ $search.RelPermalink }}" integrity="{{ $search.Data.Integrity }}"></script>
+{{- else -}}
+    <script src="{{ $search.RelPermalink }}"></script>
+{{- end -}}
+
 {{- with site.GoogleAnalytics -}}
     {{- $ga := resources.Get "js/ga.js" | minify -}}
     {{- if not site.Params.assets.disable_fingerprinting -}}
diff --git a/layouts/partials/search-results.html b/layouts/partials/search-results.html
new file mode 100644
index 0000000..d9615a4
--- /dev/null
+++ b/layouts/partials/search-results.html
@@ -0,0 +1,12 @@
+<section id="search-results" class="hide-element">
+    <div id="search-results-header">
+        <div class="search-query search-query-left">
+            search term: <span id="query"></span>
+        </div>
+        <div class="search-query search-query-right">
+            <span id="results-count"></span>
+            <span id="results-count-text"></span>
+        </div>
+    </div>
+    <div id="search-results-body" class="post-list"></div>
+</section>
diff --git a/layouts/shortcodes/form-search.html b/layouts/shortcodes/form-search.html
new file mode 100644
index 0000000..cb30d6f
--- /dev/null
+++ b/layouts/shortcodes/form-search.html
@@ -0,0 +1,20 @@
+<div id="site-search" class="search-form">
+    <p>{{ i18n "search_help" }}</p>
+    <form role="form" id="search-form">
+        <div class="search-wrapper">
+            <div class="search-container form-item">
+                <input autocomplete="off" placeholder="" id="search" class="search-form-input form-input" aria-label="{{ i18n "search_site" }}" type="text" name="q">
+            </div>
+            <div class="search-error hide-element">
+                <p class="search-error-message"></p>
+            </div>
+        </div>
+    </form>
+    <div id="clear-search-results" class="form-item hide-element">
+        <button class="button button-large" type="reset">
+            {{ i18n "clear_search_results" }}
+        </button>
+    </div>
+</div>
+
+{{- partial "search-results" . -}}
-- 
cgit v1.2.3


From c87c4c200c3f6a2e6474623db4aad8b2b30e713b Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <egrep@protonmail.ch>
Date: Mon, 4 Jul 2022 19:39:01 +0200
Subject: Do not show search term

---
 layouts/partials/search-results.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'layouts')

diff --git a/layouts/partials/search-results.html b/layouts/partials/search-results.html
index d9615a4..f9059a3 100644
--- a/layouts/partials/search-results.html
+++ b/layouts/partials/search-results.html
@@ -1,8 +1,5 @@
 <section id="search-results" class="hide-element">
     <div id="search-results-header">
-        <div class="search-query search-query-left">
-            search term: <span id="query"></span>
-        </div>
         <div class="search-query search-query-right">
             <span id="results-count"></span>
             <span id="results-count-text"></span>
-- 
cgit v1.2.3


From 6147926629ab0b0ceac9797ee780643c3592deed Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <egrep@protonmail.ch>
Date: Mon, 4 Jul 2022 20:46:01 +0200
Subject: Use hugo modules to bundle assets

---
 layouts/partials/scripts.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'layouts')

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index d04bfbe..02634ad 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,11 +1,14 @@
 {{- $vendors := slice -}}
 
-{{- $vendorNames := slice "jquery.min" "lunr.min" -}}
+{{- $vendorNames := slice "jquery.js" "lunr.js" -}}
 {{- range $vendorNames -}}
-    {{ $vendors = $vendors | append (resources.Get (printf "js/vendor/%s.js" .) ) }}
+    {{ $vendors = $vendors | append (resources.Get (printf "js/vendor/%s" .) ) }}
 {{- end -}}
 
-{{- $vendors := $vendors | resources.Concat "js/vendor-bundle.js" | minify -}}
+{{- $vendors = $vendors | resources.Concat "js/vendor-bundle.js" -}}
+{{- if or (eq (getenv "HUGO_ENV") "production") (eq site.Params.env "production")  }}
+    {{- $vendors = $vendors | minify -}}
+{{- end -}}
 
 {{- if not site.Params.assets.disable_fingerprinting -}}
     {{- $vendors = $vendors | fingerprint -}}
-- 
cgit v1.2.3


From e1f63bffbd927bc76b9b778c1711b818258ed9d1 Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <egrep@protonmail.ch>
Date: Tue, 5 Jul 2022 01:23:29 +0200
Subject: Implement i18n in search

---
 layouts/partials/data.html           | 6 +++++-
 layouts/partials/scripts.html        | 5 ++++-
 layouts/partials/search-results.html | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'layouts')

diff --git a/layouts/partials/data.html b/layouts/partials/data.html
index afacc83..cdd445c 100644
--- a/layouts/partials/data.html
+++ b/layouts/partials/data.html
@@ -2,6 +2,10 @@
     {
         "analytics_code": {{ site.GoogleAnalytics | default "" }},
         "page_title": {{- partial "title.html" . -}},
-        "language": {{ site.LanguageCode | default site.Language.Lang }}
+        "language": {{ site.LanguageCode | default site.Language.Lang }},
+        "strings": {
+            "searchEnterTerm": {{ i18n "search_enter_term" }},
+            "searchNoResults": {{ i18n "search_no_results" }}
+        }
     }
 </script>
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 02634ad..1574f7e 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -17,7 +17,10 @@
     <script src="{{ $vendors.RelPermalink }}"></script>
 {{- end -}}
 
-{{- $search := resources.Get "js/search.js" | minify -}}
+{{- $search := resources.Get "js/search.js" -}}
+{{- if or (eq (getenv "HUGO_ENV") "production") (eq site.Params.env "production")  }}
+    {{- $search = $search | minify -}}
+{{- end -}}
 {{- if not site.Params.assets.disable_fingerprinting -}}
     {{- $search = $search | fingerprint -}}
     <script src="{{ $search.RelPermalink }}" integrity="{{ $search.Data.Integrity }}"></script>
diff --git a/layouts/partials/search-results.html b/layouts/partials/search-results.html
index f9059a3..fd4c48d 100644
--- a/layouts/partials/search-results.html
+++ b/layouts/partials/search-results.html
@@ -1,8 +1,8 @@
 <section id="search-results" class="hide-element">
     <div id="search-results-header">
         <div class="search-query search-query-right">
+            <span id="results-count-text">{{ i18n "search_results" }}</span>
             <span id="results-count"></span>
-            <span id="results-count-text"></span>
         </div>
     </div>
     <div id="search-results-body" class="post-list"></div>
-- 
cgit v1.2.3