- <% if query.len() < 1 { %> + <% if query.is_empty() { %>

Type to start searching

<% } else if !results.is_empty() { - for result in results.iter() { + for (i, result) in results.iter().enumerate() { %> - +

<%= result.title %>

<% if !result.snippet.is_empty() { %> From 6a343ceb8c91826220899372ebb0c1572c396473 Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:15:08 -0700 Subject: [PATCH 2/3] Working add search events --- pgml-dashboard/src/api/cms.rs | 9 +++++-- pgml-dashboard/src/utils/markdown.rs | 7 ++++++ pgml-dashboard/static/js/search.js | 37 ++++++++++++++-------------- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs index 53964c29f..089ff6a26 100644 --- a/pgml-dashboard/src/api/cms.rs +++ b/pgml-dashboard/src/api/cms.rs @@ -650,8 +650,13 @@ impl Collection { #[post("/search_event", data = "")] async fn search_event(search_event: Form, site_search: &State) -> ResponseOk { - eprintln!("WE GOT IT: {:?}", search_event.clicked); - ResponseOk("".to_string()) + match site_search.add_search_event(search_event.search_id, search_event.clicked).await { + Ok(_) => ResponseOk("ok".to_string()), + Err(e) => { + eprintln!("{:?}", e); + ResponseOk("error".to_string()) + } + } } #[get("/search?", rank = 20)] diff --git a/pgml-dashboard/src/utils/markdown.rs b/pgml-dashboard/src/utils/markdown.rs index f0f22fe12..0aed062cc 100644 --- a/pgml-dashboard/src/utils/markdown.rs +++ b/pgml-dashboard/src/utils/markdown.rs @@ -1286,6 +1286,13 @@ impl SiteSearch { .collect() } + pub async fn add_search_event(&self, search_id: i64, search_result: i64) -> anyhow::Result<()> { + self.collection.add_search_event(search_id, search_result + 1, serde_json::json!({ + "clicked": true + }).into(), &self.pipeline).await?; + Ok(()) + } + pub async fn search( &self, query: &str, diff --git a/pgml-dashboard/static/js/search.js b/pgml-dashboard/static/js/search.js index 37f5036f6..1569790c0 100644 --- a/pgml-dashboard/static/js/search.js +++ b/pgml-dashboard/static/js/search.js @@ -18,24 +18,22 @@ export default class extends Controller { this.timer; - // Listen to click events and store clicked results - document.addEventListener("click", function(e) { - const target = e.target.closest(".search-result"); - if (target) { - const resultIndex = target.getAttribute("data-result-index"); - const searchId = target.getAttribute("data-search-id"); - fetch('/search_event', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - search_id: searchId, - clicked: resultIndex, - }), - }); - } - }); + document.addEventListener("click", this.handle_search_click); + } + + handle_search_click(e) { + const target = e.target.closest(".search-result"); + if (target) { + const resultIndex = target.getAttribute("data-result-index"); + const searchId = target.getAttribute("data-search-id"); + const formData = new FormData(); + formData.append("search_id", searchId); + formData.append("clicked", resultIndex); + fetch('/search_event', { + method: 'POST', + body: formData, + }); + } } search(e) { @@ -46,7 +44,7 @@ export default class extends Controller { }, 250); } - focusSearchInput = (e) => { + focusSearchInput = () => { this.searchInput.focus() this.searchTriggerTarget.blur() } @@ -63,5 +61,6 @@ export default class extends Controller { disconnect() { this.searchTriggerTarget.removeEventListener('shown.bs.modal', this.focusSearchInput) this.searchTriggerTarget.removeEventListener('hidden.bs.modal', this.updateSearch) + document.removeEventListener("click", this.handle_search_click); } } From 8918309f6c45d1a3bea56118481f1abad58f29c6 Mon Sep 17 00:00:00 2001 From: SilasMarvin <19626586+SilasMarvin@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:06:27 -0700 Subject: [PATCH 3/3] Add search event tracking to the blogs page --- pgml-dashboard/src/api/cms.rs | 34 ++++++++------ .../cards/blog/article_preview/mod.rs | 8 +++- .../cards/blog/article_preview/template.html | 5 ++ .../blog/blog_search/call/call_controller.js | 21 +++++++++ .../pages/blog/blog_search/response/mod.rs | 46 +++++++++++++------ .../pages/blog/landing_page/template.html | 2 +- 6 files changed, 86 insertions(+), 30 deletions(-) diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs index 089ff6a26..03adf87d7 100644 --- a/pgml-dashboard/src/api/cms.rs +++ b/pgml-dashboard/src/api/cms.rs @@ -5,10 +5,10 @@ use std::{ use std::str::FromStr; -use rocket::form::Form; use comrak::{format_html_with_plugins, parse_document, Arena, ComrakPlugins}; use lazy_static::lazy_static; use markdown::mdast::Node; +use rocket::form::Form; use rocket::{fs::NamedFile, http::uri::Origin, route::Route, State}; use yaml_rust::YamlLoader; @@ -647,14 +647,19 @@ impl Collection { } } - #[post("/search_event", data = "")] -async fn search_event(search_event: Form, site_search: &State) -> ResponseOk { - match site_search.add_search_event(search_event.search_id, search_event.clicked).await { +async fn search_event( + search_event: Form, + site_search: &State, +) -> ResponseOk { + match site_search + .add_search_event(search_event.search_id, search_event.clicked) + .await + { Ok(_) => ResponseOk("ok".to_string()), Err(e) => { eprintln!("{:?}", e); - ResponseOk("error".to_string()) + ResponseOk("error".to_string()) } } } @@ -718,15 +723,18 @@ async fn search_blog(query: &str, tag: &str, site_search: &State results - .into_iter() - .map(article_preview::DocMeta::from_document) - .collect::>(), - Err(_) => Vec::new(), + Ok((search_id, results)) => ( + Some(search_id), + results + .into_iter() + .map(article_preview::DocMeta::from_document) + .collect::>(), + ), + Err(_) => (None, Vec::new()), } } else { let mut results = Vec::new(); @@ -737,13 +745,13 @@ async fn search_blog(query: &str, tag: &str, site_search: &State, + search_result_index: Option, } impl ArticlePreview { - pub fn new(meta: &DocMeta) -> ArticlePreview { + pub fn new(meta: &DocMeta, search_id: Option, search_result_index: Option) -> ArticlePreview { ArticlePreview { card_type: String::from("default"), meta: meta.to_owned(), + search_id, + search_result_index, } } @@ -76,7 +80,7 @@ impl ArticlePreview { pub async fn from_path(path: &str) -> ArticlePreview { let doc = Document::from_path(&PathBuf::from(path)).await.unwrap(); let meta = DocMeta::from_document(doc); - ArticlePreview::new(&meta) + ArticlePreview::new(&meta, None, None) } } diff --git a/pgml-dashboard/src/components/cards/blog/article_preview/template.html b/pgml-dashboard/src/components/cards/blog/article_preview/template.html index 214479ec8..19a49bc0c 100644 --- a/pgml-dashboard/src/components/cards/blog/article_preview/template.html +++ b/pgml-dashboard/src/components/cards/blog/article_preview/template.html @@ -41,7 +41,12 @@

{}

); %> +<% +if let (Some(search_id), Some(search_result_index)) = (search_id, search_result_index) { %> +

+<% } else { %>

+<% } %> <% if card_type == String::from("featured") {%>

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies: