From 2c3bddded83d37eb6c18ba5dffb0b6504eaf4157 Mon Sep 17 00:00:00 2001
From: Ole Eskild Steensen <oleeskild@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:11:28 +0100
Subject: [PATCH] Add tag to search result and remove home note tag

---
 netlify/functions/search/search.js             |  3 +--
 src/site/_includes/components/searchScript.njk |  6 +-----
 src/site/_includes/layouts/note.njk            | 12 +++++++++++-
 src/site/lunr.njk                              |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/netlify/functions/search/search.js b/netlify/functions/search/search.js
index 1518535..cc8ce7b 100644
--- a/netlify/functions/search/search.js
+++ b/netlify/functions/search/search.js
@@ -11,8 +11,6 @@ const handler = async (event) => {
     const index = lunrjs.Index.load(indexJson);
     console.log('index made');
 
-    let results = index.search(search);
-
     let results =
       search[0] == "#"
         ? index.search(`tags:${search.substring(1)}`)
@@ -23,6 +21,7 @@ const handler = async (event) => {
       r.content = truncate(data[r.ref].content, 400);
       r.date = data[r.ref].date;
       r.url = data[r.ref].url;
+      r.tags = data[r.ref].tags;
       
       delete r.ref;
     });
diff --git a/src/site/_includes/components/searchScript.njk b/src/site/_includes/components/searchScript.njk
index 4a76442..7d449ae 100644
--- a/src/site/_includes/components/searchScript.njk
+++ b/src/site/_includes/components/searchScript.njk
@@ -206,12 +206,8 @@
                 <a class="search-link" href="${r.url}">${r.title}</a>
                 <div onclick="window.location='${r.url}'">
                     <div class="header-meta">
-                        {% if tags %}
                         <div class="header-tags">
-                            {% for tag in tags %}
-                            <a class="tag" href="JavaScript:Void(0);">#{{tag}}</a>
-                            {% endfor %}</a>
-                            {% endif %}
+                            ${r.tags.map(tag=>'<a class="tag" href="JavaScript:Void(0);">#'+tag+'</a>').join("")}
                         </div>
                     </div>
                     ${r.content}
diff --git a/src/site/_includes/layouts/note.njk b/src/site/_includes/layouts/note.njk
index 436fe42..af48190 100644
--- a/src/site/_includes/layouts/note.njk
+++ b/src/site/_includes/layouts/note.njk
@@ -25,7 +25,17 @@ permalink: "notes/{{ page.fileSlug | slugify }}/"
         <h1>{% if title %}{{ title }}{% else %}{{ page.fileSlug }}{% endif %}</h1>
       {% endif %}
       <div class="header-meta">
-        {% if tags %}<div class="header-tags">{% for tag in tags %}<a class="tag" onclick="toggleTagSearch(this)">#{{tag}}</a>{% endfor %}</div>{% endif %}
+        {% if tags %}
+          <div class="header-tags">
+            {% for tag in tags %}
+              {% if tag != 'gardenEntry' %}
+                <a class="tag" onclick="toggleTagSearch(this)">
+                  #{{tag}}
+                </a>
+              {% endif %}
+            {% endfor %}
+          </div>
+        {% endif %}
       </div>
       {{ content | link | highlight | safe}}
     </div>
diff --git a/src/site/lunr.njk b/src/site/lunr.njk
index 5dd4074..1b7506e 100644
--- a/src/site/lunr.njk
+++ b/src/site/lunr.njk
@@ -9,6 +9,6 @@ eleventyExcludeFromCollections: true
 		"date":"{{ post.date }}",
 		"url":"{{ post.url }}",
 		"content": {{ post.templateContent | striptags(true) | link | jsonify | safe  }},
-		"tags": [{% if post.data.tags %}{% for tag in post.data.tags %}"{{tag}}"{% if not loop.last %},{% endif %}{% endfor %}{% endif %}]
+		"tags": [{% if post.data.tags %}{% for tag in post.data.tags %}{% if tag != 'gardenEntry' %}"{{tag}}"{% endif %}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}]
 }{% if not loop.last %},{% endif %}
 {% endfor %}]