Render category tree on category pages

src/Controller/CategoryController.php

@@ -8,19 +8,19 @@ use Symfony\Component\Routing\Attribute\Route;
 
 final class CategoryController extends BaseController
 {
-    #[Route('/category/{category?}',  name: 'app_category')]
+    #[Route('/category/{category}', name: 'app_category')]
-    public function __invoke(?string $category): Response
+    public function __invoke(string $category): Response
     {
-        if($this->cache->getItem('list_category_'.$category)->isHit()) {
+//        if($this->cache->getItem('list_category_'.$category)->isHit()) {
-            return $this->render('productList.html.twig', ['listType' => 'category_'.$category]);
+//            return $this->render('productList.html.twig', ['listType' => 'category_'.$category]);
-        }
+//        }
 
         /** @var Product[] $products */
         $products = Product::with(['price', 'lowestPrice'])
             ->selectRaw('products.*')
             ->distinct('products.id')
-            ->when(!is_null($category) , fn ($q) => $q->whereRaw('json_each.value = ?', [$category]))
             ->fromRaw('products, json_each(products.categories)')
+            ->whereRaw('json_each.value = ?', [$category])
             ->orderByDesc('starred')
             ->orderByDesc('created_by')
             ->get();

templates/productList.html.twig

@@ -7,8 +7,6 @@
     {{ renderCategoryTree(categoryTree, category) | raw }}
 {% endif %}
 
-
-        {% if (listType starts with 'category_' and category == null)  or not (listType starts with 'category_') or (listType starts with 'category_' and category is not null)   %}
 <div class="table-responsive">
     <table class='table table-hover'>
         <thead>
@@ -26,38 +24,28 @@
         {% for product in products %}
             <tr>
                 <td class="align-middle font-weight-bold h3"><a class="text-warning text-decoration-none"
-                                                                            href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a>
+                                                                href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a></td>
-                            </td>
+                <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70' class='img-thumbnail' alt='{{ product.name }}'/></td>
-                            <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70'
-                                                                                class='img-thumbnail'
-                                                                                alt='{{ product.name }}'/></td>
                 <td class="align-middle">
-                                <a href='{{ path('app_product', {'productId': product.id}) }}'
+                    <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
-                                   class="text-decoration-none">{{ product.name }}</a>
                     {% if product.stock > 0 %}
                         <span class="badge text-bg-light">stock: {{ product.stock }}</span>
                     {% else %}
                         <span class="badge text-bg-warning">out of stock</span>
                     {% endif %}
                     {% if product.isDiscontinued() %}
-                                    <span class="badge text-bg-secondary" data-bs-toggle="tooltip"
+                        <span class="badge text-bg-secondary"  data-bs-toggle="tooltip" data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span>
-                                          data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span>
                     {% endif %}
                     {% if product.isNew() %}
                         <span class="badge text-bg-success">is new</span>
                     {% endif %}
-                                <span class="badge text-bg-light"><a
+                    <span class="badge text-bg-light"><a href="{{ path('app_search', {'search': product.subTitle}) }}" class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
-                                            href="{{ path('app_search', {'search': product.subTitle}) }}"
-                                            class="link-underline link-underline-opacity-0 link-dark">{{ product.subTitle }}</a></span>
                 </td>
                 <td class="align-middle">
                     <nav aria-label="breadcrumb" style="--bs-breadcrumb-divider: '>';" >
                         <ol class="breadcrumb mb-0">
                             {% for category in product.categories %}
-                                            <li class="breadcrumb-item" aria-current="page"><a
+                                <li class="breadcrumb-item" aria-current="page"><a class="breadcrumb-item text-decoration-none"  href="{{ path('app_category', {'category': category}) }}">{{ category }}</a></li>
-                                                        class="breadcrumb-item text-decoration-none"
-                                                        href="{{ path('app_category', {'category': category}) }}">{{ category }}</a>
-                                            </li>
                             {%  endfor %}
                         </ol>
                     </nav>
@@ -67,16 +55,14 @@
                     {% if product.isDiscontinued() or product.priceCurrent == product.productStandardPrice %}
                         {{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}
                     {% else %}
-                                {% if product.priceLowest != product.priceCurrent %}{{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}{% else %}
+                        {% if product.priceLowest != product.priceCurrent %}{{ product.priceLowest | format_currency(product.country.currency, {}, product.country.locale) }}{%else%}<span class="badge text-bg-info">now lowest</span>{% endif %}</td>
-                                    <span class="badge text-bg-info">now lowest</span>{% endif %}</td>
                     {% endif %}
 
                 <td class="align-middle text-end">{{ product.priceCurrent | format_currency(product.country.currency, {}, product.country.locale) }}</td>
                 <td class="align-middle">
                     <div class="d-flex flex-row">
                         {% if product.priceCurrent != product.productStandardPrice %}<span
-                                            class="badge text-bg-warning text-decoration-line-through flex-fill">{{ product.productStandardPrice | format_currency(product.country.currency, {}, product.country.locale) }}</span>
+                                class="badge text-bg-warning text-decoration-line-through flex-fill">{{ product.productStandardPrice | format_currency(product.country.currency, {}, product.country.locale) }}</span> <span
-                                        <span
                                 class="badge text-bg-success flex-fill">{{ ((1 - product.priceCurrent / product.productStandardPrice)*100)|number_format(0) }}%</span>
                         {% endif %}
                     </div>
@@ -85,6 +71,5 @@
         {% endfor %}
     </table>
 </div>
-        {% endif %}
 {% endcache %}
 {% endblock %}