From 72babdf74fa6433a7d4b3452f9d60ade3c608cee Mon Sep 17 00:00:00 2001
From: Priec <filippriec@gmail.com>
Date: Thu, 25 Jun 2026 13:59:51 +0200
Subject: [PATCH] search in the shop bar is not duplicated anymore

---
 assets/views/base.html  |  7 ++++++-
 src/controllers/shop.rs | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/assets/views/base.html b/assets/views/base.html
index b538b7a..7ee821a 100644
--- a/assets/views/base.html
+++ b/assets/views/base.html
@@ -109,7 +109,9 @@
         </a>
 
         <!-- in-header search → existing GET /search (q param). Hidden on small
-             screens (a compact copy lives in the mobile menu panel below). -->
+             screens (a compact copy lives in the mobile menu panel below), and on
+             the shop page (whose listing toolbar carries its own search box). -->
+        {% if not on_shop | default(value=false) %}
         <form action="/search" method="get" role="search" class="hidden min-w-0 flex-1 md:flex md:max-w-xl">
           <div class="flex min-w-0 flex-1 overflow-hidden rounded-radius border border-outline transition focus-within:border-primary dark:border-outline-dark dark:focus-within:border-primary-dark">
             <span class="pointer-events-none flex items-center bg-surface-alt pl-3.5 text-on-surface/40 dark:bg-surface-dark-alt dark:text-on-surface-dark/40">{{ ui::icon(name="search", size="size-[18px]") }}</span>
@@ -120,6 +122,7 @@
             <button type="submit" class="shrink-0 bg-primary px-5 text-sm font-bold text-on-primary transition hover:opacity-90 dark:bg-primary-dark dark:text-on-primary-dark">{{ t(key="search-button", lang=lang | default(value='sk')) }}</button>
           </div>
         </form>
+        {% endif %}
 
         <!-- right side: kurz + account + cart + settings + mobile toggle -->
         <div class="ml-auto flex items-center gap-2 sm:gap-3">
@@ -210,6 +213,7 @@
              underline focus), active state via data-nav + markActiveNav() -->
         <ul x-show="mobile" x-cloak @click.outside="mobile = false" x-transition
           class="absolute inset-x-0 top-full mx-4 mt-2 flex flex-col gap-1 rounded-radius border border-outline bg-surface p-2 shadow-lg md:hidden dark:border-outline-dark dark:bg-surface-dark-alt">
+          {% if not on_shop | default(value=false) %}
           <li class="mb-1">
             <form action="/search" method="get" role="search" class="flex overflow-hidden rounded-radius border border-outline dark:border-outline-dark">
               <input type="search" name="q" autocomplete="off"
@@ -219,6 +223,7 @@
               <button type="submit" class="shrink-0 bg-primary px-4 text-sm font-bold text-on-primary dark:bg-primary-dark dark:text-on-primary-dark">{{ t(key="search-button", lang=lang | default(value='sk')) }}</button>
             </form>
           </li>
+          {% endif %}
           <li><a href="/" data-nav="/" class="block rounded-radius px-3 py-2 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-primary focus:outline-hidden focus-visible:underline aria-[current=page]:font-semibold aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark dark:aria-[current=page]:text-primary-dark">{{ t(key="nav-home", lang=lang | default(value='sk')) }}</a></li>
           <li><a href="/shop" data-nav="/shop" class="block rounded-radius px-3 py-2 text-sm font-medium text-on-surface underline-offset-2 transition hover:bg-primary/5 hover:text-primary focus:outline-hidden focus-visible:underline aria-[current=page]:font-semibold aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary dark:text-on-surface-dark dark:hover:text-primary-dark dark:aria-[current=page]:text-primary-dark">{{ t(key="nav-shop", lang=lang | default(value='sk')) }}</a></li>
           {% if logged_in_admin %}
diff --git a/src/controllers/shop.rs b/src/controllers/shop.rs
index f9f35cf..d1827f5 100644
--- a/src/controllers/shop.rs
+++ b/src/controllers/shop.rs
@@ -340,6 +340,11 @@ async fn index(
     let mut context = run_search(&ctx, user.as_ref(), &SearchParams::default(), &cur).await?;
     let c = guard::chrome_from(&ctx, user.as_ref());
     add_chrome(&mut context, &c, &current_lang(&jar));
+    // The shop page carries its own search box in the listing toolbar, so the
+    // header search bar is redundant here — flag it so base.html can hide it.
+    if let Some(map) = context.as_object_mut() {
+        map.insert("on_shop".into(), json!(true));
+    }
     format::view(&v, "shop/index.html", context)
 }
 
@@ -377,6 +382,11 @@ async fn search(
 
     let c = guard::chrome_from(&ctx, user.as_ref());
     add_chrome(&mut context, &c, &lang);
+    // The shop page carries its own search box in the listing toolbar, so the
+    // header search bar is redundant here — flag it so base.html can hide it.
+    if let Some(map) = context.as_object_mut() {
+        map.insert("on_shop".into(), json!(true));
+    }
     format::view(&v, "shop/index.html", context)
 }