From 3e808899c1214b88b5074062f8eab42ef3ec8fb2 Mon Sep 17 00:00:00 2001
From: Elias Kohout <elias@kohout.de>
Date: Sun, 12 Jan 2025 01:12:14 +0100
Subject: [PATCH] fixing search

---
 src/internal/app/UpSearch.go            | 13 +++++++++++--
 src/internal/model/database/articles.go |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/internal/app/UpSearch.go b/src/internal/app/UpSearch.go
index bb1ba12..f72cc4c 100644
--- a/src/internal/app/UpSearch.go
+++ b/src/internal/app/UpSearch.go
@@ -31,8 +31,17 @@ func (app *App) UpSearch(w http.ResponseWriter, req *http.Request) {
 	}
 
 	// render template
-	t := template.Must(template.ParseFiles("assets/templates/article.html"))
-	err = t.ExecuteTemplate(w, "content", articleVMs)
+	t := template.Must(template.ParseFiles(
+		"assets/templates/article.html",
+		"assets/templates/layout.html",
+		"assets/templates/components/pagination.html"))
+
+	data := map[string]interface{}{
+		"SelectedNavItemArticle": true,
+		"ArticleVMs":             &articleVMs,
+		"Paginations":            nil,
+	}
+	err = t.ExecuteTemplate(w, "base", data)
 	if err != nil {
 		http.Error(w, "Failed to render template", http.StatusInternalServerError)
 		return
diff --git a/src/internal/model/database/articles.go b/src/internal/model/database/articles.go
index 8ec1ee6..3d8c0db 100644
--- a/src/internal/model/database/articles.go
+++ b/src/internal/model/database/articles.go
@@ -3,6 +3,7 @@ package database
 import (
 	"crowsnest/internal/model"
 	"database/sql"
+	"strings"
 )
 
 type ArticleModel struct {
@@ -68,6 +69,7 @@ func (m *ArticleModel) Search(query string) ([]model.Article, error) {
 		LIMIT 10
 	`
 
+	query = strings.Join(strings.Split(strings.TrimSpace(query), " "), " | ")
 	rows, err := m.DB.Query(stmt, query)
 	if err != nil {
 		return nil, err