From 27b07a80f1872205dfeb949e9b90cf85f6e43744 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 17 May 2024 09:19:12 +0200
Subject: refactor: move general results template code into results template

---
 frontend/templates/blocks/options.gotmpl | 113 +++++++++++++------------------
 frontend/templates/blocks/results.gotmpl |  23 +++++++
 2 files changed, 71 insertions(+), 65 deletions(-)
 create mode 100644 frontend/templates/blocks/results.gotmpl

(limited to 'frontend/templates/blocks')

diff --git a/frontend/templates/blocks/options.gotmpl b/frontend/templates/blocks/options.gotmpl
index ad92c17..806ca2f 100644
--- a/frontend/templates/blocks/options.gotmpl
+++ b/frontend/templates/blocks/options.gotmpl
@@ -1,71 +1,54 @@
-{{- define "results" }}
-  {{- if gt .Results.Total 0 }}
-    <section id="results">
-      {{- range .Results.Hits }}
-        {{- with .Data }}
-          <details id="{{ .Name }}">
-            <summary>
-              {{ .Name }}
-            </summary>
-            {{ markdown .Description }}
-            <dl>
-              {{- with .Type }}
-                <dt>Type</dt>
-                <dd><code>{{ . }}</code></dd>
-              {{- end }}
-              {{- with .Default }}
-                {{- if or .Text .Markdown }}
-                  <dt>Default</dt>
-                  <dd>
-                    {{- if .Markdown }}
-                      {{ markdown .Markdown }}
-                    {{- else }}
-                      <pre><code>{{ .Text }}</code></pre>
-                    {{- end }}
-                  </dd>
-                {{- end }}
-              {{- end }}
-              {{- with .Example }}
-                {{- if or .Text .Markdown }}
-                  <dt>Example</dt>
-                  <dd>
-                    {{- if .Markdown }}
-                      {{ markdown .Markdown }}
-                    {{- else }}
-                      <pre><code>{{ .Text }}</code></pre>
-                    {{- end }}
-                  </dd>
+{{- define "hits" }}
+  {{- range . }}
+    {{- with .Data }}
+      <details id="{{ .Name }}">
+        <summary>
+          {{ .Name }}
+        </summary>
+        {{ markdown .Description }}
+        <dl>
+          {{- with .Type }}
+            <dt>Type</dt>
+            <dd><code>{{ . }}</code></dd>
+          {{- end }}
+          {{- with .Default }}
+            {{- if or .Text .Markdown }}
+              <dt>Default</dt>
+              <dd>
+                {{- if .Markdown }}
+                  {{ markdown .Markdown }}
+                {{- else }}
+                  <pre><code>{{ .Text }}</code></pre>
                 {{- end }}
-              {{- end }}
-              {{- with .RelatedPackages }}
-                <dt>Related Packages</dt>
-                <dd>{{ . }}</dd>
-              {{- end }}
-              {{- with .Declarations }}
-                <dt>Declared</dt>
-                {{- range . }}
-                  <dd>
-                    <a href="{{ .URL }}">{{ .Name }}</a>
-                  </dd>
+              </dd>
+            {{- end }}
+          {{- end }}
+          {{- with .Example }}
+            {{- if or .Text .Markdown }}
+              <dt>Example</dt>
+              <dd>
+                {{- if .Markdown }}
+                  {{ markdown .Markdown }}
+                {{- else }}
+                  <pre><code>{{ .Text }}</code></pre>
                 {{- end }}
-              {{- end }}
-            </dl>
-          </details>
-        {{- end }}
-      {{- end }}
-      <footer>
-        <nav id="pagination">
-          {{- with .Prev }}
-            <a class="button" href="{{ . }}" rel="prev">Prev</a>
+              </dd>
+            {{- end }}
+          {{- end }}
+          {{- with .RelatedPackages }}
+            <dt>Related Packages</dt>
+            <dd>{{ . }}</dd>
           {{- end }}
-          {{- with .Next }}
-            <a class="button" href="{{ . }}" rel="next">Next</a>
+          {{- with .Declarations }}
+            <dt>Declared</dt>
+            {{- range . }}
+              <dd>
+                <a href="{{ .URL }}">{{ .Name }}</a>
+              </dd>
+            {{- end }}
           {{- end }}
-        </nav>
-        <span> {{ .Results.Total }} results </span>
-      </footer>
-    </section>
-  {{- else }}
-    Nothing found
+        </dl>
+      </details>
+    {{- end }}
   {{- end }}
 {{- end }}
diff --git a/frontend/templates/blocks/results.gotmpl b/frontend/templates/blocks/results.gotmpl
new file mode 100644
index 0000000..95c89ca
--- /dev/null
+++ b/frontend/templates/blocks/results.gotmpl
@@ -0,0 +1,23 @@
+{{- define "results" }}
+  {{- with .Results }}
+    {{- if gt .Total 0 }}
+      <section id="results">
+        {{ block "hits" .Hits }}
+        {{ end }}
+        <footer>
+          <nav id="pagination">
+            {{- with $.Prev }}
+              <a class="button" href="{{ . }}" rel="prev">Prev</a>
+            {{- end }}
+            {{- with $.Next }}
+              <a class="button" href="{{ . }}" rel="next">Next</a>
+            {{- end }}
+          </nav>
+          <span>{{ .Total }} results</span>
+        </footer>
+      </section>
+    {{- else }}
+      Nothing found
+    {{- end }}
+  {{- end }}
+{{- end }}
-- 
cgit 1.4.1