From 138603ffd993e675b9b2d9083f282aa3276bff03 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Tue, 13 Sep 2022 10:07:15 +0200 Subject: [PATCH] Improve search Improve search heuristic and refactor search results to modal. Signed-off-by: Sebastian Martinez --- src/App.svelte | 2 - src/Header.svelte | 29 +++++- src/MobileNavbar.svelte | 5 +- src/Search.spec.ts | 34 ------- src/Search.svelte | 51 ++++++++-- src/base/resolver/List.svelte | 46 --------- src/base/resolver/Query.svelte | 62 ------------ src/base/resolver/Routes.svelte | 12 --- src/components/Modal/SearchResults.svelte | 82 ++++++++++++++++ src/resolver.ts | 111 ++++++++++++++++++++++ 10 files changed, 264 insertions(+), 170 deletions(-) delete mode 100644 src/Search.spec.ts delete mode 100644 src/base/resolver/List.svelte delete mode 100644 src/base/resolver/Query.svelte delete mode 100644 src/base/resolver/Routes.svelte create mode 100644 src/components/Modal/SearchResults.svelte create mode 100644 src/resolver.ts diff --git a/src/App.svelte b/src/App.svelte index a5f428cb6..61b5b4255 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -10,7 +10,6 @@ import Faucet from "@app/base/faucet/Routes.svelte"; import Projects from "@app/base/projects/Routes.svelte"; import Profile from "@app/Profile.svelte"; - import Resolver from "@app/base/resolver/Routes.svelte"; import Header from "@app/Header.svelte"; import Loading from "@app/Loading.svelte"; import Modal from "@app/Modal.svelte"; @@ -94,7 +93,6 @@ - diff --git a/src/Header.svelte b/src/Header.svelte index 9b148d0ed..a7114ce96 100644 --- a/src/Header.svelte +++ b/src/Header.svelte @@ -15,18 +15,27 @@ import Icon from "./Icon.svelte"; import MobileNavbar from "./MobileNavbar.svelte"; import SeedDropdown from "./SeedDropdown.svelte"; - import Button from "@app/Button.svelte"; import ThemeToggle from "./ThemeToggle.svelte"; + import Button from "@app/Button.svelte"; + import SearchResults from "@app/components/Modal/SearchResults.svelte"; + import type { ResolvedSearch } from "@app/resolver"; export let session: Session | null; export let config: Config; + let query: string; + let results: ResolvedSearch; + let sessionButtonHover = false; let mobileNavbarDisplayed = false; + let searchResultsDisplayed = false; function toggleNavbar() { mobileNavbarDisplayed = !mobileNavbarDisplayed; } + function toggleSearchResults() { + searchResultsDisplayed = !searchResultsDisplayed; + } $: address = session && session.address; $: tokenBalance = session && session.tokenBalance; @@ -162,7 +171,12 @@
{#if mobileNavbarDisplayed} - + { + ({ query, results } = e.detail); + toggleSearchResults(); + toggleNavbar(); + }} /> + {/if} + {#if searchResultsDisplayed} + {/if} diff --git a/src/MobileNavbar.svelte b/src/MobileNavbar.svelte index 79ab3a347..0747526a7 100644 --- a/src/MobileNavbar.svelte +++ b/src/MobileNavbar.svelte @@ -3,9 +3,12 @@ import { createEventDispatcher } from "svelte"; import Search from "./Search.svelte"; import { clickOutside } from "@app/utils"; + import type { Config } from "@app/config"; const dispatch = createEventDispatcher(); + export let config: Config; + function handleClickOutside() { dispatch("select"); } @@ -63,7 +66,7 @@