Skip to content

web search done right

add small icon next to liked/disliked sites

Mikkel Denkerefa522a0085c
diff --git a/frontend/src/lib/rankings.ts b/frontend/src/lib/rankings.ts
index d5950992..bbdab8ae 100644
--- a/frontend/src/lib/rankings.ts
+++ b/frontend/src/lib/rankings.ts
@@ -1,10 +1,7 @@
import LZString from 'lz-string';
-export enum Ranking {
- LIKED = 'liked',
- DISLIKED = 'disliked',
- BLOCKED = 'blocked',
-}
+export type Ranking = 'liked' | 'disliked' | 'blocked';
+export const Rankings = ['liked', 'disliked', 'blocked'] as Ranking[];
export type SiteRankings = Record<string, Ranking | undefined>;
export type RankedSites = Record<Ranking, string[]>;
@@ -26,7 +23,7 @@ export const rankingsToRanked = (rankings: SiteRankings): RankedSites => {
export const rankedToRankings = (ranked: RankedSites): SiteRankings => {
const result: SiteRankings = {};
- for (const [, ranking] of Object.entries(Ranking)) {
+ for (const ranking of Rankings) {
for (const site of ranked[ranking]) {
result[site] = ranking;
}
diff --git a/frontend/src/routes/search/Modal.svelte b/frontend/src/routes/search/Modal.svelte
index f4ba54a3..29e3b621 100644
--- a/frontend/src/routes/search/Modal.svelte
+++ b/frontend/src/routes/search/Modal.svelte
@@ -22,7 +22,7 @@
</script>
<script lang="ts">
- import { Ranking } from '$lib/rankings';
+ import type { Ranking } from '$lib/rankings';
import { hostRankingsStore } from '$lib/stores';
import type { DisplayedWebpage, SignalEnumDiscriminants, SignalScore } from '$lib/api';
import { twJoin } from 'tailwind-merge';
@@ -141,21 +141,21 @@
const rankingChoices = [
{
- ranking: Ranking.LIKED,
+ ranking: 'liked',
kind: 'success',
Icon: HandThumbUp,
title: 'Like Site',
aria_label: 'I want more results like this site.',
},
{
- ranking: Ranking.DISLIKED,
+ ranking: 'disliked',
kind: 'warning',
Icon: HandThumbDown,
title: 'Dislike Site',
aria_label: 'I want fewer results like this site.',
},
{
- ranking: Ranking.BLOCKED,
+ ranking: 'blocked',
kind: 'error',
Icon: NoSymbol,
title: 'Block Site',
diff --git a/frontend/src/routes/search/Result.svelte b/frontend/src/routes/search/Result.svelte
index d198ce96..c3bac6db 100644
--- a/frontend/src/routes/search/Result.svelte
+++ b/frontend/src/routes/search/Result.svelte
@@ -8,10 +8,21 @@
import TextSnippet from '$lib/components/TextSnippet.svelte';
import StackOverflowSnippet from './StackOverflowSnippet.svelte';
import ResultLink from './ResultLink.svelte';
+ import { hostRankingsStore } from '$lib/stores';
+ import type { Ranking } from '$lib/rankings';
+ import HandThumbDown from '~icons/heroicons/hand-thumb-down-20-solid';
+ import HandThumbUp from '~icons/heroicons/hand-thumb-up-20-solid';
export let webpage: DisplayedWebpage;
export let resultIndex: number;
+ let ranking: Ranking | undefined = undefined;
+ hostRankingsStore.subscribe((rankings) => {
+ if (rankings) {
+ ranking = rankings[webpage.site];
+ }
+ });
+
let button: HTMLButtonElement;
const dispatch = createEventDispatcher<{ modal: HTMLButtonElement }>();
@@ -53,13 +64,30 @@
</div>
</span>
</div>
- <button
- class="noscript:hidden flex w-5 min-w-fit items-center justify-center bg-transparent text-neutral hover:cursor-pointer hover:text-neutral-focus"
- bind:this={button}
- on:click|stopPropagation={() => dispatch('modal', button)}
- >
- <AdjustVertical class="text-md" />
- </button>
+ <div class="flex space-x-2">
+ {#if ranking}
+ <span class="flex items-center text-sm text-neutral-focus">
+ <span class="text-xs text-neutral">
+ {#if ranking == 'liked'}
+ <div title="liked site" aria-label="you have liked this site">
+ <HandThumbUp class="w-3 text-success" />
+ </div>
+ {:else if ranking == 'disliked'}
+ <div aria-label="you have disliked this site" title="disliked site">
+ <HandThumbDown class="w-3 text-warning" />
+ </div>
+ {/if}
+ </span>
+ </span>
+ {/if}
+ <button
+ class="noscript:hidden flex w-5 min-w-fit items-center justify-center bg-transparent text-neutral hover:cursor-pointer hover:text-neutral-focus"
+ bind:this={button}
+ on:click|stopPropagation={() => dispatch('modal', button)}
+ >
+ <AdjustVertical class="text-md" />
+ </button>
+ </div>
</div>
<p class="snippet text-sm font-normal text-neutral-focus [&>b]:font-bold">
{#if webpage.richSnippet && webpage.richSnippet._type == 'stackOverflowQA'}
diff --git a/frontend/src/routes/settings/sites/+page.svelte b/frontend/src/routes/settings/sites/+page.svelte
index cffcb0ee..048a2fff 100644
--- a/frontend/src/routes/settings/sites/+page.svelte
+++ b/frontend/src/routes/settings/sites/+page.svelte
@@ -3,7 +3,7 @@
import Button from '$lib/components/Button.svelte';
import Site from '$lib/components/Site.svelte';
import { getButtonTailwindStyle } from '$lib/themes';
- import { rankingsToRanked, type RankedSites, Ranking } from '$lib/rankings';
+ import { Rankings, rankingsToRanked, type RankedSites, type Ranking } from '$lib/rankings';
import { hostRankingsStore } from '$lib/stores';
import { flip } from 'svelte/animate';
import { derived } from 'svelte/store';
@@ -20,20 +20,20 @@
title: 'Liked Sites',
description:
'Sites that are similar to these sites receive a boost during search. Their results are more likely to appear in your search results.',
- section: Ranking.LIKED,
+ section: 'liked',
},
{
title: 'Disliked Sites',
description:
'Sites that are similar to these sites gets de-prioritized during search. Their results are less likely to appear in your search results.',
- section: Ranking.DISLIKED,
+ section: 'disliked',
},
{
title: 'Blocked Sites',
description:
"These are the sites you have blocked. They won't appear in any of your searches.",
- section: Ranking.BLOCKED,
+ section: 'blocked',
},
] as const;
@@ -62,7 +62,7 @@
Optic.parsePreferenceOptic(content as string),
);
// Iterate through all sites in each Ranking and pass them to rankSite
- for (const [_, ranking] of Object.entries(Ranking)) {
+ for (const ranking of Rankings) {
const sites = extractedRankings[ranking];
sites.forEach((site) => rankSite(site, ranking));
}