@ozdao/martyrs 0.2.509 → 0.2.510

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-DSiCr7yl.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-DrpgUZcn.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/core/utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utils = require("../../../../../../../_virtual/utils.cjs");
+const utils = require("../../../../../../../_virtual/utils2.cjs");
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils.__exports;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/core/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utils = require("../../../../../../../_virtual/utils2.cjs");
+const utils = require("../../../../../../../_virtual/utils.cjs");
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils.__exports;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/products.server.cjs

@@ -467,42 +467,31 @@ function getAttributeFiltersStage(filtersString) {
     return [];
   }
 }
-function getVariantPriceFilterStage(prices) {
-  if (!prices) return [];
+function getVariantPriceFilterStage(priceMin, priceMax) {
+  const hasValidMin = priceMin && priceMin.trim() !== "";
+  const hasValidMax = priceMax && priceMax.trim() !== "";
+  if (!hasValidMin && !hasValidMax) return [];
   try {
-    const priceRanges = prices.split(",");
-    const priceConditions = [];
-    priceRanges.forEach((priceRange) => {
-      if (priceRange.startsWith("<")) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $lt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else if (priceRange.startsWith(">")) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $gt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else {
-        const [min, max] = priceRange.split("-").map(Number);
-        if (!isNaN(min) && !isNaN(max)) {
-          priceConditions.push({
-            variants: {
-              $elemMatch: {
-                price: { $gte: min, $lte: max }
-              }
-            }
-          });
+    const priceCondition = {
+      variants: {
+        $elemMatch: {
+          price: {}
         }
       }
-    });
-    return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+    };
+    if (hasValidMin) {
+      const minPrice = parseFloat(priceMin);
+      if (!isNaN(minPrice)) {
+        priceCondition.variants.$elemMatch.price.$gte = minPrice;
+      }
+    }
+    if (hasValidMax) {
+      const maxPrice = parseFloat(priceMax);
+      if (!isNaN(maxPrice)) {
+        priceCondition.variants.$elemMatch.price.$lte = maxPrice;
+      }
+    }
+    return [{ $match: priceCondition }];
   } catch (error) {
     console.error("Error parsing price filters:", error);
     return [];
@@ -512,11 +501,19 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
   if (!dateStart || !dateEnd) return [];
   const startDate = new Date(dateStart);
   const endDate = new Date(dateEnd);
+  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+    console.warn("Invalid dates provided for availability filter:", { dateStart, dateEnd });
+    return [];
+  }
   return [
     {
       $lookup: {
         from: "rents",
-        let: { productId: "$_id" },
+        let: {
+          productId: "$_id",
+          dateStart: startDate,
+          dateEnd: endDate
+        },
         pipeline: [
           {
             $match: {
@@ -528,20 +525,20 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
                     $or: [
                       {
                         $and: [
-                          { $gte: ["$startDate", startDate] },
-                          { $lte: ["$startDate", endDate] }
+                          { $gte: ["$startDate", "$$dateStart"] },
+                          { $lte: ["$startDate", "$$dateEnd"] }
                         ]
                       },
                       {
                         $and: [
-                          { $gte: ["$endDate", startDate] },
-                          { $lte: ["$endDate", endDate] }
+                          { $gte: ["$endDate", "$$dateStart"] },
+                          { $lte: ["$endDate", "$$dateEnd"] }
                         ]
                       },
                       {
                         $and: [
-                          { $lte: ["$startDate", startDate] },
-                          { $gte: ["$endDate", endDate] }
+                          { $lte: ["$startDate", "$$dateStart"] },
+                          { $gte: ["$endDate", "$$dateEnd"] }
                         ]
                       }
                     ]
@@ -716,13 +713,30 @@ const productLookupConfigs = {
       }
     }]
   },
-  // Лукап для аренд продукта
+  // Лукап для аренд продуктов (статичный без дат)
   rents: {
     lookup: {
       from: "rents",
       localField: "_id",
       foreignField: "product",
-      as: "rents"
+      as: "rents",
+      pipeline: [
+        {
+          $match: {
+            status: { $in: ["confirmed", "active"] }
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            product: 1,
+            startDate: 1,
+            endDate: 1,
+            quantity: 1,
+            status: 1
+          }
+        }
+      ]
     }
   }
 };
@@ -744,6 +758,15 @@ const controllerFactory = (db) => {
   const Read = async (req, res) => {
     try {
       const requestedLookups = queryProcessor.queryProcessorGlobals.getRequestedLookups(req.query);
+      if (req.query.dateStart || req.query.dateEnd) {
+        console.log("Availability filter params:", {
+          dateStart: req.query.dateStart,
+          dateEnd: req.query.dateEnd,
+          dateStartType: typeof req.query.dateStart,
+          dateEndType: typeof req.query.dateEnd
+        });
+      }
+      console.log("availability variant", JSON.stringify(...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd), null, 2));
       const stages = [
         ...queryProcessor.queryProcessorGlobals.getBasicOptions(req.query),
         ...queryProcessor.queryProcessorGlobals.getSearchOptions(req.query.search, {
@@ -756,9 +779,9 @@ const controllerFactory = (db) => {
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),
         ...queryProcessorProducts.getAttributeFiltersStage(req.query.filters),
-        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.prices),
-        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         ...queryProcessor.queryProcessorGlobals.getLookupStages(requestedLookups, productLookupConfigs),
+        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.priceMin, req.query.priceMax),
+        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         queryProcessor.queryProcessorGlobals.getCreatorUserLookupStage(),
         queryProcessor.queryProcessorGlobals.getCreatorOrganizationLookupStage(),
         queryProcessor.queryProcessorGlobals.getOwnerUserLookupStage(),
@@ -977,6 +1000,7 @@ const ProductModel = (db) => {
   });
   common_schema.applyCommonSchema(ProductSchema);
   ownership_schema.applyOwnershipSchema(ProductSchema, db);
+  engagement_schema.applyEngagementSchema(ProductSchema);
   ProductSchema.index({ name: "text", description: "text" });
   ProductSchema.index({ "owner.type": 1, "owner.target": 1, status: 1, category: 1 });
   ProductSchema.index({ category: 1, status: 1, delivery: 1, price: 1 });

package/dist/products.server.js

@@ -465,42 +465,31 @@ function getAttributeFiltersStage(filtersString) {
     return [];
   }
 }
-function getVariantPriceFilterStage(prices) {
-  if (!prices) return [];
+function getVariantPriceFilterStage(priceMin, priceMax) {
+  const hasValidMin = priceMin && priceMin.trim() !== "";
+  const hasValidMax = priceMax && priceMax.trim() !== "";
+  if (!hasValidMin && !hasValidMax) return [];
   try {
-    const priceRanges = prices.split(",");
-    const priceConditions = [];
-    priceRanges.forEach((priceRange) => {
-      if (priceRange.startsWith("<")) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $lt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else if (priceRange.startsWith(">")) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $gt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else {
-        const [min, max] = priceRange.split("-").map(Number);
-        if (!isNaN(min) && !isNaN(max)) {
-          priceConditions.push({
-            variants: {
-              $elemMatch: {
-                price: { $gte: min, $lte: max }
-              }
-            }
-          });
+    const priceCondition = {
+      variants: {
+        $elemMatch: {
+          price: {}
         }
       }
-    });
-    return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+    };
+    if (hasValidMin) {
+      const minPrice = parseFloat(priceMin);
+      if (!isNaN(minPrice)) {
+        priceCondition.variants.$elemMatch.price.$gte = minPrice;
+      }
+    }
+    if (hasValidMax) {
+      const maxPrice = parseFloat(priceMax);
+      if (!isNaN(maxPrice)) {
+        priceCondition.variants.$elemMatch.price.$lte = maxPrice;
+      }
+    }
+    return [{ $match: priceCondition }];
   } catch (error) {
     console.error("Error parsing price filters:", error);
     return [];
@@ -510,11 +499,19 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
   if (!dateStart || !dateEnd) return [];
   const startDate = new Date(dateStart);
   const endDate = new Date(dateEnd);
+  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+    console.warn("Invalid dates provided for availability filter:", { dateStart, dateEnd });
+    return [];
+  }
   return [
     {
       $lookup: {
         from: "rents",
-        let: { productId: "$_id" },
+        let: {
+          productId: "$_id",
+          dateStart: startDate,
+          dateEnd: endDate
+        },
         pipeline: [
           {
             $match: {
@@ -526,20 +523,20 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
                     $or: [
                       {
                         $and: [
-                          { $gte: ["$startDate", startDate] },
-                          { $lte: ["$startDate", endDate] }
+                          { $gte: ["$startDate", "$$dateStart"] },
+                          { $lte: ["$startDate", "$$dateEnd"] }
                         ]
                       },
                       {
                         $and: [
-                          { $gte: ["$endDate", startDate] },
-                          { $lte: ["$endDate", endDate] }
+                          { $gte: ["$endDate", "$$dateStart"] },
+                          { $lte: ["$endDate", "$$dateEnd"] }
                         ]
                       },
                       {
                         $and: [
-                          { $lte: ["$startDate", startDate] },
-                          { $gte: ["$endDate", endDate] }
+                          { $lte: ["$startDate", "$$dateStart"] },
+                          { $gte: ["$endDate", "$$dateEnd"] }
                         ]
                       }
                     ]
@@ -714,13 +711,30 @@ const productLookupConfigs = {
       }
     }]
   },
-  // Лукап для аренд продукта
+  // Лукап для аренд продуктов (статичный без дат)
   rents: {
     lookup: {
       from: "rents",
       localField: "_id",
       foreignField: "product",
-      as: "rents"
+      as: "rents",
+      pipeline: [
+        {
+          $match: {
+            status: { $in: ["confirmed", "active"] }
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            product: 1,
+            startDate: 1,
+            endDate: 1,
+            quantity: 1,
+            status: 1
+          }
+        }
+      ]
     }
   }
 };
@@ -742,6 +756,15 @@ const controllerFactory = (db) => {
   const Read = async (req, res) => {
     try {
       const requestedLookups = queryProcessorGlobals.getRequestedLookups(req.query);
+      if (req.query.dateStart || req.query.dateEnd) {
+        console.log("Availability filter params:", {
+          dateStart: req.query.dateStart,
+          dateEnd: req.query.dateEnd,
+          dateStartType: typeof req.query.dateStart,
+          dateEndType: typeof req.query.dateEnd
+        });
+      }
+      console.log("availability variant", JSON.stringify(...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd), null, 2));
       const stages = [
         ...queryProcessorGlobals.getBasicOptions(req.query),
         ...queryProcessorGlobals.getSearchOptions(req.query.search, {
@@ -754,9 +777,9 @@ const controllerFactory = (db) => {
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),
         ...queryProcessorProducts.getAttributeFiltersStage(req.query.filters),
-        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.prices),
-        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         ...queryProcessorGlobals.getLookupStages(requestedLookups, productLookupConfigs),
+        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.priceMin, req.query.priceMax),
+        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         queryProcessorGlobals.getCreatorUserLookupStage(),
         queryProcessorGlobals.getCreatorOrganizationLookupStage(),
         queryProcessorGlobals.getOwnerUserLookupStage(),
@@ -975,6 +998,7 @@ const ProductModel = (db) => {
   });
   applyCommonSchema(ProductSchema);
   applyOwnershipSchema(ProductSchema, db);
+  applyEngagementSchema(ProductSchema);
   ProductSchema.index({ name: "text", description: "text" });
   ProductSchema.index({ "owner.type": 1, "owner.target": 1, status: 1, category: 1 });
   ProductSchema.index({ category: 1, status: 1, delivery: 1, price: 1 });

package/dist/style.css

@@ -63,19 +63,22 @@
 .background-div {
   flex-grow: 1;
 }
-input[data-v-985f0e53],
-textarea[data-v-985f0e53],
-span[data-v-985f0e53] {
+input[data-v-36998019],
+textarea[data-v-36998019],
+span[data-v-36998019] {
   color: inherit;
   line-height: 1;
 }
-textarea[data-v-985f0e53] {
+textarea[data-v-36998019] {
   resize: none;
   overflow: hidden; 
   height: 1rem;
 }
-input[type="date"][data-v-985f0e53]::-webkit-calendar-picker-indicator,
-input[type="time"][data-v-985f0e53]::-webkit-calendar-picker-indicator {
+input[data-v-36998019] {
+  height: 1rem;
+}
+input[type="date"][data-v-36998019]::-webkit-calendar-picker-indicator,
+input[type="time"][data-v-36998019]::-webkit-calendar-picker-indicator {
   filter: invert(1);
   opacity: 1;
   color: inherit;
@@ -779,7 +782,11 @@ button[data-v-2ba40647]:disabled {
   overflow: hidden;
   transition: height 0.3s cubic-bezier(0.4, 0, 0.2, 1);
 }
-.filters-content[data-v-e07dca8a] {
+.icon-custom { 
+  background: white;
+}
+
+.filters-content[data-v-e749b035] {
   max-height: 60vh;
   overflow-y: auto;
 }
@@ -798,10 +805,6 @@ button[data-v-2ba40647]:disabled {
   position: absolute;
 }
 
-.icon-custom { 
-  background: white;
-}
-
 .t-trimmed {
 		font-size: 0;
 }

package/dist/{web-gtBkwjra.js → web-C5cmb1FH.js}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-DSiCr7yl.js";
+import { W as p } from "./main-DrpgUZcn.js";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/dist/{web-XyQNm3cW.cjs → web-d40xcY_Y.cjs}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-D89N_jml.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-XJQJFmgj.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.509",
+  "version": "0.2.510",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Checkbox/Checkbox.vue

@@ -53,7 +53,7 @@
       :checked="Array.isArray(radio) ? radio.includes(value) : radio"
     > 
     <div 
-      class="cursor-pointer mn-l-thin flex-center"
+      class="cursor-pointer mn-l-thin flex-center field-wrapper"
       :class="{
         'transition-elastic pd-thin h-2r w-4r radius-extra': mode === 'switch',
         'w-2r h-2r radius-small': mode === 'checkbox',

package/src/components/Feed/Feed.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="search || date || (sort && !sort.hideButton)" style="transform: scale(1);" class="mn-b-thin pos-relative flex-nowrap flex gap-thin">
+  <div v-if="search || date || (sort && !sort.hideButton)" style="transform: scale(1);" class="mn-b-thin pos-relative z-index-2 pos-relative flex-nowrap flex gap-thin">
 
     <BlockSearch 
       v-if="search"

package/src/components/Field/Field.vue

@@ -150,6 +150,11 @@ textarea {
   overflow: hidden; 
   height: 1rem;
 }
+
+input {
+  height: 1rem;
+}
+
 input[type="date"]::-webkit-calendar-picker-indicator,
 input[type="time"]::-webkit-calendar-picker-indicator {
   filter: invert(1);

package/src/modules/globals/views/components/layouts/Client.vue

@@ -143,6 +143,7 @@
 					      		class="w-100 h-min-100"
 				      		 	@page-loading="handlePageLoading"
 			              @page-loaded="handlePageLoaded"
+			              :key="componentKey"
 					      	/>
 					      	<!-- Key пока выключил непонятно какие проблемы это вызовет -->
 					      	<!-- :key="route.path"  -->
@@ -193,7 +194,7 @@
 
 
 <script setup>
-	import { computed, ref, onMounted, watch  } from 'vue';
+	import { computed, ref, onMounted  } from 'vue';
 	// Router
 	import { useRoute } from 'vue-router';
 	// Store
@@ -330,6 +331,16 @@
 
 		if (page.value) show.value = true
 	});
+
+	const componentKey = computed(() => {
+	  // Собираем только значимые параметры (ID сущностей)
+	  const significantParams = ['_id', 'product', 'organization', 'categoryPath']
+	    .map(param => route.params[param])
+	    .filter(Boolean)
+	    .join('-');
+	  
+	  return significantParams || route.name;
+	});
 </script>
 
 <style lang="scss">