From ac74d584b4992e1c7e2e429a0a868fd3d90258f6 Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Wed, 5 Jun 2024 01:37:03 +0300
Subject: [PATCH 1/6] fix(search): suggestions original text

---
 app/views/components/search/search_suggestions.templ | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/components/search/search_suggestions.templ b/app/views/components/search/search_suggestions.templ
index bd2e4c8..61762a5 100644
--- a/app/views/components/search/search_suggestions.templ
+++ b/app/views/components/search/search_suggestions.templ
@@ -1,6 +1,7 @@
 package search
 
 import "fmt"
+import "strings"
 
 templ SearchSuggestions(suggestions []string, originalQuery string) {
 	<ul
@@ -28,8 +29,10 @@ templ SearchSuggestions(suggestions []string, originalQuery string) {
 				>
 					if len(suggestion) <= len(originalQuery) {
 						<span><b>{ suggestion }</b></span>
-					} else {
+					} else if strings.Contains(suggestion, originalQuery) {
 						<span><b>{ originalQuery }</b>{ suggestion[len(originalQuery):] }</span>
+					} else {
+						<span>{ suggestion }</span>
 					}
 				</a>
 			</li>

From 98f6b85a84b34518245f227f39260b1e855e2580 Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Wed, 5 Jun 2024 01:39:00 +0300
Subject: [PATCH 2/6] fix(pwa): service worker's cache

---
 app/static/js/service-worker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/static/js/service-worker.js b/app/static/js/service-worker.js
index 2186f59..6896b3c 100644
--- a/app/static/js/service-worker.js
+++ b/app/static/js/service-worker.js
@@ -25,7 +25,7 @@ self.addEventListener("message", (event) => {
 
 self.addEventListener("install", async (event) => {
   event.waitUntil(
-    caches.open(CACHE).then((cache) => cache.add(offlineFallbackPage)),
+    caches.open(CACHE_NAME).then((cache) => cache.add(offlineFallbackPage)),
   );
 });
 
@@ -33,7 +33,7 @@ self.addEventListener("fetch", (event) => {
   if (event.request.mode === "navigate") {
     event.respondWith(
       (async () => {
-        const cache = await caches.open(CACHE);
+        const cache = await caches.open(CACHE_NAME);
         const cachedResp = await cache.match(offlineFallbackPage);
         return cachedResp;
       })(),

From d348eba805c5de3b31398aae894476abb6f438a0 Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Wed, 5 Jun 2024 08:19:34 +0300
Subject: [PATCH 3/6] chore(overscoll): set to none to hide browser's effects

---
 app/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index 58a7b1b..b528de3 100644
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -4,7 +4,7 @@
 
 html,
 body {
-  overscroll-behavior-y: contain;
+  overscroll-behavior-y: none;
 }
 
 html,

From 5dc7cf21e1c0bb85f22d6f4b4e324ecbb620d78d Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Wed, 5 Jun 2024 08:20:34 +0300
Subject: [PATCH 4/6] fix(refresher): skip refresh outside the header

---
 app/static/js/refresher.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/static/js/refresher.js b/app/static/js/refresher.js
index 9e03bd5..6639d31 100644
--- a/app/static/js/refresher.js
+++ b/app/static/js/refresher.js
@@ -2,7 +2,7 @@
 
 "use strict";
 
-const mainContentsEl = document.getElementById("main-contents");
+const headerEl = document.getElementById("dank-header");
 let _startY = 0;
 
 async function simulateRefreshAction() {
@@ -51,11 +51,14 @@ document.body.addEventListener(
     const y = e.touches[0].pageY;
     if (
       document.scrollingElement.scrollTop === 0 &&
-      y > _startY + 150 &&
+      y <=
+        headerEl.getBoundingClientRect().y +
+          headerEl.getBoundingClientRect().height &&
+      y > _startY + 75 &&
       !document.body.classList.contains("refreshing")
     ) {
       await simulateRefreshAction();
-      await updateMainContent(window.location.pathname);
+      await Router.updateMainContent(window.location.pathname);
     }
   },
   { passive: true },

From 87014cfbf98d593a28dd95dff6325ed1c0a67b75 Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Wed, 5 Jun 2024 08:24:29 +0300
Subject: [PATCH 5/6] chore(refresher): decrease overscroll amount

---
 app/static/js/refresher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/static/js/refresher.js b/app/static/js/refresher.js
index 6639d31..cedd402 100644
--- a/app/static/js/refresher.js
+++ b/app/static/js/refresher.js
@@ -54,7 +54,7 @@ document.body.addEventListener(
       y <=
         headerEl.getBoundingClientRect().y +
           headerEl.getBoundingClientRect().height &&
-      y > _startY + 75 &&
+      y > _startY + 50 &&
       !document.body.classList.contains("refreshing")
     ) {
       await simulateRefreshAction();

From b4c01c247e35af29f45f0ceeb2769565c8213230 Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Wed, 5 Jun 2024 08:25:04 +0300
Subject: [PATCH 6/6] fix(router): add mainContentsEl back :)

---
 app/static/js/router.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/static/js/router.js b/app/static/js/router.js
index 537e45f..d220767 100644
--- a/app/static/js/router.js
+++ b/app/static/js/router.js
@@ -1,5 +1,7 @@
 "use strict";
 
+const mainContentsEl = document.getElementById("main-contents");
+
 const links = [
   { check: (l) => l === "/", element: document.getElementById("/") },
   { check: (l) => l === "/about", element: document.getElementById("/about") },