Skip to content

web search done right

merge

Mikkel Denkera4ecf5c3078e
diff --cc frontend/src/components/Entity.astro
index 939e249c,ae1de7d5..9cfa3ce6
--- a/frontend/src/components/Entity.astro
+++ b/frontend/src/components/Entity.astro
@@@ -6,10 -6,10 +6,10 @@@ export interface Props
}
---
- <div class="flex grow justify-center pt-10">
+ <div class="flex justify-center">
<div class="max-w-md flex flex-col items-center">
{
- askama.if_("let Some(image) = entity.image", () => (
+ askama.if_("let Some(image) = entity.image_base64", () => (
<div class="w-lg mb-5">
<a href="https://en.wikipedia.org/wiki/{{ entity.title|urlencode }}">
<img
diff --cc frontend/src/pages/search.astro
index adc77d5a,cc6970fc..bfe62e69
--- a/frontend/src/pages/search.astro
+++ b/frontend/src/pages/search.astro
@@@ -4,180 -4,146 +4,146 @@@ import Footer from "../components/Foote
import Entity from "../components/Entity.astro";
import Hero from "../components/Hero.astro";
import GoggleSelector from "../components/GoggleSelector.astro";
- import { askama } from "../askama";
import Header from "../components/Header.astro";
+ import { askama } from "../askama";
---
-<Layout title="Cuely - {{ query }}">
+<Layout title="{{ query }} - Cuely">
<main class="flex flex-col w-full">
<div class="border-b bg-neutral-50">
<Header searchbar={{ query: askama`query` }} />
</div>
- <div class="flex">
- <div class="flex pl-40 flex-col">
- <div class="flex mt-1 pl-3 pt-2 max-w-3xl pr-24 w-full justify-between">
- <div
- class="flex flex-col h-full justify-center text-sm text-gray-600"
- >
- <p class="h-fit">
- Found {askama`num_matches $ 24`} results in {
- askama`search_duration_sec $ 0.42s`
- } seconds
- </p>
- </div>
- <div class="flex">
- <GoggleSelector
- current_goggle_url="current_goggle_url"
- default_goggles="default_goggles"
- />
- <div
- class="select-region h-full flex flex-col justify-center p-0 m-0"
+ <div
+ class="grid sm:px-5 md:pl-20 lg:px-32 mx-1 lg:mx-0 md:gap-x-12 md:grid-cols-[minmax(50ch,48rem)_1fr] md:grid-rows-[auto_1fr] gap-y-6 pt-3"
+ >
+ <!-- Stats and settings -->
+ <div class="flex w-full justify-between mx-auto">
+ <div class="flex flex-col h-full justify-center text-sm text-gray-600">
+ <p class="h-fit">
+ Found {askama`num_matches $ 24`} results in {
+ askama`search_duration_sec $ 0.42s`
+ } seconds
+ </p>
+ </div>
+ <div class="flex">
+ <GoggleSelector
+ current_goggle_url="current_goggle_url"
+ default_goggles="default_goggles"
+ />
+ <div class="select-region h-full flex flex-col justify-center">
+ <select
+ form="searchbar-form"
+ name="gl"
+ onchange="document.getElementById('searchbar-form').submit()"
+ class="hover:cursor-pointer bg-transparent text-sm border-0 max-w-[100px]"
>
- <select
- form="searchbar-form"
- name="gl"
- onchange="document.getElementById('searchbar-form').submit()"
- class="p-0 m-0 hover:cursor-pointer bg-transparent text-sm border-0 max-w-[100px]"
- >
- {
- askama.for_("region_selection in all_regions", () =>
- askama.match("region_selection", {
- "RegionSelection::Selected(region)": (
- <option value="{{ region.gl() }}" selected>
- {askama`region.name() $ {{address.country}}`}
- </option>
- ),
- "RegionSelection::Unselected(region)": (
- <option value="{{ region.gl() }}">
- {askama`region.name() $ {{address.country}}`}
- </option>
- ),
- })
- )
- }
- </select>
- </div>
+ {
+ askama.for_("region_selection in all_regions", () =>
+ askama.match("region_selection", {
+ "RegionSelection::Selected(region)": (
+ <option value="{{ region.gl() }}" selected>
+ {askama`region.name() $ {{address.country}}`}
+ </option>
+ ),
+ "RegionSelection::Unselected(region)": (
+ <option value="{{ region.gl() }}">
+ {askama`region.name() $ {{address.country}}`}
+ </option>
+ ),
+ })
+ )
+ }
+ </select>
</div>
</div>
- <div class="flex flex-col pt-4 pb-8">
- {
- askama.if_("let Some(correction) = spell_correction", () => (
- <div class="pl-3 pb-3">
- Did you mean:{" "}
- <a
- class="title-link font-bold italic"
- href="/search?q={{ correction|urlencode }}"
- >
- {askama`correction $ {{lorem.sentence}}`}
- </a>
- </div>
- ))
- }
+ </div>
+
+ <!-- Search results -->
+ <div class="col-start-1 flex flex-col space-y-6">
+ {
+ askama.if_("let Some(correction) = spell_correction", () => (
+ <div>
+ Did you mean:{" "}
+ <a
+ class="title-link font-bold italic"
+ href="/search?q={{ correction|urlencode }}"
+ >
+ {askama`correction $ {{lorem.sentence}}`}
+ </a>
+ </div>
+ ))
+ }
- <div class="search-result flex flex-col space-y-3">
- {
- askama.for_("item in search_result", () => (
- <div class="flex w-full max-w-3xl p-3">
- <div class="flex w-full flex-col">
- <div class="mb-1 flex text-sm">
- <div class="mr-2 flex items-center">
- <img
- src={askama.fake(
- "data:image/png;base64, {{ item.favicon_base64 }}",
- "{{image.avatar}}"
- )}
- width="13px"
- />
- </div>
- <div>
- <a
- class="text-gray-600 hover:no-underline"
- href="{{ item.url }}"
- >
- {askama`item.pretty_url $ {{internet.url}}`}
- </a>
- </div>
- </div>
- <div class="mb-1 text-lg font-medium">
- <a class="title-link" href="{{ item.url }}">
- {askama`item.title $ {{lorem.sentence}}`}
- </a>
- </div>
- <div class="text-sm">
- {askama.if_("let Some(val) = item.last_updated", () => (
- <>
- <span class="text-gray-500">{askama`val $ 2. May 2022`}</span>{" "}
- —
- </>
- ))}
- {askama`item.snippet $ {{lorem.lines}}`}
- </div>
- </div>
- <div class="flex h-full items-center">
- <div class="h-20 w-20 pl-2 pt-1 pb-1">
- {askama.if_(
- "let Some(val) = item.primary_image_uuid",
- <a href="{{ item.url|urlencode }}">
- <img
- class="h-full w-full rounded-full object-cover"
- src={askama.fake(
- "/image/{{ val|urlencode }}",
- "{{image.avatar}}"
- )}
- />
- </a>
+ {
+ askama.for_("item in search_result", () => (
+ <div class="flex w-full">
+ <div class="flex w-full flex-col space-y-1">
+ <div class="flex items-center space-x-2 text-sm">
+ <img
- src={askama.fake(
- "/favicons/{{ item.domain|urlencode }}",
- "{{image.avatar}}"
- )}
- width="13px"
- />
++ src={askama.fake(
++ "data:image/png;base64, {{ item.favicon_base64 }}",
++ "{{image.avatar}}"
+ )}
- </div>
- </div>
++ width="13px"
++ />
+ <a
+ class="text-gray-600 hover:no-underline"
+ href="{{ item.url }}"
+ >
+ {askama`item.pretty_url $ {{internet.url}}`}
+ </a>
+ </div>
+ <a class="title-link text-lg font-medium" href="{{ item.url }}">
+ {askama`item.title $ {{lorem.sentence}}`}
+ </a>
+ <div class="text-sm">
+ {askama.if_("let Some(val) = item.last_updated", () => (
+ <span class="text-gray-500">
+ {askama`val $ 2. May 2022`}
+ </span>
+ ))}
+ <span class="[&:nth-child(2)]:before:content-['—']">
+ {askama`item.snippet $ {{lorem.lines}}`}
+ </span>
</div>
- ))
- }
- </div>
-
- <div class="flex w-full justify-center items-center pr-24 mt-5">
- {
- askama.if_(
- "let Some(url) = prev_page_url",
- <a href="{{ url }}">
- <Hero class="change-page-active" icon="chevron-left" />
- </a>,
- <Hero class="change-page-inactive" icon="chevron-left" />
- )
- }
- <div class="mr-2 ml-2">
- Page {askama`current_page $ 5`}
- </div>
- <a href="{{ next_page_url }}">
- <Hero class="change-page-active" icon="chevron-right" />
- </a>
- </div>
- <div class="flex flex-col w-full mt-7 pl-4 pr-24">
- Didn't find what you were looking for? Try on:
- <div class="flex w-full justify-between mt-4">
- <div class="bg-neutral-100 rounded-full py-2 px-5">
- <a href="https://www.google.com/search?q={{ query|urlencode }}"
- >Google</a
- >
- </div>
- <div class="bg-neutral-100 rounded-full py-2 px-5">
- <a href="https://duckduckgo.com/?q={{ query|urlencode }}"
- >DuckDuckGo</a
- >
- </div>
- <div class="bg-neutral-100 rounded-full py-2 px-5">
- <a
- href="https://search.brave.com/search?q={{ query|urlencode }}"
- >Brave</a
- >
</div>
- <div class="bg-neutral-100 rounded-full py-2 px-5">
- <a href="https://www.mojeek.com/search?q={{ query|urlencode }}"
- >Mojeek</a
- >
+ <div class="flex h-full items-center">
+ <div class="h-20 w-20 py-1 pl-2">
+ {askama.if_(
+ "let Some(val) = item.primary_image_uuid",
+ <a href="{{ item.url|urlencode }}">
+ <img
+ class="h-full w-full rounded-full object-cover"
+ src={askama.fake(
+ "/image/{{ val|urlencode }}",
+ "{{image.avatar}}"
+ )}
+ />
+ </a>
+ )}
+ </div>
</div>
</div>
+ ))
+ }
+
+ <div class="flex w-full justify-center items-center">
+ {
+ askama.if_(
+ "let Some(url) = prev_page_url",
+ <a href="{{ url }}">
+ <Hero class="change-page-active" icon="chevron-left" />
+ </a>,
+ <Hero class="change-page-inactive" icon="chevron-left" />
+ )
+ }
+ <div class="mx-2">
+ Page {askama`current_page $ 5`}
</div>
+ <a href="{{ next_page_url }}">
+ <Hero class="change-page-active" icon="chevron-right" />
+ </a>
</div>
</div>