From c0f4d0c93cd5ef95272d42bddd53e0e33a078846 Mon Sep 17 00:00:00 2001
From: Priec <filippriec@gmail.com>
Date: Thu, 25 Jun 2026 14:56:19 +0200
Subject: [PATCH] navbar search removed where it shouldnt be

---
 assets/views/base.html  | 10 +++++-----
 src/controllers/home.rs |  2 ++
 src/controllers/shop.rs | 10 ----------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/assets/views/base.html b/assets/views/base.html
index 7ee821a..4458df5 100644
--- a/assets/views/base.html
+++ b/assets/views/base.html
@@ -108,10 +108,10 @@
           </span>
         </a>
 
-        <!-- in-header search → existing GET /search (q param). Hidden on small
-             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) %}
+        <!-- in-header search → existing GET /search (q param). Only on the home
+             page; elsewhere the shop's own toolbar carries the search box. Hidden
+             on small screens (a compact copy lives in the mobile menu below). -->
+        {% if on_home | 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>
@@ -213,7 +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) %}
+          {% if on_home | 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"
diff --git a/src/controllers/home.rs b/src/controllers/home.rs
index c32314b..bee8c51 100644
--- a/src/controllers/home.rs
+++ b/src/controllers/home.rs
@@ -30,6 +30,8 @@ async fn index(
             "customer_account_type": c.customer_account_type,
             "currency_symbol": cur.symbol,
             "lang": current_lang(&jar),
+            // The header search bar only appears on the landing page.
+            "on_home": true,
         }),
     )
 }
diff --git a/src/controllers/shop.rs b/src/controllers/shop.rs
index d1827f5..f9f35cf 100644
--- a/src/controllers/shop.rs
+++ b/src/controllers/shop.rs
@@ -340,11 +340,6 @@ 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)
 }
 
@@ -382,11 +377,6 @@ 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)
 }