web search done right
Use faker data in askama templates during dev (#46)
Oliver Bøving0009b79ffd80
diff --git a/frontend/package.json b/frontend/package.jsonindex 2a5ee1a9..0798d275 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -16,6 +16,7 @@"devDependencies": {"@astrojs/mdx": "^0.11.1","@astrojs/tailwind": "^1.0.0",+ "@faker-js/faker": "^7.5.0","@fontsource/montserrat": "^4.5.12","@tailwindcss/typography": "^0.5.7","prettier": "^2.7.1",diff --git a/frontend/src/askama.ts b/frontend/src/askama.tsindex 417fec81..ed0023ba 100644--- a/frontend/src/askama.ts+++ b/frontend/src/askama.ts@@ -1,25 +1,58 @@+import { faker } from "@faker-js/faker";+type Component = (() => any) | any;const prepare = (c: Component | null) => (typeof c == "function" ? c() : c);-const match = (expr: string, cases: Record<string, Component>) =>- [+const passthrough = import.meta.env.DEV;++const fake = (prod: any, dev: any) =>+ passthrough ? faker.helpers.fake(dev) : prod;+const match = (expr: string, cases: Record<string, Component>) => {+ if (passthrough) {+ const options = Object.values(cases);+ return prepare(options[Math.floor(Math.random() * options.length)]);+ }++ return [`{% match ${expr} %}`,Object.entries(cases).map(([c, v]) => [`{% when ${c} %}`, prepare(v)]),+ ,`{% endmatch %}`,].flat(100);+};type ArrayPattern<S> = S extends `${infer _} in ${infer _}` ? S : never;-const for_ = <S extends string>(pat: ArrayPattern<S>, f: Component) =>- [`{% for ${pat} %}`, prepare(f), `{% endfor %}`].flat(100);-const if_ = (pat: string, then: Component, else_: null | Component = null) =>- [+const for_ = <S extends string>(pat: ArrayPattern<S>, f: Component) => {+ if (passthrough) {+ const n = Math.floor(Math.random() * 6);+ return Array.from({ length: n })+ .map(() => prepare(f))+ .flat(100);+ }+ return [`{% for ${pat} %}`, prepare(f), `{% endfor %}`].flat(100);+};+const if_ = (pat: string, then: Component, else_: null | Component = null) => {+ if (passthrough) {+ return Math.random() > 0.5 ? prepare(then) : prepare(else_);+ }++ return [`{% if ${pat} %}`,prepare(then),else_ && [`{% else %}`, prepare(else_)],`{% endif %}`,].flat(100);+};export const askama = Object.assign(- (s: TemplateStringsArray) => `{{ ${s.raw.join("")} }}`,- { match, for_, if_ }+ (input: TemplateStringsArray) => {+ const str = input.raw.join("");+ const segmetns = str.split("$");+ if (passthrough && segmetns.length > 1) {+ return faker.helpers.fake(segmetns.slice(1).join("$"));+ } else {+ return `{{ ${segmetns[0]} }}`;+ }+ },+ { fake, match, for_, if_ });diff --git a/frontend/src/components/Entity.astro b/frontend/src/components/Entity.astroindex 132164ca..41b7a95b 100644--- a/frontend/src/components/Entity.astro+++ b/frontend/src/components/Entity.astro@@ -14,7 +14,10 @@ export interface Props {<a href="https://en.wikipedia.org/wiki/{{ entity.title|urlencode }}"><imgclass="h-full w-full rounded-full"- src="/entity/image/{{ image|urlencode }}"+ src={askama.fake(+ "/entity/image/{{ image|urlencode }}",+ "{{image.avatar}}"+ )}/></a></div>@@ -22,11 +25,11 @@ export interface Props {}<div class="text-xl mb-2"><a href="https://en.wikipedia.org/wiki/{{ entity.title }}"- >{askama`entity.title`}+ >{askama`entity.title $ {{name.findName}}`}</a></div><div class="text-sm">- {askama`entity.small_abstract`}+ {askama`entity.small_abstract $ {{lorem.lines}}`}<span class="italic">source: <aclass="text-blue-600"@@ -38,11 +41,11 @@ export interface Props {{askama.if_("!entity.info.is_empty()", () => (<div class="mt-5 flex w-full flex-col px-4 text-sm">- <div class="grid border-separate border-spacing-x-4 border-spacing-y-1.5 grid-cols-[auto_1fr] gap-x-4">+ <div class="border-spacing-x-4 border-spacing-y-1.5 grid border-separate grid-cols-[auto_1fr] gap-x-4">{askama.for_("(key, value) in entity.info", () => (<>- <div class="text-gray-400">{askama`key`}</div>- <div>{askama`value`}</div>+ <div class="text-gray-500">{askama`key $ {{word.adjective}}`}</div>+ <div>{askama`value $ {{random.words}}`}</div></>))}</div>@@ -61,7 +64,10 @@ export interface Props {<a href="/search?q={{ entity.title|urlencode }}"><imgclass="h-full w-full rounded-full object-cover"- src="/entity/image/{{ image|urlencode }}"+ src={askama.fake(+ "/entity/image/{{ image|urlencode }}",+ "{{image.avatar}}"+ )}/></a></div>@@ -69,7 +75,7 @@ export interface Props {<div class="text-center"><a href="/search?q={{ entity.title|urlencode }}">- {askama`entity.title`}+ {askama`entity.title $ {{name.findName}}`}</a></div></div>diff --git a/frontend/src/pages/goggles.astro b/frontend/src/pages/goggles.astroindex 11d3c36a..da4bf0bd 100644--- a/frontend/src/pages/goggles.astro+++ b/frontend/src/pages/goggles.astro@@ -58,8 +58,8 @@ import { askama } from "../askama";class="h-5 w-5"/></div>- <div class="text-sm">{askama`goggle.name`}</div>- <div class="text-sm">{askama`goggle.url`}</div>+ <div class="text-sm">{askama`goggle.name $ {{random.words}}`}</div>+ <div class="text-sm">{askama`goggle.url $ {{internet.url}}`}</div></>))}diff --git a/frontend/src/pages/search.astro b/frontend/src/pages/search.astroindex 3b18fffc..78f49f5d 100644--- a/frontend/src/pages/search.astro+++ b/frontend/src/pages/search.astro@@ -21,8 +21,8 @@ import Header from "../components/Header.astro";class="flex flex-col h-full justify-center text-sm text-gray-600"><p class="h-fit">- Found {askama`num_matches`} results in {- askama`search_duration_sec`+ Found {askama`num_matches $ 24`} results in {+ askama`search_duration_sec $ 0.42s`} seconds</p></div>@@ -41,17 +41,16 @@ import Header from "../components/Header.astro";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.for_("region_selection in all_regions", () =>askama.match("region_selection", {"RegionSelection::Selected(region)": (<option value="{{ region.gl() }}" selected>- {askama`region.name()`}+ {askama`region.name() $ {{address.country}}`}</option>),"RegionSelection::Unselected(region)": (<option value="{{ region.gl() }}">- {askama`region.name()`}+ {askama`region.name() $ {{address.country}}`}</option>),})@@ -70,7 +69,7 @@ import Header from "../components/Header.astro";class="title-link font-bold italic"href="/search?q={{ correction|urlencode }}">- {askama`correction`}+ {askama`correction $ {{lorem.sentence}}`}</a></div>))@@ -84,7 +83,10 @@ import Header from "../components/Header.astro";<div class="mb-1 flex text-sm"><div class="mr-2 flex items-center"><img- src="/favicons/{{ item.domain|urlencode }}"+ src={askama.fake(+ "/favicons/{{ item.domain|urlencode }}",+ "{{image.avatar}}"+ )}width="13px"/></div>@@ -93,22 +95,23 @@ import Header from "../components/Header.astro";class="text-gray-600 hover:no-underline"href="{{ item.url }}">- {askama`item.pretty_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`}+ {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`}</span> —+ <span class="text-gray-500">{askama`val $ 2. May 2022`}</span>{" "}+ —</>))}- {askama`item.snippet`}+ {askama`item.snippet $ {{lorem.lines}}`}</div></div><div class="flex h-full items-center">@@ -118,7 +121,10 @@ import Header from "../components/Header.astro";<a href="{{ item.url|urlencode }}"><imgclass="h-full w-full rounded-full object-cover"- src="/image/{{ val|urlencode }}"+ src={askama.fake(+ "/image/{{ val|urlencode }}",+ "{{image.avatar}}"+ )}/></a>)}@@ -140,7 +146,7 @@ import Header from "../components/Header.astro";)}<div class="mr-2 ml-2">- Page {askama`current_page`}+ Page {askama`current_page $ 5`}</div><a href="{{ next_page_url }}"><Hero class="change-page-active" icon="chevron-right" />