From 1cd6aa04658b25c896df34f1c77499b6c3de499c Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Wed, 27 Jan 2021 12:42:00 +0100
Subject: [PATCH] search improvements

---
 src/components/SearchResult.svelte | 17 ++++-----
 src/routes/search.svelte           | 59 +++++++++++++++++-------------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/components/SearchResult.svelte b/src/components/SearchResult.svelte
index 8a4cdd3..6af2a2c 100644
--- a/src/components/SearchResult.svelte
+++ b/src/components/SearchResult.svelte
@@ -5,7 +5,6 @@
   let href = '/'
 
   $: {
-    console.log(type, slug)
     switch (type) {
       case 'works':
       case 'projects':
@@ -21,6 +20,14 @@
   }
 </script>
 
+<li>
+  <a {href}>
+    <h3>{slug.replace(/-/g, ' ')}</h3>
+    <span>{type}</span>
+    <code>Score: {result.score.toFixed(1)}</code>
+  </a>
+</li>
+
 <style>
   h3 {
     margin: 0;
@@ -40,11 +47,3 @@
     margin-left: 1em;
   }
 </style>
-
-<li>
-  <a {href}>
-    <h3>{slug.replace(/-/g, ' ')}</h3>
-    <span>{type}</span>
-    <code>Score: {result.score.toFixed(1)}</code>
-  </a>
-</li>
diff --git a/src/routes/search.svelte b/src/routes/search.svelte
index e00002a..7b1ca95 100644
--- a/src/routes/search.svelte
+++ b/src/routes/search.svelte
@@ -1,18 +1,19 @@
 <script context="module">
-  export async function preload() {
+  import lunr from 'lunr'
+
+  export async function preload({ query }) {
     const prebuilt = await this.fetch(`/search.json`).then((res) => res.json())
-    return { prebuilt }
+    return { idx: lunr.Index.load(prebuilt) }
   }
 </script>
 
 <script>
-  import lunr from 'lunr'
+  import { onMount } from 'svelte'
 
   import SearchResult from '../components/SearchResult.svelte'
   import SimplePage from '../components/SimplePage.svelte'
 
-  export let prebuilt
-
+  export let idx
   let needle
   let results = []
 
@@ -26,28 +27,18 @@
     }
   }
 
-  $: idx = lunr.Index.load(prebuilt)
-  $: search(needle)
+  $: if (needle) {
+    if (typeof window !== 'undefined') {
+      window.history.replaceState(null, null, `/search?q=${needle || ''}`)
+    }
+    search(needle)
+  }
+
+  onMount(() => {
+    needle = new URLSearchParams(window.location.search).get('q')
+  })
 </script>
 
-<style>
-  input {
-    appearance: none;
-    margin: 0;
-    padding: 0.5rem;
-    font-size: 1em;
-    width: 100%;
-    outline: none;
-    border: 1px solid var(--clr-dark);
-  }
-
-  ul {
-    margin-top: 2em;
-    list-style: none;
-    padding: 0;
-  }
-</style>
-
 <SimplePage title="Search" expanded={false}>
   <input bind:value={needle} placeholder="needle" />
   <ul>
@@ -56,3 +47,21 @@
     {/each}
   </ul>
 </SimplePage>
+
+<style>
+  input {
+    appearance: none;
+    margin: 0;
+    padding: 0.5rem;
+    font-size: 1em;
+    width: 100%;
+    outline: none;
+    border: 2px solid var(--clr-primary);
+  }
+
+  ul {
+    margin-top: 2em;
+    list-style: none;
+    padding: 0;
+  }
+</style>