From c15b142b18dcdc7f5ab6d5f1afca8ae1696692cc Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 7 May 2024 17:33:06 +0200 Subject: feat: search one set of options --- frontend/static/search.js | 7 ++- frontend/static/style.css | 4 ++ frontend/templates/blocks/options.gotmpl | 98 +++++++++++++++++--------------- 3 files changed, 60 insertions(+), 49 deletions(-) (limited to 'frontend') diff --git a/frontend/static/search.js b/frontend/static/search.js index 0388942..f034fe1 100644 --- a/frontend/static/search.js +++ b/frontend/static/search.js @@ -38,14 +38,14 @@ search.addEventListener("submit", function (ev) { fetch: "true", }, }) - .then(function (res) { + .then(async function (res) { state.url = url.toJSON(); state.opened = []; - history.pushState(state, null, url); if (res.ok) { + history.pushState(state, null, url); return res.text(); } else { - throw new Error(res.statusText); + throw new Error(`${res.status} ${res.statusText}: ${await res.text()}`); } }) .then(function (html) { @@ -54,6 +54,7 @@ search.addEventListener("submit", function (ev) { addToggleEventListeners(); }) .catch(function (error) { + results.innerText = error.message; console.error("fetch failed", error); }); ev.preventDefault(); diff --git a/frontend/static/style.css b/frontend/static/style.css index 45cff6a..fd096b0 100644 --- a/frontend/static/style.css +++ b/frontend/static/style.css @@ -21,6 +21,10 @@ dd { margin-inline-start: 1rem; } +dd > p { + margin: unset; +} + dl { display: grid; align-items: baseline; diff --git a/frontend/templates/blocks/options.gotmpl b/frontend/templates/blocks/options.gotmpl index f89a83d..2f9d88a 100644 --- a/frontend/templates/blocks/options.gotmpl +++ b/frontend/templates/blocks/options.gotmpl @@ -1,53 +1,59 @@ {{ template "results" . }} {{ define "results" }} - {{- range .Results }} -
- - {{ .Option }} - -

- {{ markdown .Description }} -

-
- {{- with .Type }} -
Type
-
{{ . }}
- {{- end }} - {{- with .Default }} -
Default
-
- {{- if .Markdown }} - {{ .Markdown }} - {{- else }} -
{{ .Text }}
+ {{- with .Results }} + {{- range .Results }} +
+ + {{ .Option }} + +

+ {{ markdown .Description }} +

+
+ {{- with .Type }} +
Type
+
{{ . }}
+ {{- end }} + {{- with .Default }} + {{- if or .Text .Markdown }} +
Default
+
+ {{- if .Markdown }} + {{ markdown .Markdown }} + {{- else }} +
{{ .Text }}
+ {{- end }} +
+ {{- end }} + {{- end }} + {{- with .Example }} + {{- if or .Text .Markdown }} +
Example
+
+ {{- if .Markdown }} + {{ markdown .Markdown }} + {{- else }} +
{{ .Text }}
+ {{- end }} +
{{- end }} -
- {{- end }} - {{- with .Example }} - {{- if or .Text .Markdown }} -
Example
-
- {{- if .Markdown }} - {{ .Markdown }} - {{- else }} -
{{ .Text }}
- {{- end }} -
{{- end }} - {{- end }} - {{- with .RelatedPackages }} -
Related Packages
-
{{ . }}
- {{- end }} - {{- with .Declarations }} -
Declared
- {{- range . }} -
- {{ .Name }} -
+ {{- with .RelatedPackages }} +
Related Packages
+
{{ . }}
+ {{- end }} + {{- with .Declarations }} +
Declared
+ {{- range . }} +
+ {{ .Name }} +
+ {{- end }} {{- end }} - {{- end }} -
-
+ + + {{- else }} + Nothing found + {{- end }} {{- end }} {{ end }} -- cgit 1.4.1