From d499d7d846d55cc158306160c51d4b871f5b6376 Mon Sep 17 00:00:00 2001
From: Nikita Kiselev <kiselev2008@gmail.com>
Date: Sat, 9 Aug 2025 09:49:03 +0300
Subject: [PATCH] feat: ui improvements, show only active products, limit max
 page for infinity scroll

---
 .../oc_telegram_shop/src/Services/ProductsService.php     | 6 +++++-
 spa/src/components/CategoriesInline.vue                   | 8 ++++++--
 spa/src/components/CategoriesList/CategoryItem.vue        | 4 ++--
 spa/src/views/CategoriesList.vue                          | 4 ++--
 spa/src/views/Products.vue                                | 2 ++
 5 files changed, 17 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php

diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php
old mode 100644
new mode 100755
index 8dae934..696e42b
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/ProductsService.php
@@ -51,10 +51,12 @@ class ProductsService
         $forMainPage = $params['forMainPage'];
         $featuredProducts = $params['featuredProducts'];
         $mainpageProducts = $params['mainpageProducts'];
+        $status = $params['status'] ?? 1;
         $languageId = 1;
         $categoryName = '';
         $imageWidth = 300;
         $imageHeight = 300;
+        $maxPages = $params['maxPages'] ?? 10;
 
         if ($categoryId) {
             $categoryName = $this->queryBuilder->newQuery()
@@ -82,6 +84,8 @@ class ProductsService
                         ->where('product_description.language_id', '=', $languageId);
                 }
             )
+            ->where('products.status', '=', $status)
+            ->whereRaw('products.date_available < NOW()')
             ->when($categoryId !== 0, function (Builder $query) use ($categoryId) {
                 $query->join(
                     db_table('product_to_category') . ' AS product_to_category',
@@ -102,7 +106,7 @@ class ProductsService
             });
 
         $total = $productsQuery->count();
-        $lastPage = PaginationHelper::calculateLastPage($total, $perPage);
+        $lastPage = min(PaginationHelper::calculateLastPage($total, $perPage), $maxPages);
         $hasMore = $page + 1 <= $lastPage;
 
         $products = $productsQuery
diff --git a/spa/src/components/CategoriesInline.vue b/spa/src/components/CategoriesInline.vue
index b94b041..e58d537 100644
--- a/spa/src/components/CategoriesInline.vue
+++ b/spa/src/components/CategoriesInline.vue
@@ -7,8 +7,12 @@
     Каталог
   </RouterLink>
 
-  <RouterLink v-for="category in categoriesStore.topCategories" class="btn btn-md" :to="{name: 'product.categories.show', params: {category_id: category.id}}">
-    {{ category.name }}
+  <RouterLink
+      v-for="category in categoriesStore.topCategories"
+      class="btn btn-md max-w-[12rem]"
+      :to="{name: 'product.categories.show', params: {category_id: category.id}}"
+  >
+    <span class="overflow-hidden text-ellipsis whitespace-nowrap">{{ category.name }}</span>
   </RouterLink>
 </div>
 </template>
diff --git a/spa/src/components/CategoriesList/CategoryItem.vue b/spa/src/components/CategoriesList/CategoryItem.vue
index 1eba764..2e479d3 100644
--- a/spa/src/components/CategoriesList/CategoryItem.vue
+++ b/spa/src/components/CategoriesList/CategoryItem.vue
@@ -11,7 +11,7 @@
       </div>
     </div>
 
-    <h3 class="ml-5 text-lg">{{ category.name }}</h3>
+    <h3 class="ml-5 text-lg line-clamp-2">{{ category.name }}</h3>
   </a>
 </template>
 
@@ -24,4 +24,4 @@ const props = defineProps({
 });
 
 const emit = defineEmits(["onSelect"]);
-</script>
\ No newline at end of file
+</script>
diff --git a/spa/src/views/CategoriesList.vue b/spa/src/views/CategoriesList.vue
index 6c6a7dd..9038833 100644
--- a/spa/src/views/CategoriesList.vue
+++ b/spa/src/views/CategoriesList.vue
@@ -3,11 +3,11 @@
     <h2 class="text-3xl mb-5">Категории</h2>
 
     <button v-if="parentId" class="py-2 px-4 flex items-center mb-3 cursor-pointer" @click="goBack">
-      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6 min-w-6">
         <path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18" />
       </svg>
 
-      <span class="ml-2">Назад к "{{ parentCategory.name }}"</span>
+      <span class="ml-2 line-clamp-2">Назад к "{{ parentCategory.name }}"</span>
     </button>
 
     <button
diff --git a/spa/src/views/Products.vue b/spa/src/views/Products.vue
index 1db7842..385ba8b 100644
--- a/spa/src/views/Products.vue
+++ b/spa/src/views/Products.vue
@@ -1,9 +1,11 @@
 <template>
   <div ref="goodsRef" class="safe-top">
+    <SearchInput/>
     <ProductsList/>
   </div>
 </template>
 
 <script setup>
 import ProductsList from "@/components/ProductsList.vue";
+import SearchInput from "@/components/SearchInput.vue";
 </script>