@ozdao/martyrs 0.2.562 → 0.2.564

package/dist/martyrs/src/modules/marketplace/views/store/marketplace.js

@@ -54,22 +54,6 @@ const state = reactive({
           { label: "Crypto", value: "crypto" },
           { label: "Bank Transfer", value: "bank" }
         ]
-      },
-      {
-        title: "Availability Date",
-        value: "availabilityDate",
-        type: "date"
-      },
-      {
-        title: "Rating",
-        value: "rating",
-        type: "radio",
-        options: [
-          { label: "5 stars", value: "5" },
-          { label: "4+ stars", value: "4" },
-          { label: "3+ stars", value: "3" },
-          { label: "Any rating", value: "any" }
-        ]
       }
     ]
   },

package/dist/martyrs/src/modules/marketplace/views/store/marketplace.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace.js","sources":["../../../../../../../src/modules/marketplace/views/store/marketplace.js"],"sourcesContent":["import { reactive, watch } from 'vue';\nimport StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';\nimport { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';\n\nconst { returnCurrency } = useGlobalMixins();\n\n// State\nconst state = reactive({\n  shops: [],\n  popular: [],\n  pagination: {\n    page: 1,\n    perPage: 18,\n  },\n  search: {\n    active: false,\n    current: '',\n    result: [],\n  },\n  locationOptions: [\n    { label: 'All', path: '/marketplace' },\n    { label: 'Phuket', path: '/marketplace/thailand/phuket' },\n    { label: 'Bangkok', path: '/marketplace/thailand/bangkok' },\n    { label: 'Chiang Mai', path: '/marketplace/thailand/chiang-mai' },\n    { label: 'Pattaya', path: '/marketplace/thailand/pattaya' },\n  ],\n  filter: {\n    active: false,\n    class: 'mobile-only',\n    selected: {},\n    options: [\n      {\n        title: 'Price',\n        value: 'price',\n        type: 'range',\n        minPlaceholder: 'From',\n        maxPlaceholder: 'To',\n        label: returnCurrency()\n      },\n      {\n        title: 'Delivery',\n        value: 'delivery',\n        type: 'checkbox',\n        options: [\n          { label: 'Pickup', value: 'pickup' },\n          { label: 'Delivery', value: 'courier' },\n          { label: 'Mail', value: 'post' },\n        ],\n      },\n      {\n        title: 'Payment',\n        value: 'payment',\n        type: 'checkbox',\n        options: [\n          { label: 'Cash', value: 'cash' },\n          { label: 'Card', value: 'card' },\n          { label: 'Crypto', value: 'crypto' },\n          { label: 'Bank Transfer', value: 'bank' },\n        ],\n      },\n      {\n        title: 'Availability Date',\n        value: 'availabilityDate',\n        type: 'date'\n      },\n      {\n        title: 'Rating',\n        value: 'rating',\n        type: 'radio',\n        options: [\n          { label: '5 stars', value: '5' },\n          { label: '4+ stars', value: '4' },\n          { label: '3+ stars', value: '3' },\n          { label: 'Any rating', value: 'any' }\n        ]\n      },\n    ],\n  },\n  sort: {\n    param: 'distance',\n    order: 'asc',\n    options: [\n      {\n        label: 'Distance',\n        value: 'distance',\n      },\n      {\n        label: 'Popularity',\n        value: 'views',\n      },\n      {\n        label: 'Products',\n        value: 'numberOfProducts',\n      },\n    ],\n  },\n});\n\n// History\nconst history = [];\nhistory.push(state);\n\n// Watch\nwatch(state, (newState, oldState) => {\n  history.push(newState);\n});\n\n// Actions через StoreManager\nconst marketplaceStore = new StoreManager('/api/marketplace');\n\n// Custom action для каталога\nmarketplaceStore.readCatalog = async function(params = {}) {\n  console.log('Reading marketplace catalog with params:', params);\n  try {\n    const result = await this.request('/catalog', { params });\n    console.log(`Catalog returned ${result.length || 0} items`);\n\n    // Обновляем state.shops если нужно\n    if (result && Array.isArray(result)) {\n      state.shops = result;\n    }\n\n    return result;\n  } catch (error) {\n    console.error('Catalog read failed:', error);\n    throw error;\n  }\n};\n\n// Module Export\nexport { state, marketplaceStore };\n\nexport default marketplaceStore;\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"marketplace.js","sources":["../../../../../../../src/modules/marketplace/views/store/marketplace.js"],"sourcesContent":["import { reactive, watch } from 'vue';\nimport StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';\nimport { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';\n\nconst { returnCurrency } = useGlobalMixins();\n\n// State\nconst state = reactive({\n  shops: [],\n  popular: [],\n  pagination: {\n    page: 1,\n    perPage: 18,\n  },\n  search: {\n    active: false,\n    current: '',\n    result: [],\n  },\n  locationOptions: [\n    { label: 'All', path: '/marketplace' },\n    { label: 'Phuket', path: '/marketplace/thailand/phuket' },\n    { label: 'Bangkok', path: '/marketplace/thailand/bangkok' },\n    { label: 'Chiang Mai', path: '/marketplace/thailand/chiang-mai' },\n    { label: 'Pattaya', path: '/marketplace/thailand/pattaya' },\n  ],\n  filter: {\n    active: false,\n    class: 'mobile-only',\n    selected: {},\n    options: [\n      {\n        title: 'Price',\n        value: 'price',\n        type: 'range',\n        minPlaceholder: 'From',\n        maxPlaceholder: 'To',\n        label: returnCurrency()\n      },\n      {\n        title: 'Delivery',\n        value: 'delivery',\n        type: 'checkbox',\n        options: [\n          { label: 'Pickup', value: 'pickup' },\n          { label: 'Delivery', value: 'courier' },\n          { label: 'Mail', value: 'post' },\n        ],\n      },\n      {\n        title: 'Payment',\n        value: 'payment',\n        type: 'checkbox',\n        options: [\n          { label: 'Cash', value: 'cash' },\n          { label: 'Card', value: 'card' },\n          { label: 'Crypto', value: 'crypto' },\n          { label: 'Bank Transfer', value: 'bank' },\n        ],\n      },\n    ],\n  },\n  sort: {\n    param: 'distance',\n    order: 'asc',\n    options: [\n      {\n        label: 'Distance',\n        value: 'distance',\n      },\n      {\n        label: 'Popularity',\n        value: 'views',\n      },\n      {\n        label: 'Products',\n        value: 'numberOfProducts',\n      },\n    ],\n  },\n});\n\n// History\nconst history = [];\nhistory.push(state);\n\n// Watch\nwatch(state, (newState, oldState) => {\n  history.push(newState);\n});\n\n// Actions через StoreManager\nconst marketplaceStore = new StoreManager('/api/marketplace');\n\n// Custom action для каталога\nmarketplaceStore.readCatalog = async function(params = {}) {\n  console.log('Reading marketplace catalog with params:', params);\n  try {\n    const result = await this.request('/catalog', { params });\n    console.log(`Catalog returned ${result.length || 0} items`);\n\n    // Обновляем state.shops если нужно\n    if (result && Array.isArray(result)) {\n      state.shops = result;\n    }\n\n    return result;\n  } catch (error) {\n    console.error('Catalog read failed:', error);\n    throw error;\n  }\n};\n\n// Module Export\nexport { state, marketplaceStore };\n\nexport default marketplaceStore;\n"],"names":[],"mappings":";;;AAIA,MAAM,EAAE,eAAc,IAAK,gBAAe;AAGrC,MAAC,QAAQ,SAAS;AAAA,EACrB,OAAO,CAAA;AAAA,EACP,SAAS,CAAA;AAAA,EACT,YAAY;AAAA,IACV,MAAM;AAAA,IACN,SAAS;AAAA,EACb;AAAA,EACE,QAAQ;AAAA,IACN,QAAQ;AAAA,IACR,SAAS;AAAA,IACT,QAAQ,CAAA;AAAA,EACZ;AAAA,EACE,iBAAiB;AAAA,IACf,EAAE,OAAO,OAAO,MAAM,eAAc;AAAA,IACpC,EAAE,OAAO,UAAU,MAAM,+BAA8B;AAAA,IACvD,EAAE,OAAO,WAAW,MAAM,gCAA+B;AAAA,IACzD,EAAE,OAAO,cAAc,MAAM,mCAAkC;AAAA,IAC/D,EAAE,OAAO,WAAW,MAAM,gCAA+B;AAAA,EAC7D;AAAA,EACE,QAAQ;AAAA,IACN,QAAQ;AAAA,IACR,OAAO;AAAA,IACP,UAAU,CAAA;AAAA,IACV,SAAS;AAAA,MACP;AAAA,QACE,OAAO;AAAA,QACP,OAAO;AAAA,QACP,MAAM;AAAA,QACN,gBAAgB;AAAA,QAChB,gBAAgB;AAAA,QAChB,OAAO,eAAc;AAAA,MAC7B;AAAA,MACM;AAAA,QACE,OAAO;AAAA,QACP,OAAO;AAAA,QACP,MAAM;AAAA,QACN,SAAS;AAAA,UACP,EAAE,OAAO,UAAU,OAAO,SAAQ;AAAA,UAClC,EAAE,OAAO,YAAY,OAAO,UAAS;AAAA,UACrC,EAAE,OAAO,QAAQ,OAAO,OAAM;AAAA,QACxC;AAAA,MACA;AAAA,MACM;AAAA,QACE,OAAO;AAAA,QACP,OAAO;AAAA,QACP,MAAM;AAAA,QACN,SAAS;AAAA,UACP,EAAE,OAAO,QAAQ,OAAO,OAAM;AAAA,UAC9B,EAAE,OAAO,QAAQ,OAAO,OAAM;AAAA,UAC9B,EAAE,OAAO,UAAU,OAAO,SAAQ;AAAA,UAClC,EAAE,OAAO,iBAAiB,OAAO,OAAM;AAAA,QACjD;AAAA,MACA;AAAA,IACA;AAAA,EACA;AAAA,EACE,MAAM;AAAA,IACJ,OAAO;AAAA,IACP,OAAO;AAAA,IACP,SAAS;AAAA,MACP;AAAA,QACE,OAAO;AAAA,QACP,OAAO;AAAA,MACf;AAAA,MACM;AAAA,QACE,OAAO;AAAA,QACP,OAAO;AAAA,MACf;AAAA,MACM;AAAA,QACE,OAAO;AAAA,QACP,OAAO;AAAA,MACf;AAAA,IACA;AAAA,EACA;AACA,CAAC;AAOD,MAAM,OAAO,CAAC,UAAU,aAAa;AAErC,CAAC;AAGI,MAAC,mBAAmB,IAAI,aAAa,kBAAkB;AAG5D,iBAAiB,cAAc,eAAe,SAAS,IAAI;AACzD,UAAQ,IAAI,4CAA4C,MAAM;AAC9D,MAAI;AACF,UAAM,SAAS,MAAM,KAAK,QAAQ,YAAY,EAAE,QAAQ;AACxD,YAAQ,IAAI,oBAAoB,OAAO,UAAU,CAAC,QAAQ;AAG1D,QAAI,UAAU,MAAM,QAAQ,MAAM,GAAG;AACnC,YAAM,QAAQ;AAAA,IAChB;AAEA,WAAO;AAAA,EACT,SAAS,OAAO;AACd,YAAQ,MAAM,wBAAwB,KAAK;AAC3C,UAAM;AAAA,EACR;AACF;"}

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, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-TV4u6Jux.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, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-CmjWiDVF.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/music.server.js

@@ -1,7 +1,8 @@
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
-import { L as LoggerNamespaced, C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
-import { C as CRUD } from "./crud-DFFgLl09.js";
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
+import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
+import { C as CRUD } from "./crud-C7FSTUes.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import fs$1 from "fs";
 import path$1 from "path";

package/dist/orders.server.js

@@ -4,8 +4,8 @@ import "./mailing-DuEFRsa3.js";
 import { m as modelsFactory, a as applyProfileSchema } from "./profile.schema-CjLOfG7b.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { a as applyCredentialsSchema } from "./credentials.schema--2vvcu8c.js";
-import { C as CRUD } from "./crud-DFFgLl09.js";
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { C as CRUD } from "./crud-C7FSTUes.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 import axios from "axios";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";

package/dist/organizations.server.js

@@ -1,4 +1,4 @@
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 import { a as applyCredentialsSchema } from "./credentials.schema--2vvcu8c.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
@@ -8,10 +8,10 @@ import { uuid } from "uuidv4";
 import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
 import { Types } from "mongoose";
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
-import { C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
 import { a as addUserStatusFields, b as addMembersQuantity } from "./addUserStatusFields-Cc-JpmPo.js";
 import jwt from "jsonwebtoken";
-import * as googleMapsServicesJs from "@googlemaps/google-maps-services-js";
+import { g as getRequestedLookups, a as getBasicMatchConditions, b as getLookupStages, c as getPostableConditions, d as getContainConditions, e as getPriceConditions, f as getLocationStages } from "./queryProcessorOrganizations-BB11WFpc.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 const controllerFactory$2 = (db) => {
   const Department = db.department;
@@ -666,7 +666,7 @@ const invitesRoutes = (function(app, db) {
   app.put("/api/invites/update", controller.update);
   app.post("/api/invites/delete", controller.delete);
 });
-const ObjectId$1 = { Types }.Types.ObjectId;
+const ObjectId = { Types }.Types.ObjectId;
 const controllerFactory$1 = (db) => {
   const Membership = db.membership;
   const Department = db.department;
@@ -694,9 +694,9 @@ const controllerFactory$1 = (db) => {
         },
         {
           $match: {
-            ...req.query.user && { user: new ObjectId$1(req.query.user) },
+            ...req.query.user && { user: new ObjectId(req.query.user) },
             ...req.query.type && { type: req.query.type },
-            ...req.query.target && { target: new ObjectId$1(req.query.target) },
+            ...req.query.target && { target: new ObjectId(req.query.target) },
             ...req.query.role && { role: { $in: req.query.role } },
             ...req.query.search && {
               $or: [
@@ -777,10 +777,10 @@ const controllerFactory$1 = (db) => {
     const { _id, type, target, user, role } = req.body;
     console.log("Delete membership request:", { _id, type, target, user, role });
     try {
-      const query = _id ? { _id: new ObjectId$1(_id) } : {
+      const query = _id ? { _id: new ObjectId(_id) } : {
         type,
-        target: new ObjectId$1(target),
-        user: new ObjectId$1(user),
+        target: new ObjectId(target),
+        user: new ObjectId(user),
         role
       };
       console.log("Delete query:", query);
@@ -881,216 +881,6 @@ const lookupConfigs = {
     }
   }
 };
-const ObjectId = { Types }.Types.ObjectId;
-const { Client } = googleMapsServicesJs;
-const client = new Client({});
-const getRequestedLookups = (query) => query.lookup ? Array.isArray(query.lookup) ? query.lookup : [query.lookup] : [];
-const getLookupStages = (requestedLookups, configs) => {
-  if (!requestedLookups) return [];
-  const lookupsArray = Array.isArray(requestedLookups) ? requestedLookups : requestedLookups.split(",");
-  return lookupsArray.map((lookup) => configs[lookup]).filter(Boolean).flatMap((config) => [
-    { $lookup: config.lookup },
-    // Оберните lookup в объект с $lookup
-    ...config.additionalStages || []
-  ]);
-};
-const getLocationStages = async (query) => {
-  if (!hasLocationParams(query)) {
-    return { stages: [], userLocation: null };
-  }
-  const location = await resolveLocation(query);
-  const radius = getRadius(query);
-  const geoStages = radius ? [
-    {
-      $match: {
-        "spots.location.coordinates": {
-          $geoWithin: {
-            $centerSphere: [[location.coordinates[0], location.coordinates[1]], radius]
-          }
-        }
-      }
-    }
-  ] : [];
-  return {
-    stages: [...geoStages, ...getDistanceStages(location)],
-    userLocation: location
-  };
-};
-const getRadius = (query) => {
-  if (query.locationRadius) return parseFloat(query.locationRadius) / 6378.1;
-  if (query.city) return 25 / 6378.1;
-  if (query.state) return 50 / 6378.1;
-  return null;
-};
-const hasLocationParams = (query) => query.location || query.address || query.city || query.state || query.country;
-const resolveLocation = async (query) => {
-  if (query.location) {
-    const parsedLocation = typeof query.location === "string" ? JSON.parse(query.location) : query.location;
-    const coordinates = parsedLocation.lng ? [parsedLocation.lng, parsedLocation.lat] : parsedLocation.coordinates;
-    return { coordinates: coordinates.map((coord) => parseFloat(coord)) };
-  }
-  const searchString = [query.address, query.city, query.state, query.country].filter(Boolean).join(", ");
-  try {
-    const geoResponse = await client.geocode({
-      params: {
-        address: searchString,
-        key: process.env.GOOGLE_MAPS_API_KEY
-      }
-    });
-    if (!geoResponse.data.results?.length) {
-      throw new Error("Unable to geocode the provided location.");
-    }
-    const { lng, lat } = geoResponse.data.results[0].geometry.location;
-    return { coordinates: [lng, lat] };
-  } catch (err) {
-    throw new Error("Error occurred while geocoding.");
-  }
-};
-const getDistanceStages = (location) => [
-  {
-    $addFields: {
-      spots: {
-        $map: {
-          input: "$spots",
-          as: "spot",
-          in: {
-            $mergeObjects: [
-              "$$spot",
-              {
-                distance: {
-                  $function: {
-                    body: `function(spotCoords, userCoords, isMiles) {
-                      function toRad(x) {
-                        return x * Math.PI / 180;
-                      }
-                      var lon1 = spotCoords[0];
-                      var lat1 = spotCoords[1];
-                      var lon2 = userCoords[0];
-                      var lat2 = userCoords[1];
-                      var R = 6371;
-                      if (isMiles) R = 3959;
-                      var x1 = lat2 - lat1;
-                      var dLat = toRad(x1);
-                      var x2 = lon2 - lon1;
-                      var dLon = toRad(x2);
-                      var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-                              Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
-                              Math.sin(dLon / 2) * Math.sin(dLon / 2);
-                      var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-                      var d = R * c;
-                      return d;
-                    }`,
-                    args: ["$$spot.location.coordinates", location.coordinates, false],
-                    lang: "js"
-                  }
-                }
-              }
-            ]
-          }
-        }
-      }
-    }
-  },
-  {
-    $addFields: {
-      distance: { $min: "$spots.distance" },
-      distanceExist: {
-        $cond: {
-          if: { $eq: [{ $type: "$distance" }, "double"] },
-          then: true,
-          else: false
-        }
-      }
-    }
-  }
-];
-const getPriceConditions = (prices, priceMin, priceMax) => {
-  if (priceMin && priceMin.trim() !== "" || priceMax && priceMax.trim() !== "") {
-    const min = priceMin && priceMin.trim() !== "" ? priceMin : "0";
-    const max = priceMax && priceMax.trim() !== "" ? priceMax : "999999";
-    prices = `${min}-${max}`;
-  }
-  if (!prices) return [];
-  const priceRanges = prices.split(",");
-  const priceConditions = priceRanges.map((priceRange) => {
-    if (priceRange.startsWith("<")) return { "products.price": { $lt: parseInt(priceRange.slice(1)) } };
-    if (priceRange.startsWith(">")) return { "products.price": { $gt: parseInt(priceRange.slice(1)) } };
-    const [min, max] = priceRange.split("-").map(Number);
-    return { "products.price": { $gte: min, $lte: max } };
-  });
-  return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
-};
-const getContainConditions = (contain) => {
-  if (!contain) return [];
-  const conditions = contain.map((property) => ({
-    [property]: { $exists: true, $not: { $size: 0 } }
-  }));
-  return conditions.length > 0 ? [{ $match: { $and: conditions } }] : [];
-};
-const getBasicMatchConditions = (query) => [
-  ...query._id ? [{ _id: new ObjectId(query._id) }] : [],
-  ...query.owner ? [{ owner: new ObjectId(query.owner) }] : [],
-  ...query.types ? [{ types: { $in: query.types } }] : [],
-  ...query.member ? [
-    {
-      memberships: {
-        $elemMatch: {
-          user: new ObjectId(query.member),
-          role: "member"
-        }
-      }
-    }
-  ] : [],
-  ...query.subscriber ? [
-    {
-      memberships: {
-        $elemMatch: {
-          user: new ObjectId(query.subscriber),
-          role: "subscriber"
-        }
-      }
-    }
-  ] : [],
-  ...query.categories?.split(",").length > 0 ? [{ "products.category": { $in: query.categories?.split(",") } }] : [],
-  ...query.delivery?.split(",").length > 0 ? [{ "spots.delivery": { $all: query.delivery?.split(",") } }] : []
-];
-const getPostableConditions = (postableId) => {
-  if (!postableId) return [];
-  return [
-    {
-      $match: {
-        $or: [
-          { owner: new ObjectId(postableId) },
-          {
-            $and: [
-              { types: { $elemMatch: { $eq: "public" } } },
-              {
-                memberships: {
-                  $elemMatch: {
-                    user: new ObjectId(postableId)
-                  }
-                }
-              }
-            ]
-          },
-          {
-            $and: [
-              { types: { $elemMatch: { $in: ["exclusive", "hidden"] } } },
-              {
-                memberships: {
-                  $elemMatch: {
-                    user: new ObjectId(postableId),
-                    role: { $ne: "subscriber" }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  ];
-};
 const controllerFactory = (db) => {
   const Organization = db.organization;
   const Department = db.department;

package/dist/products.server.js

@@ -1,4 +1,5 @@
-import { L as LoggerNamespaced, C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
+import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
 import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
 import OpenAI from "openai";
 import { Types } from "mongoose";
@@ -9,8 +10,8 @@ import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareFactory } from "./authJwt-J1csaMWA.js";
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
 import { a as Validator, V as Verifier } from "./core.verifier-gPPX_jhf.js";
-import { C as CRUD } from "./crud-DFFgLl09.js";
-import { A as ABAC } from "./abac-DC2x92Pa.js";
+import { C as CRUD } from "./crud-C7FSTUes.js";
+import { A as ABAC } from "./abac-DYoheWuc.js";
 const controllerFactory$1 = (db) => {
   const Category = db.category;
   const logger = new LoggerNamespaced(db);

package/dist/queryProcessorOrganizations-BB11WFpc.js

@@ -0,0 +1,221 @@
+import * as googleMapsServicesJs from "@googlemaps/google-maps-services-js";
+import { Types } from "mongoose";
+const ObjectId = { Types }.Types.ObjectId;
+const { Client } = googleMapsServicesJs;
+const client = new Client({});
+const getRequestedLookups = (query) => query.lookup ? Array.isArray(query.lookup) ? query.lookup : [query.lookup] : [];
+const getLookupStages = (requestedLookups, configs) => {
+  if (!requestedLookups) return [];
+  const lookupsArray = Array.isArray(requestedLookups) ? requestedLookups : requestedLookups.split(",");
+  return lookupsArray.map((lookup) => configs[lookup]).filter(Boolean).flatMap((config) => [
+    { $lookup: config.lookup },
+    // Оберните lookup в объект с $lookup
+    ...config.additionalStages || []
+  ]);
+};
+const getLocationStages = async (query) => {
+  if (!hasLocationParams(query)) {
+    return { stages: [], userLocation: null };
+  }
+  const location = await resolveLocation(query);
+  const radius = getRadius(query);
+  const geoStages = radius ? [
+    {
+      $match: {
+        "spots.location.coordinates": {
+          $geoWithin: {
+            $centerSphere: [[location.coordinates[0], location.coordinates[1]], radius]
+          }
+        }
+      }
+    }
+  ] : [];
+  return {
+    stages: [...geoStages, ...getDistanceStages(location)],
+    userLocation: location
+  };
+};
+const getRadius = (query) => {
+  if (query.locationRadius) return parseFloat(query.locationRadius) / 6378.1;
+  if (query.city) return 25 / 6378.1;
+  if (query.state) return 50 / 6378.1;
+  return null;
+};
+const hasLocationParams = (query) => query.location || query.address || query.city || query.state || query.country;
+const resolveLocation = async (query) => {
+  if (query.location) {
+    const parsedLocation = typeof query.location === "string" ? JSON.parse(query.location) : query.location;
+    const coordinates = parsedLocation.lng ? [parsedLocation.lng, parsedLocation.lat] : parsedLocation.coordinates;
+    return { coordinates: coordinates.map((coord) => parseFloat(coord)) };
+  }
+  const searchString = [query.address, query.city, query.state, query.country].filter(Boolean).join(", ");
+  try {
+    const geoResponse = await client.geocode({
+      params: {
+        address: searchString,
+        key: process.env.GOOGLE_MAPS_API_KEY
+      }
+    });
+    if (!geoResponse.data.results?.length) {
+      throw new Error("Unable to geocode the provided location.");
+    }
+    const { lng, lat } = geoResponse.data.results[0].geometry.location;
+    return { coordinates: [lng, lat] };
+  } catch (err) {
+    throw new Error("Error occurred while geocoding.");
+  }
+};
+const getDistanceStages = (location) => [
+  {
+    $addFields: {
+      spots: {
+        $map: {
+          input: "$spots",
+          as: "spot",
+          in: {
+            $mergeObjects: [
+              "$$spot",
+              {
+                distance: {
+                  $function: {
+                    body: `function(spotCoords, userCoords, isMiles) {
+                      function toRad(x) {
+                        return x * Math.PI / 180;
+                      }
+                      var lon1 = spotCoords[0];
+                      var lat1 = spotCoords[1];
+                      var lon2 = userCoords[0];
+                      var lat2 = userCoords[1];
+                      var R = 6371;
+                      if (isMiles) R = 3959;
+                      var x1 = lat2 - lat1;
+                      var dLat = toRad(x1);
+                      var x2 = lon2 - lon1;
+                      var dLon = toRad(x2);
+                      var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                              Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
+                              Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                      var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+                      var d = R * c;
+                      return d;
+                    }`,
+                    args: ["$$spot.location.coordinates", location.coordinates, false],
+                    lang: "js"
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  {
+    $addFields: {
+      distance: { $min: "$spots.distance" },
+      distanceExist: {
+        $cond: {
+          if: { $eq: [{ $type: "$distance" }, "double"] },
+          then: true,
+          else: false
+        }
+      }
+    }
+  }
+];
+const getPriceConditions = (prices, priceMin, priceMax) => {
+  if (priceMin && priceMin.trim() !== "" || priceMax && priceMax.trim() !== "") {
+    const min = priceMin && priceMin.trim() !== "" ? priceMin : "0";
+    const max = priceMax && priceMax.trim() !== "" ? priceMax : "999999";
+    prices = `${min}-${max}`;
+  }
+  if (!prices) return [];
+  const priceRanges = prices.split(",");
+  const priceConditions = priceRanges.map((priceRange) => {
+    if (priceRange.startsWith("<")) return { "products.price": { $lt: parseInt(priceRange.slice(1)) } };
+    if (priceRange.startsWith(">")) return { "products.price": { $gt: parseInt(priceRange.slice(1)) } };
+    const [min, max] = priceRange.split("-").map(Number);
+    return { "products.price": { $gte: min, $lte: max } };
+  });
+  return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+};
+const getContainConditions = (contain) => {
+  if (!contain) return [];
+  const conditions = contain.map((property) => ({
+    [property]: { $exists: true, $not: { $size: 0 } }
+  }));
+  return conditions.length > 0 ? [{ $match: { $and: conditions } }] : [];
+};
+const getBasicMatchConditions = (query) => [
+  ...query._id ? [{ _id: new ObjectId(query._id) }] : [],
+  ...query.owner ? [{ owner: new ObjectId(query.owner) }] : [],
+  ...query.types ? [{ types: { $in: query.types } }] : [],
+  ...query.member ? [
+    {
+      memberships: {
+        $elemMatch: {
+          user: new ObjectId(query.member),
+          role: "member"
+        }
+      }
+    }
+  ] : [],
+  ...query.subscriber ? [
+    {
+      memberships: {
+        $elemMatch: {
+          user: new ObjectId(query.subscriber),
+          role: "subscriber"
+        }
+      }
+    }
+  ] : [],
+  ...query.categories?.split(",").length > 0 ? [{ "products.category": { $in: query.categories?.split(",") } }] : [],
+  ...query.delivery?.split(",").length > 0 ? [{ "spots.delivery": { $all: query.delivery?.split(",") } }] : []
+];
+const getPostableConditions = (postableId) => {
+  if (!postableId) return [];
+  return [
+    {
+      $match: {
+        $or: [
+          { owner: new ObjectId(postableId) },
+          {
+            $and: [
+              { types: { $elemMatch: { $eq: "public" } } },
+              {
+                memberships: {
+                  $elemMatch: {
+                    user: new ObjectId(postableId)
+                  }
+                }
+              }
+            ]
+          },
+          {
+            $and: [
+              { types: { $elemMatch: { $in: ["exclusive", "hidden"] } } },
+              {
+                memberships: {
+                  $elemMatch: {
+                    user: new ObjectId(postableId),
+                    role: { $ne: "subscriber" }
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ];
+};
+export {
+  getBasicMatchConditions as a,
+  getLookupStages as b,
+  getPostableConditions as c,
+  getContainConditions as d,
+  getPriceConditions as e,
+  getLocationStages as f,
+  getRequestedLookups as g
+};

package/dist/rents.server.js

@@ -1,6 +1,7 @@
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
 import { c as coreabac } from "./core.abac-DUPBnlk6.js";
-import { L as LoggerNamespaced, C as CacheNamespaced } from "./core.logger-VRHh-WUW.js";
+import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
+import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
 import { V as Verifier, a as Validator } from "./core.verifier-gPPX_jhf.js";
 import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
 const queryValidatorConfig = {

package/dist/{web-Cq5tyhkl.js → web-cNKIl_cL.js}

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.562",
+  "version": "0.2.564",
   "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/modules/core/views/components/sections/filters/FiltersGroup.vue

@@ -166,11 +166,10 @@ const resetFilters = () => {
     } else {
       workingValues[filter.value] = null
     }
-  })
 
-  if (props.immediate) {
-    applyFilters()
-  }
+    // Удаляем ключ из selected
+    delete selected.value[filter.value]
+  })
 }
 </script>
 

package/src/modules/landing/components/sections/SectionFeatures.vue

@@ -1,6 +1,6 @@
 <template>
   <section id="howtobuy">
-    <h2 class="w-100 w-max-50r mn-b-small" v-html="t('title')"/>
+    <h2 class="w-100 w-max-50r mn-l-auto mn-r-auto mn-b-small" v-html="t('title')"/>
    
     <div class="cols-3 mobile:cols-1 gap-thin">
       <div