feat: default to combined search on root path

3 files changed, 8 insertions, 13 deletions

diff --git a/internal/components/homepage.templ b/internal/components/homepage.templ
deleted file mode 100644
index 1cc2b9e..0000000
--- a/internal/components/homepage.templ
+++ /dev/null
@@ -1,10 +0,0 @@
-package components
-
-templ Homepage(tdata TemplateData) {
-	@Page(tdata) {
-		<p>
-			Search Nix Packages and options from NixOS, Darwin and Home-Manager
-		</p>
-		<a href="https://git.sr.ht/~alanpearce/searchix">Source code</a>
-	}
-}
diff --git a/internal/components/page.templ b/internal/components/page.templ
index 127d1ba..edab0f4 100644
--- a/internal/components/page.templ
+++ b/internal/components/page.templ
@@ -29,7 +29,7 @@ templ Page(tdata TemplateData) {
 				rel="search"
 				type="application/opensearchdescription+xml"
 				title={ "Searchix " + sourceNameAndType(nil) }
-				href={ string(joinPath("/all", "opensearch.xml")) }
+				href={ string(joinPath("opensearch.xml")) }
 			/>
 			for _, source := range tdata.Sources {
 				<link
@@ -49,9 +49,9 @@ templ Page(tdata TemplateData) {
 							if tdata.SourceResult != nil || tdata.Query != "" {
 								class="current"
 							}
-							href="/all/search"
+							href="/"
 						} else {
-							href={ joinPathQuery("/all/search", tdata.Query) }
+							href={ joinPathQuery("/", tdata.Query) }
 						}
 					>All</a>
 					for _, source := range tdata.Sources {
@@ -71,6 +71,7 @@ templ Page(tdata TemplateData) {
 			</main>
 			<footer>
 				Made by <a href="https://alanpearce.eu">Alan Pearce</a>.
+				<a href="https://git.sr.ht/~alanpearce/searchix">Source code</a>
 				<a href="https://todo.sr.ht/~alanpearce/searchix">Report issues</a>
 			</footer>
 		</body>
diff --git a/internal/components/search.templ b/internal/components/search.templ
index 0457ff9..bbcf3f4 100644
--- a/internal/components/search.templ
+++ b/internal/components/search.templ
@@ -23,6 +23,9 @@ templ Search(tdata TemplateData, r ResultData) {
 
 templ SearchPage(tdata TemplateData, r ResultData) {
 	@Page(tdata) {
+		<p>
+			Search Nix packages and options from NixOS, Darwin and Home-Manager
+		</p>
 		@script(tdata.Assets.ByPath["/static/search.js"])
 		@Search(tdata, r)
 		<section id="results" role="list" aria-label="search results">
@@ -36,5 +39,6 @@ templ SearchPage(tdata TemplateData, r ResultData) {
 				Everything should work fine without JavaScript. If that is not the case, <a href="https://todo.sr.ht/~alanpearce/searchix">report an issue</a>
 			</p>
 		</noscript>
+		<a href="https://git.sr.ht/~alanpearce/searchix">Source code</a>
 	}
 }