Skip to content

web search done right

collapsible for discussion snippets and more discussions

Mikkel Denkerd3cb5d3215ec
diff --git a/core/src/searcher/distributed.rs b/core/src/searcher/distributed.rs
index 1b78b937..b816d20b 100644
--- a/core/src/searcher/distributed.rs
+++ b/core/src/searcher/distributed.rs
@@ -376,7 +376,7 @@ impl DistributedSearcher {
return Ok(None);
}
- const NUM_RESULTS: usize = 4;
+ const NUM_RESULTS: usize = 10;
let mut query = SearchQuery {
query: query.query.clone(),
diff --git a/frontend/src/components/DiscussionItem.astro b/frontend/src/components/DiscussionItem.astro
new file mode 100644
index 00000000..8612c63d
--- /dev/null
+++ b/frontend/src/components/DiscussionItem.astro
@@ -0,0 +1,91 @@
+---
+import { askama } from "../askama";
+import Hero from "./Hero.astro";
+
+export interface Props {
+ discussion: string;
+}
+---
+<div class="discussion overflow-hidden">
+ <div>
+ <a class="text-sm hover:no-underline" href="{{ discussion.url }} ">
+ {askama`discussion.domain`}
+ </a>
+ </div>
+ <div class="flex">
+ <a
+ class="discussion-title truncate text-md font-medium"
+ title="{{ discussion.title }}"
+ href="{{ discussion.url }}"
+ >
+ {askama`discussion.title $ {{lorem.sentence}}`}
+ </a>
+ <div class="toggle-discussion-snippet"><Hero class="w-4 hover:cursor-pointer" icon="chevron-down" /></div>
+ </div>
+ <div class="discussion-snippet text-snippet hidden">
+ {askama.match("discussion.snippet", {
+ "Snippet::Normal { date, text }": (
+ <div>
+ {askama.if_("let Some(date) = date", () => (
+ <span class="text-gray-500">{askama`date $ 2. May 2022`}</span>
+ ))}
+ <span class="[&:nth-child(2)]:before:content-['—']">
+ {askama`text|safe $ {{lorem.lines}}`}
+ </span>
+ </div>
+ ),
+ "_": (<></>)
+ })}
+ </div>
+</div>
+
+<style>
+ .discussion-title {
+ display: inline-block;
+ max-width: calc(100% - 10px);
+ }
+
+ .discussion-snippet {
+ @apply mb-3 text-sm;
+ font-weight: 400;
+ }
+
+ .toggle-discussion-snippet {
+ @apply ml-2 flex justify-center transition;
+ }
+
+ .toggle-discussion-snippet.active {
+ transform: rotate(180deg);
+ }
+
+ .discussion-title.active {
+ @apply underline;
+ }
+</style>
+
+<script>
+ const snippetBtns = document.getElementsByClassName("toggle-discussion-snippet");
+ const snippets = document.getElementsByClassName("discussion-snippet");
+ const titles = document.getElementsByClassName("discussion-title");
+
+ for (const btn of snippetBtns) {
+ btn.addEventListener("click", (e) => {
+ if (e.currentTarget instanceof HTMLElement) {
+ const index = Array.prototype.indexOf.call(snippetBtns, e.currentTarget);
+
+ let snippet = snippets[index];
+ let title = titles[index];
+
+ if (snippet.classList.contains("hidden")) {
+ snippet.classList.remove("hidden");
+ e.currentTarget.classList.add("active");
+ title.classList.add("active");
+ } else {
+ snippet.classList.add("hidden")
+ e.currentTarget.classList.remove("active");
+ title.classList.remove("active");
+ }
+ }
+ });
+ }
+</script>
\ No newline at end of file
diff --git a/frontend/src/components/Discussions.astro b/frontend/src/components/Discussions.astro
index 5ea90662..03980b27 100644
--- a/frontend/src/components/Discussions.astro
+++ b/frontend/src/components/Discussions.astro
@@ -1,6 +1,7 @@
---
import { askama } from "../askama";
import Hero from "./Hero.astro";
+import DiscussionItem from "./DiscussionItem.astro";
export interface Props {
discussions: string;
@@ -14,32 +15,40 @@ askama.if_("let Some(discussions) = discussions", () => (
<Hero class="w-4" icon="chat-alt-2" />
<span>Discussions</span>
</div>
- <div class="flex flex-col">
- {
- askama.for_("discussion in discussions", () => (
- <div class="discussion overflow-hidden">
- <div>
- <a class="text-sm hover:no-underline" href="{{ discussion.url }} ">
- {askama`discussion.domain`}
- </a>
- </div>
- <a
- class="discussion-title truncate text-md font-medium"
- title="{{ discussion.title }}"
- href="{{ discussion.url }}"
- >
- {askama`discussion.title $ {{lorem.sentence}}`}
- </a>
+ <div class="discussion-list flex flex-col">
+ {
+ askama.for_("discussion in discussions.iter().take(4)", () => (
+ <DiscussionItem discussion="discussion" />
+ ))
+ }
+ <div id="discussion-more" class="hidden">
+ {
+ askama.for_("discussion in discussions.iter().skip(4)", () => (
+ <DiscussionItem discussion="discussion" />
+ ))
+ }
</div>
- ))
- }
+ <div id="discussion-more-btn" class="hover:cursor-pointer hover:bg-neutral-100 w-fit px-2 py-1 mt-2 border rounded-full">More discussions</div>
</div>
</div>
))
}
-<style>
- .discussion-title {
- display: inline-block;
- max-width: calc(100% - 10px);
- }
-</style>
\ No newline at end of file
+
+<script>
+ const discussionMore = document.getElementById("discussion-more")!;
+ const discussionMoreBtn = document.getElementById("discussion-more-btn")!;
+
+ let moreIsShown = false;
+ discussionMoreBtn.addEventListener("click", () => {
+ moreIsShown = !moreIsShown;
+
+ if (moreIsShown) {
+ discussionMore.classList.remove("hidden");
+ discussionMoreBtn.innerHTML = "Less discussions";
+ } else {
+ discussionMore.classList.add("hidden");
+ discussionMoreBtn.innerHTML = "More discussions";
+ }
+ })
+
+</script>
\ No newline at end of file
diff --git a/scripts/run_frontend.sh b/scripts/run_frontend.sh
index 7650b011..0a8564b1 100644
--- a/scripts/run_frontend.sh
+++ b/scripts/run_frontend.sh
@@ -1,4 +1,4 @@
#!/bin/bash
trap 'kill $(jobs -p)' EXIT
-cargo run --release -- search-server configs/search_server.toml &
-cargo run --release -- frontend configs/frontend.toml
+cargo run -- search-server configs/search_server.toml &
+cargo run -- frontend configs/frontend.toml