@ozdao/martyrs 0.2.508 → 0.2.509

package/src/modules/products/TASKS.MD

@@ -1,157 +1 @@
-теперь добавь фильтрацию по выбранному периоду на фронте и беке. На фронте в lookups надо добавить rents в случае если есть период (чтобы не грузить лишний раз), в products.lookup.config
-   добавить rents и добавить в product.query фильтрацию по доступности с учетом quantityЖ Для фильтрации доступных товаров при агрегации на основе аренд, вам нужно использовать $lookup для
-   проверки пересечений с активными арендами. Вот пример агрегации:
-
-  javascript
-  const checkAvailability = async (startDate, endDate) => {
-    const pipeline = [
-      // Фильтр по нужным критериям товаров
-      {
-        $match: {
-          listing: 'rent',
-          status: 'active' // или другие условия
-        }
-      },
-      
-      // Присоединяем аренды для каждого товара
-      {
-        $lookup: {
-          from: 'rents',
-          let: { productId: '$_id' },
-          pipeline: [
-            {
-              $match: {
-                $expr: {
-                  $and: [
-                    { $eq: ['$product', '$productId'] },
-                    // Только активные аренды
-                    { $in: ['$status', ['confirmed', 'active']] },
-                    // Проверка пересечения дат
-                    {
-                      $or: [
-                        // Аренда начинается в запрашиваемый период
-                        {
-                          $and: [
-                            { $gte: ['$startDate', new Date(startDate)] },
-                            { $lte: ['$startDate', new Date(endDate)] }
-                          ]
-                        },
-                        // Аренда заканчивается в запрашиваемый период
-                        {
-                          $and: [
-                            { $gte: ['$endDate', new Date(startDate)] },
-                            { $lte: ['$endDate', new Date(endDate)] }
-                          ]
-                        },
-                        // Аренда полностью покрывает запрашиваемый период
-                        {
-                          $and: [
-                            { $lte: ['$startDate', new Date(startDate)] },
-                            { $gte: ['$endDate', new Date(endDate)] }
-                          ]
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            }
-          ],
-          as: 'activeRents'
-        }
-      },
-      
-      // Фильтруем только доступные товары
-      {
-        $match: {
-          activeRents: { $size: 0 } // Нет активных аренд в этот период
-        }
-      },
-      
-      // Убираем поле activeRents из результата
-      {
-        $project: {
-          activeRents: 0
-        }
-      }
-    ];
-
-    return await Product.aggregate(pipeline);
-  };
-  Если у вас товары могут иметь количество (например, несколько единиц одного товара), то нужно модифицировать логику:
-
-  javascript
-  const checkAvailabilityWithQuantity = async (startDate, endDate, requestedQuantity = 1) => {
-    const pipeline = [
-      {
-        $match: {
-          listing: 'rent',
-          status: 'active'
-        }
-      },
-      
-      {
-        $lookup: {
-          from: 'rents',
-          let: { productId: '$_id' },
-          pipeline: [
-            {
-              $match: {
-                $expr: {
-                  $and: [
-                    { $eq: ['$product', '$productId'] },
-                    { $in: ['$status', ['confirmed', 'active']] },
-                    // Проверка пересечения дат (та же логика)
-                  ]
-                }
-              }
-            },
-            // Суммируем количество в активных арендах
-            {
-              $group: {
-                _id: null,
-                totalRented: { $sum: '$quantity' }
-              }
-            }
-          ],
-          as: 'rentInfo'
-        }
-      },
-      
-      // Добавляем поле с доступным количеством
-      {
-        $addFields: {
-          rentedQuantity: {
-            $ifNull: [{ $arrayElemAt: ['$rentInfo.totalRented', 0] }, 0]
-          },
-          availableQuantity: {
-            $subtract: [
-              { $ifNull: ['$quantity', 1] }, // quantity товара или 1 по умолчанию
-              { $ifNull: [{ $arrayElemAt: ['$rentInfo.totalRented', 0] }, 0] }
-            ]
-          }
-        }
-      },
-      
-      // Фильтруем товары с достаточным количеством
-      {
-        $match: {
-          availableQuantity: { $gte: requestedQuantity }
-        }
-      },
-      
-      // Убираем временные поля
-      {
-        $project: {
-          rentInfo: 0,
-          rentedQuantity: 0
-        }
-      }
-    ];
-
-    return await Product.aggregate(pipeline);
-  };
-
-
-
-   сделать нужно минималистично и ничего кроме этого
+ПРОВЕРИТЬ РАБОТУ ИНГРЕДИЕНТОВ НА БЕКЕНДЕ И ФРОНТЕНДЕ

package/src/modules/products/components/elements/QuantitySelector.vue

@@ -8,15 +8,15 @@
     >
       <span class="i-regular">-</span>
     </button>
-
     <div class="radius-small br-solid br-1px br-light w-3r pd-small">
-    <input
-      type="number"
-      v-model.number="modelValue"
-      class="w-100 h-1r t-center"
-      :min="1"
-      :max="maxValue"
-    />
+      <input
+        type="number"
+        v-model.number="modelValue"
+        @input="validateInput"
+        class="w-100 h-1r t-center"
+        :min="1"
+        :max="maxValue"
+      />
     </div>
     <button 
       @click="incrementQuantity" 
@@ -38,6 +38,14 @@ const props = defineProps({
 
 const modelValue = defineModel();
 
+function validateInput() {
+  if (modelValue.value < 1) {
+    modelValue.value = 1;
+  } else if (modelValue.value > props.maxValue) {
+    modelValue.value = props.maxValue;
+  }
+}
+
 function incrementQuantity() {
   if (modelValue.value < props.maxValue) {
     modelValue.value++;
@@ -49,4 +57,4 @@ function decrementQuantity() {
     modelValue.value--;
   }
 }
-</script>
+</script>

package/src/modules/products/components/pages/Product.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="products.state.current" class="w-100 mobile:pd-thin pd-small bg-white">
-    <div class="cols-2 mobile:cols-1 w-100 gap-medium">
+    <div class="cols-2 mobile:cols-1 tablet:cols-1 w-100 gap-medium">
 
       <ProductImages
         :images="currentImages"

package/src/modules/products/components/pages/Products.vue

@@ -69,7 +69,6 @@
             </template>
           </Spoiler>
          
-
           <!-- Цена за сутки -->
           <Spoiler 
             class="o-hidden mn-b-medium"

package/src/modules/products/components/sections/ProductsPopular.vue

@@ -1,18 +1,23 @@
 <template>
   <Carousel
     :store="{
-      read: products.actions.read
+      read: (options) => products.actions.read(options)
     }"
     :options="{ 
-      limit: 10 
+      limit: 16,
+      sortParam: 'popularity',
+      owner: $route.name?.includes('Organization') ? $route.params._id : null,
+      lookup: ['variants'],
     }"
     :text="{ title: 'No products available' }"
     :showDots="true"
     class="popupar_products"
+    v-slot="{ 
+      item
+    }"
   >
-    <template #default="{ item }">
       <router-link  
-        :to="{ name: 'Organization_Product', params: { _id: item.owner.target, product: item._id } }"
+        :to="{ name: 'Organization_Product', params: { _id: item.owner.target._id || item.owner.target, product: item._id } }"
         class="h-100 pos-relative block"
       >
         <CardProduct  
@@ -20,7 +25,6 @@
           class="h-max-40r h-100 bg-light"
         />
       </router-link>
-    </template>
   </Carousel>
 </template>
 

package/src/modules/products/components/sections/ProductsRecommended.vue

@@ -139,7 +139,7 @@ const addSelectedToCart = async () => {
 <template>
   <div>
     <h3 class="mn-b-small">Frequently Bought Together</h3>
-    <div class="recommended-products cols-4 mobile:cols-2 gap-thin">
+    <div class="recommended-products cols-4 rows-auto-1fr mobile:cols-2 gap-thin">
       
       <CardProduct  
         v-for="(product, index) in products" 
@@ -166,7 +166,10 @@ const addSelectedToCart = async () => {
         <p class="mn-b-small">Total price:</p>
         <p class="mn-b-medium h3 t-medium">${{ totalPrice }}</p>
         <Button 
+          :disabled="selectedProducts.length < 1"
           class="bg-main gap-micro"
+          :showSuccess="false"
+          :showLoader="false"
           :submit="canAddToCart ? addSelectedToCart : undefined"
         >
           <IconShopcartAdd class="i-semi"/>

package/src/modules/products/controllers/configs/products.lookup.config.js

@@ -81,7 +81,17 @@ export default  {
       from: 'products',
       localField: 'recommended',
       foreignField: '_id',
-      as: 'recommended'
+      as: 'recommended',
+      pipeline: [
+        {
+          $lookup: {
+            from: 'variants',
+            localField: '_id',
+            foreignField: 'product',
+            as: 'variants'
+          }
+        }
+      ]
     }
   },
   // Лукап для категорий продукта

package/src/styles/base/all.scss

@@ -259,10 +259,15 @@ body {
 	}
 	.rows-1 {display: grid;  grid-template-columns: 100%; grid-auto-rows: minmax(auto, max-content); }
 	.rows-1-min0_max1 {display: grid; grid-template-rows: minmax(0, 1fr); }
-	.rows-auto {   grid-auto-flow: row;
-  grid-auto-columns: auto;
-  grid-template-rows: auto;
-  grid-auto-rows: auto;}
+	.rows-auto {   
+		grid-auto-flow: row;
+	  grid-auto-columns: auto;
+	  grid-template-rows: auto;
+	  grid-auto-rows: auto;
+	}
+	.rows-auto-1fr {
+		grid-auto-rows: 1fr;
+	}
 	// REFACTOR THIS SHIT
 	.grid {
 	  display: grid;

package/src/styles/config.scss

@@ -336,6 +336,12 @@ $display-values: (
   'table-cell': table-cell
 );
 
+$text-align-values: (
+  'left': left,
+  'center': center,
+  'right': right,
+);
+
 $order: (
   '1': 1,
   '2': 2,
@@ -395,6 +401,10 @@ body {
   @include generate-utility-classes('o-y', 'overflow-y', null, $overflow-xy-values, $breakpoints);
   @include generate-utility-classes('d', 'display', null, $display-values, $breakpoints);
 
+  /* Typography */
+  @include generate-utility-classes('t', 'text-align', null, $text-align-values, $breakpoints);
+
+
 
 	@include generate-utility-classes('cols', 'grid-template-columns', null, $cols, $breakpoints);
 	

package/src/styles/responsive.scss

@@ -65,7 +65,8 @@ $xxl-desktop-min:                   1921px;
     }
     
      // Cols
-    .cols-1, .cols-2, .cols-4,  .cols-2-2_1, .cols-2-1_2, .cols-2-1_3, .cols-2-golden-ration   { display: grid !important; grid-template-columns: 1fr !important;  }
+/*     .cols-2,*/
+    .cols-1,  .cols-4,  .cols-2-2_1, .cols-2-1_2, .cols-2-1_3, .cols-2-golden-ration   { display: grid !important; grid-template-columns: 1fr !important;  }
     .cols-4.no-responsive { grid-template-columns: 1fr 1fr 1fr 1fr !important }
     .cols-2 { >.col { width: 100% !important;  } }
 

package/src/styles/typography.scss

@@ -80,11 +80,6 @@ a:hover   { cursor: pointer;}
   -ms-user-select: none; /* IE 10 and IE 11 */
   user-select: none; /* Standard syntax */  
 }
-// Text align
-
-.t-left   	{ text-align: left; 	}
-.t-center   { text-align: center; }
-.t-right  	{ text-align: right; 	}
 // Font weights
 .t-bold   	{ font-weight: 900;}
 .t-demi   	{ font-weight: 700;}

package/dist/martyrs/src/components/Chips/Chips.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Chips.vue2.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Chips/Chips.vue2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Chips.vue2.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Dropdown/Dropdown.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Dropdown.vue2.cjs","sources":["../../../../../src/components/Dropdown/Dropdown.vue"],"sourcesContent":["<template>\n  <div class=\"dropdown pos-relative\" v-click-outside=\"clickedOutside\" @click.stop=\"isOpen = !isOpen\">\n    <div v-if=\"isComponentLabel\" class=\"w-100 h-100 flex-center flex\">\n      <component :is=\"label.component\" v-bind=\"label.props\" :class=\"label.class\"></component>\n    </div>\n    <div v-else>\n      {{ label }}\n    </div>\n    <transition name=\"TransitionTranslateY\" mode=\"out-in\">\n      <div \n        v-show=\"isOpen\" \n        :style=\"{ left: align === 'left' ? '0' : 'auto', right: align === 'right' ? '0' : 'auto' }\" \n        class=\"dropdown-content radius-big\" \n      >\n        <slot></slot>\n      </div>\n    </transition>\n  </div>\n</template>\n\n<script setup>\nimport { ref, computed } from 'vue';\nimport clickOutside from '../FieldPhone/click-outside.js';\n\nlet vClickOutside = clickOutside\n\nconst props = defineProps({\n  label: {\n    type: [String, Object],\n    default: 'Open'\n  },\n  align: {\n    type: String,\n    default: 'left'\n  }\n})\n\nconst isOpen = ref(false);\nconst isComponentLabel = computed(() => typeof props.label === 'object');\n\nfunction clickedOutside () {\n  isOpen.value = false\n}\n</script>\n\n<style >\n.dropdown-content {\n  display: block;\n  position: absolute;\n  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);\n  z-index: 1;\n}\n\n/*.dropdown:hover .dropdown-content {\n  display: block;\n}*/\n</style>\n"],"names":["clickOutside","ref","computed"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAwBA,QAAI,gBAAgBA,aAAAA;AAEpB,UAAM,QAAQ;AAWd,UAAM,SAASC,IAAAA,IAAI,KAAK;AACxB,UAAM,mBAAmBC,IAAAA,SAAS,MAAM,OAAO,MAAM,UAAU,QAAQ;AAEvE,aAAS,iBAAkB;AACzB,aAAO,QAAQ;AAAA,IACjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Menu/Menu.vue.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Menu.vue.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Menu/Menu.vue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Menu.vue.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Select/Select.vue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Select.vue.js","sources":["../../../../../src/components/Select/Select.vue"],"sourcesContent":["<template>\n  <!-- Input Wrapper -->\n  <div \n    ref=\"fieldWrapper\"\n    tabindex=\"0\"\n    @click.stop=\"toggleMenu\"  \n    v-click-outside=\"clickedOutside\" \n    :class=\"$attrs.class\" \n    class=\"cursor-pointer field-wrapper flex-v-center flex-nowrap flex pos-relative\"\n  >\n    <!-- Label -->\n    <span v-if=\"label\" class=\"t-transp mn-r-small\">{{label}}</span>\n    \n    <!-- Input -->\n    <span>\n      {{ optionsSelected ? (optionsSelected.name || optionsSelected[props.value] || optionsSelected) : placeholder  }}\n    </span>\n    <!-- Dropdown menu -->\n    <transition mode=\"out-in\" name=\"TransitionTranslateY\">\n      <ul \n        v-show=\"showMenu\" \n        class=\"bs-black pos-absolute pos-t-100 pos-l-0 z-index-5 pd-small radius-small bg-white mn-t-thin w-100\"\n        style=\"min-width: max-content;\"\n      >\n        <li @click.stop=\"selectOption(option)\" v-for=\"option in optionsListed\" class=\"radius-thin hover-bg-light pd-thin text-box-trim\">\n          <span v-if=\"option\" class=\"w-100\">\n            {{ option.name || option[props.value] || option }}\n          </span>\n        </li>\n      </ul>\n    </transition>\n  </div>\n  <!-- Validation -->\n  <transition mode=\"out-in\" name=\"fade\">\n    <div v-if=\"validation\" class=\"mn-t-thin invalid-feedback\">\n      * {{validation.message}}\n    </div>\n  </transition>\n</template>\n<script setup>\nimport { ref, computed, watch, nextTick } from 'vue'\nimport clickOutside from '../FieldPhone/click-outside.js';\nlet vClickOutside = clickOutside\nconst emit = defineEmits([\n  'update:select', \n  'focus', \n  'blur'\n])\nconst props = defineProps({\n  label: String,\n  placeholder: { type: String, default: 'Please select an item' },\n  select: [String, Object],\n  property: String,\n  value: String,\n  options: { type: Array, default: () => [] },\n  validation: Boolean,\n})\nconst showMenu = ref(false)\nconst fieldWrapper = ref(null)\nconst optionsSelected = ref(\n  props.property \n  ? findObjectByValue(props.select, props.property, props.options) \n  : props.select\n)\nconst optionsListed = computed(() => {\n  return props.select \n  ? props.options.filter(option => option !== props.select) \n  : props.options\n})\nwatch(() => props.select, (newSelect) => {\n  optionsSelected.value = \n  props.property \n  ? findObjectByValue(props.select, props.property, props.options) \n  : props.select;\n});\nconst toggleMenu = async () => {\n  showMenu.value = !showMenu.value\n  \n  if (showMenu.value) {\n    await nextTick()\n    fieldWrapper.value?.focus()\n    emit('focus')\n  } else {\n    emit('blur')\n  }\n}\nfunction clickedOutside () {\n  showMenu.value = false\n}\nconst selectOption = option => {\n  optionsSelected.value = option\n  \n  toggleMenu()\n  if (props.property) {  \n    emit('update:select', optionsSelected.value[props.property])\n  } else {\n    emit('update:select', optionsSelected.value)\n  }\n}\nfunction findObjectByValue (value, property, objects) {\n  for (const object of objects) {\n    if (object[property] === value || object === value) {\n      return object;\n    }\n  }\n  return null;\n}\n</script>\n<style lang=\"scss\" scoped>\n  li {\n    list-style-type: none;\n  }\n  ul li {\n    line-height: 2;\n  }\n  .field-wrapper:focus {\n    outline: none;\n  }\n</style>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0CA,QAAI,gBAAgB;AACpB,UAAM,OAAO;AAKb,UAAM,QAAQ;AASd,UAAM,WAAW,IAAI,KAAK;AAC1B,UAAM,eAAe,IAAI,IAAI;AAC7B,UAAM,kBAAkB;AAAA,MACtB,MAAM,WACJ,kBAAkB,MAAM,QAAQ,MAAM,UAAU,MAAM,OAAO,IAC7D,MAAM;AAAA,IACV;AACA,UAAM,gBAAgB,SAAS,MAAM;AACnC,aAAO,MAAM,SACX,MAAM,QAAQ,OAAO,YAAU,WAAW,MAAM,MAAM,IACtD,MAAM;AAAA,IACV,CAAC;AACD,UAAM,MAAM,MAAM,QAAQ,CAAC,cAAc;AACvC,sBAAgB,QAChB,MAAM,WACJ,kBAAkB,MAAM,QAAQ,MAAM,UAAU,MAAM,OAAO,IAC7D,MAAM;AAAA,IACV,CAAC;AACD,UAAM,aAAa,YAAY;AAC7B,eAAS,QAAQ,CAAC,SAAS;AAE3B,UAAI,SAAS,OAAO;AAClB,cAAM,SAAQ;AACd,qBAAa,OAAO,MAAK;AACzB,aAAK,OAAO;AAAA,MACd,OAAO;AACL,aAAK,MAAM;AAAA,MACb;AAAA,IACF;AACA,aAAS,iBAAkB;AACzB,eAAS,QAAQ;AAAA,IACnB;AACA,UAAM,eAAe,YAAU;AAC7B,sBAAgB,QAAQ;AAExB,iBAAU;AACV,UAAI,MAAM,UAAU;AAClB,aAAK,iBAAiB,gBAAgB,MAAM,MAAM,QAAQ,CAAC;AAAA,MAC7D,OAAO;AACL,aAAK,iBAAiB,gBAAgB,KAAK;AAAA,MAC7C;AAAA,IACF;AACA,aAAS,kBAAmB,OAAO,UAAU,SAAS;AACpD,iBAAW,UAAU,SAAS;AAC5B,YAAI,OAAO,QAAQ,MAAM,SAAS,WAAW,OAAO;AAClD,iBAAO;AAAA,QACT;AAAA,MACF;AACA,aAAO;AAAA,IACT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}