Fix #677 [deploy-site]

starfederation · Feb 19, 2025 · a9c8e6e · a9c8e6e
1 parent 03d36e8
commit a9c8e6e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 40 deletions.
diff --git a/site/routes_home.go b/site/routes_home.go
@@ -158,12 +158,6 @@ func setupHome(router chi.Router, signals sessions.Store, ns *embeddednats.Serve
 	router.Route("/api", func(apiRouter chi.Router) {
 
 		apiRouter.Get("/search", func(w http.ResponseWriter, r *http.Request) {
-			fromHeaderValue := r.Header.Get(SearchFromHeaderKey)
-			isFromHeader := false
-			if fromHeaderValue == "true" {
-				isFromHeader = true
-			}
-
 			signals := &SiteSearchSignals{}
 
 			if err := datastar.ReadSignals(r, signals); err != nil {
@@ -203,12 +197,7 @@ func setupHome(router chi.Router, signals sessions.Store, ns *embeddednats.Serve
 			signals.SearchFetching = false
 			signals.OpenSearchResults = true
 
-			if isFromHeader {
-				datastar.NewSSE(w, r).MergeFragmentTempl(HeaderSiteSearch(signals, results))
-			} else {
-				datastar.NewSSE(w, r).MergeFragmentTempl(DrawerSiteSearch(signals, results))
-			}
-
+			datastar.NewSSE(w, r).MergeFragmentTempl(SiteSearchResults(signals, results))
 		})
 		apiRouter.Route("/todos", func(todosRouter chi.Router) {
 			todosRouter.Get("/", func(w http.ResponseWriter, r *http.Request) {

diff --git a/site/shared.templ b/site/shared.templ
@@ -152,36 +152,42 @@ templ SiteSearch(signals *SiteSearchSignals, searchResults []SearchResult, fromH
 				@sseIndicator("searchFetching")
 			</div>
 		</div>
-			<ul 
-				class={
-					"search-results", 
-					"w-[90vw]",
-					"lg:w-full",
-					"relative",
-					"lg:absolute",
-					templ.KV("lg:-left-full", len(searchResults) > 0) 
-				} 
-				data-on-click__outside="$openSearchResults ? $openSearchResults = false : null"
-				data-on-keydown__window="evt.key == 'Escape' && $openSearchResults ? $openSearchResults = false : null" 
-				data-show="$openSearchResults">
-				if len(searchResults) > 0 {
-					for _, result := range searchResults {
-						<li>
-							<a href={templ.SafeURL(result.ID)}>
-								<h3 class="border-b-1">{result.Title}</h3>
-								<div class="text-sm">
-									@templ.Raw(result.Fragment)
-								</div>
-							</a>
-						</li>
-					}
-				} else {
-					<p>No results found.</p>
-				}
-			</ul>
+		@SiteSearchResults(signals, searchResults)
 	</div>
 }
 
+templ SiteSearchResults(signals *SiteSearchSignals, searchResults []SearchResult) {
+	<ul 
+		id="site_search_results"
+		class={
+			"search-results", 
+			"w-[90vw]",
+			"lg:w-full",
+			"relative",
+			"lg:absolute",
+			templ.KV("lg:-left-full", len(searchResults) > 0) 
+		} 
+		data-signals={templ.JSONString(signals)}
+		data-on-click__outside="$openSearchResults ? $openSearchResults = false : null"
+		data-on-keydown__window="evt.key == 'Escape' && $openSearchResults ? $openSearchResults = false : null" 
+		data-show="$openSearchResults">
+		if len(searchResults) > 0 {
+			for _, result := range searchResults {
+				<li>
+					<a href={templ.SafeURL(result.ID)}>
+						<h3 class="border-b-1">{result.Title}</h3>
+						<div class="text-sm">
+							@templ.Raw(result.Fragment)
+						</div>
+					</a>
+				</li>
+			}
+		} else {
+			<p>No results found.</p>
+		}
+	</ul>
+}
+
 templ HeaderSiteSearch(signals *SiteSearchSignals, searchResults []SearchResult) {
 	<div id="header_site_search" class="hidden lg:flex lg:gap-4 relative z-10">
 		@SiteSearch(&SiteSearchSignals{
@@ -202,7 +208,6 @@ templ DrawerSiteSearch(signals *SiteSearchSignals, searchResults []SearchResult)
 	</div>
 }
 
-
 templ header(r *http.Request) {
 	<div class="navbar bg-base-200">
 		<div class="flex justify-between w-full gap-4">