@ozdao/martyrs 0.2.562 → 0.2.564

package/src/modules/marketplace/marketplace.client.js

@@ -1,19 +1,16 @@
 // Router
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
-import { getRoutes } from './marketplace.router.js';
+import { getRoutes } from './views/router/marketplace.router.js';
 
 //Store
 import * as storeMarketplace from './views/store/marketplace.js';
 
-// Layouts
-import Marketplace from './views/components/layouts/Marketplace.vue';
+// Pages
+import Marketplace from './views/components/pages/Marketplace.vue';
 
 // Sections
 import SectionMenu from './views/components/sections/SectionMenu.vue';
 
-// Pages
-import Catalog from './views/components/pages/Catalog.vue';
-
 // Пример функции инициализации для модуля маркетплейса
 function initializeMarketplace(app, store, router, options = {}) {
   const routes = getRoutes(options);
@@ -39,8 +36,6 @@ const ModuleMarketplace = {
       // Sections
       SectionMenu,
       // Pages
-      Catalog,
-      // Layouts
       Marketplace,
     },
   },
@@ -49,8 +44,6 @@ const ModuleMarketplace = {
 export {
   // Elements
   // Pages
-  Catalog,
-  // Layouts
   Marketplace,
   // Blocks
   // Sections

package/src/modules/marketplace/views/components/{layouts → pages}/Marketplace.vue

@@ -23,7 +23,7 @@
       <div class="o-y-scroll br-r br-solid br-light pd-medium z-index-2 desktop-only h-100 pos-relative">
         <div class="w-100 o-y-scroll h-100">
           <!-- Location Filter -->
-          <div class="mn-b-medium">
+          <div v-if="!route.params.country && !route.params.state && !route.params.city" class="mn-b-medium">
             <h4 class="mn-b-small">Location</h4>
             <Field
               v-model="searchLocation"
@@ -46,7 +46,7 @@
           <!-- Filters Group -->
           <FiltersGroup
             :filters="marketplace.state.filter.options"
-            v-model:selected="selectedFilters"
+            v-model:selected="marketplace.state.filter.selected"
             :immediate="true"
             :showHeader="false"
             :showApplyButton="false"
@@ -76,10 +76,10 @@
             location: localLocation?.location,
             lookup: ['products','spots'],
             contain: ['products'],
-            priceMin: selectedFilters.price?.min,
-            priceMax: selectedFilters.price?.max,
-            delivery: selectedFilters.delivery?.length > 0 ? selectedFilters.delivery.join(',') : undefined,
-            payment: selectedFilters.payment?.length > 0 ? selectedFilters.payment.join(',') : undefined
+            priceMin: marketplace.state.filter.selected.price?.min,
+            priceMax: marketplace.state.filter.selected.price?.max,
+            delivery: marketplace.state.filter.selected.delivery?.length > 0 ? marketplace.state.filter.selected.delivery.join(',') : undefined,
+            payment: marketplace.state.filter.selected.payment?.length > 0 ? marketplace.state.filter.selected.payment.join(',') : undefined
           }"
           v-slot="{
             items
@@ -89,7 +89,7 @@
           <div class="mn-b-thin mobile-only">
             <Filters
               v-model:filters="marketplace.state.filter.options"
-              v-model:selected="selectedFilters"
+              v-model:selected="marketplace.state.filter.selected"
               class=""
             />
           </div>
@@ -146,15 +146,6 @@
   // Location filter
   const searchLocation = ref('');
 
-  const selectedFilters = ref({
-    price: { min: null, max: null },
-    delivery: [],
-    payment: [],
-    availabilityDate: null,
-    rating: null
-  })
-
-
   if (route.params) {
     // Загружаем новые значения из параметров маршрута в состояние
     let newState = {

package/src/modules/marketplace/views/router/marketplace.router.js

@@ -1,50 +1,42 @@
-import layoutMarketplace from '../components/layouts/Marketplace.vue';
+function buildMarketplaceTree(options = {}) {
+  const marketplaceComponent = options.marketplaceComponent || (() => import(
+    /* webpackChunkName: 'marketplace-page' */
+    '../components/pages/Marketplace.vue'
+  ));
 
-const marketplace = [
-  {
-    path: 'marketplace',
-    name: 'Marketplace',
-    component: () => import(/* webpackChunkName: 'layoutMarketplace' */ '../components/layouts/Marketplace.vue'),
-    meta: {
-      title: {
-        en: 'Marketplace',
-        ru: 'Маркетплейс',
-      },
-    },
-  },
-  {
-    path: 'marketplace/:country',
-    name: 'MarketplaceCountry',
-    component: () => import(/* webpackChunkName: 'layoutMarketplace' */ '../components/layouts/Marketplace.vue'),
-    meta: {
-      title: {
-        en: 'Marketplace',
-        ru: 'Маркетплейс',
-      },
-    },
-  },
-  {
-    path: 'marketplace/:country/:state',
-    name: 'MarketplaceState',
-    component: () => import(/* webpackChunkName: 'layoutMarketplace' */ '../components/layouts/Marketplace.vue'),
-    meta: {
-      title: {
-        en: 'Marketplace',
-        ru: 'Маркетплейс',
+  const buildName = (suffix) => {
+    const prefix = options.routeNamePrefix || '';
+    return suffix ? `${prefix}${suffix}` : prefix || undefined;
+  };
+
+  return [
+    {
+      path: ':country?/:state?/:city?',
+      name: buildName('Marketplace') || 'Marketplace',
+      component: marketplaceComponent,
+      meta: {
+        title: {
+          en: 'Marketplace',
+          ru: 'Маркетплейс',
+        },
       },
     },
-  },
-  {
-    path: 'marketplace/:country/:state/:city',
-    name: 'MarketplaceCity',
-    component: () => import(/* webpackChunkName: 'layoutMarketplace' */ '../components/layouts/Marketplace.vue'),
-    meta: {
-      title: {
-        en: 'Marketplace',
-        ru: 'Маркетплейс',
-      },
+  ];
+}
+
+export function getRoutes(options = {}) {
+  const route = options.route || 'Home';
+  const routes = [];
+
+  routes.push({
+    parentName: route,
+    config: {
+      basePath: options.basePath || 'marketplace',
+      routes: buildMarketplaceTree(options),
     },
-  },
-];
+  });
+
+  return routes;
+}
 
-export default marketplace;
+export default { getRoutes };

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

@@ -58,22 +58,6 @@ const state = reactive({
           { 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' }
-        ]
-      },
     ],
   },
   sort: {

package/dist/martyrs/src/modules/marketplace/marketplace.router.js

@@ -1,63 +0,0 @@
-function buildMarketplaceTree(options = {}) {
-  const layoutComponent = options.layoutComponent || (() => import(
-    /* webpackChunkName: 'marketplace-layout' */
-    "./views/components/layouts/Marketplace.vue.js"
-  ));
-  const catalogComponent = options.catalogComponent || (() => import(
-    /* webpackChunkName: 'marketplace-catalog' */
-    "./views/components/pages/Catalog.vue.js"
-  ));
-  const buildName = (suffix) => {
-    const prefix = options.routeNamePrefix || "";
-    return suffix ? `${prefix}${suffix}` : prefix || void 0;
-  };
-  return [
-    {
-      path: "",
-      name: buildName("Marketplace") || "Marketplace",
-      component: layoutComponent,
-      meta: {
-        title: {
-          en: "Marketplace",
-          ru: "Маркетплейс"
-        }
-      },
-      children: [
-        {
-          path: ":country?",
-          component: catalogComponent,
-          children: [
-            {
-              path: ":state?",
-              name: buildName("State") || "State",
-              component: catalogComponent,
-              children: [
-                {
-                  path: ":city?",
-                  name: buildName("City") || "City",
-                  component: catalogComponent
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  ];
-}
-function getRoutes(options = {}) {
-  const route = options.route || "Home";
-  const routes = [];
-  routes.push({
-    parentName: route,
-    config: {
-      basePath: options.basePath || "marketplace",
-      routes: buildMarketplaceTree(options)
-    }
-  });
-  return routes;
-}
-export {
-  getRoutes
-};
-//# sourceMappingURL=marketplace.router.js.map

package/dist/martyrs/src/modules/marketplace/marketplace.router.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"marketplace.router.js","sources":["../../../../../src/modules/marketplace/marketplace.router.js"],"sourcesContent":["function buildMarketplaceTree(options = {}) {\n  const layoutComponent = options.layoutComponent || (() => import(\n    /* webpackChunkName: 'marketplace-layout' */\n    './views/components/layouts/Marketplace.vue'\n  ));\n  const catalogComponent = options.catalogComponent || (() => import(\n    /* webpackChunkName: 'marketplace-catalog' */\n    './views/components/pages/Catalog.vue'\n  ));\n\n  const buildName = (suffix) => {\n    const prefix = options.routeNamePrefix || '';\n    return suffix ? `${prefix}${suffix}` : prefix || undefined;\n  };\n\n  return [\n    {\n      path: '',\n      name: buildName('Marketplace') || 'Marketplace',\n      component: layoutComponent,\n      meta: {\n        title: {\n          en: 'Marketplace',\n          ru: 'Маркетплейс',\n        },\n      },\n      children: [\n        {\n          path: ':country?',\n          component: catalogComponent,\n          children: [\n            {\n              path: ':state?',\n              name: buildName('State') || 'State',\n              component: catalogComponent,\n              children: [\n                {\n                  path: ':city?',\n                  name: buildName('City') || 'City',\n                  component: catalogComponent,\n                },\n              ],\n            },\n          ],\n        },\n      ],\n    },\n  ];\n}\n\nexport function getRoutes(options = {}) {\n  const route = options.route || 'Home';\n  const routes = [];\n\n  routes.push({\n    parentName: route,\n    config: {\n      basePath: options.basePath || 'marketplace',\n      routes: buildMarketplaceTree(options),\n    },\n  });\n\n  return routes;\n}\n\nexport default { getRoutes };\n"],"names":[],"mappings":"AAAA,SAAS,qBAAqB,UAAU,IAAI;AAC1C,QAAM,kBAAkB,QAAQ,oBAAoB,MAAM;AAAA;AAAA,IAExD;AAAA,EACJ;AACE,QAAM,mBAAmB,QAAQ,qBAAqB,MAAM;AAAA;AAAA,IAE1D;AAAA,EACJ;AAEE,QAAM,YAAY,CAAC,WAAW;AAC5B,UAAM,SAAS,QAAQ,mBAAmB;AAC1C,WAAO,SAAS,GAAG,MAAM,GAAG,MAAM,KAAK,UAAU;AAAA,EACnD;AAEA,SAAO;AAAA,IACL;AAAA,MACE,MAAM;AAAA,MACN,MAAM,UAAU,aAAa,KAAK;AAAA,MAClC,WAAW;AAAA,MACX,MAAM;AAAA,QACJ,OAAO;AAAA,UACL,IAAI;AAAA,UACJ,IAAI;AAAA,QACd;AAAA,MACA;AAAA,MACM,UAAU;AAAA,QACR;AAAA,UACE,MAAM;AAAA,UACN,WAAW;AAAA,UACX,UAAU;AAAA,YACR;AAAA,cACE,MAAM;AAAA,cACN,MAAM,UAAU,OAAO,KAAK;AAAA,cAC5B,WAAW;AAAA,cACX,UAAU;AAAA,gBACR;AAAA,kBACE,MAAM;AAAA,kBACN,MAAM,UAAU,MAAM,KAAK;AAAA,kBAC3B,WAAW;AAAA,gBAC7B;AAAA,cACA;AAAA,YACA;AAAA,UACA;AAAA,QACA;AAAA,MACA;AAAA,IACA;AAAA,EACA;AACA;AAEO,SAAS,UAAU,UAAU,IAAI;AACtC,QAAM,QAAQ,QAAQ,SAAS;AAC/B,QAAM,SAAS,CAAA;AAEf,SAAO,KAAK;AAAA,IACV,YAAY;AAAA,IACZ,QAAQ;AAAA,MACN,UAAU,QAAQ,YAAY;AAAA,MAC9B,QAAQ,qBAAqB,OAAO;AAAA,IAC1C;AAAA,EACA,CAAG;AAED,SAAO;AACT;"}

package/dist/martyrs/src/modules/marketplace/views/components/layouts/Marketplace.vue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Marketplace.vue.js","sources":["../../../../../../../../src/modules/marketplace/views/components/layouts/Marketplace.vue"],"sourcesContent":["<template>\n  <div class=\"pos-relative\">\n    <header class=\"pd-medium mn-b-thin\">\n      <h2 class=\"\">\n        <span class=\"\">Weed Deliveries in </span>\n\n        <span\n          v-if=\"localPosition.city || localPosition.state || localPosition.country\"\n          @click=\"a => { store.core.state.isOpenLocationPopup = true }\"\n          class=\"t-main t-semi cursor-pointer \"\n        >\n          <template v-if=\"localPosition.city\">{{localPosition.city}}, </template>\n          <template v-if=\"localPosition.state\">{{localPosition.state}}, </template>\n          <template v-if=\"localPosition.country\">{{localPosition.country}}</template>\n        </span>\n\n        <span v-else @click=\"a => { store.core.state.isOpenLocationPopup = true }\"  class=\"t-main t-semi cursor-pointer\">The World</span>\n      </h2>\n    </header>\n\n    <div class=\"cols-2-1_3 br-1px br-solid br-light z-index-3 pos-relative\">\n\n      <div class=\"o-y-scroll br-r br-solid br-light pd-medium z-index-2 desktop-only h-100 pos-relative\">\n        <div class=\"w-100 o-y-scroll h-100\">\n          <!-- Location Filter -->\n          <div class=\"mn-b-medium\">\n            <h4 class=\"mn-b-small\">Location</h4>\n            <Field\n              v-model=\"searchLocation\"\n              placeholder=\"Search location...\"\n              type=\"text\"\n              class=\"w-100 bg-light pd-small radius-small mn-b-small\"\n            />\n            <div class=\"gap-micro\">\n              <div\n                v-for=\"location in marketplace.state.locationOptions\"\n                :key=\"location.label\"\n                @click=\"router.push(location.path)\"\n                class=\"cursor-pointer hover-t-underline mn-b-regular transition-all\"\n              >\n                {{ location.label }}\n              </div>\n            </div>\n          </div>\n\n          <!-- Filters Group -->\n          <FiltersGroup\n            :filters=\"marketplace.state.filter.options\"\n            v-model:selected=\"selectedFilters\"\n            :immediate=\"true\"\n            :showHeader=\"false\"\n            :showApplyButton=\"false\"\n            :showResetButton=\"true\"\n          />\n        </div>\n      </div>\n\n      <div class=\"w-100 rows-1 pd-thin pos-relative o-hidden\">\n        <Feed\n          :search=\"true\"\n          v-model:sort=\"marketplace.state.sort\"\n          :showLoadMore=\"false\"\n          :states=\"{\n            empty: {\n              title: 'No Shops Found',\n              description: 'Currently, there are no shops.'\n            }\n          }\"\n          :store=\"{\n            read: (options) => marketplaceStore.readCatalog(options)\n          }\"\n          :options=\"{\n            country: localPosition.country,\n            state: localPosition.state,\n            city: localPosition.city,\n            location: localLocation?.location,\n            lookup: ['products','spots'],\n            contain: ['products'],\n            priceMin: selectedFilters.price?.min,\n            priceMax: selectedFilters.price?.max,\n            delivery: selectedFilters.delivery?.length > 0 ? selectedFilters.delivery.join(',') : undefined,\n            payment: selectedFilters.payment?.length > 0 ? selectedFilters.payment.join(',') : undefined\n          }\"\n          v-slot=\"{\n            items\n          }\"\n          class=\"rows-1 gap-thin\"\n        >\n          <div class=\"mn-b-thin mobile-only\">\n            <Filters\n              v-model:filters=\"marketplace.state.filter.options\"\n              v-model:selected=\"selectedFilters\"\n              class=\"\"\n            />\n          </div>\n\n          <CardOrganization\n            v-for=\"organization in items\"\n            :key=\"organization._id\"\n            :organization=\"organization\"\n            :showRating=\"true\"\n            :showFollowers=\"false\"\n            :showProducts=\"true\"\n            class=\"bg-light w-100 o-hidden radius-medium pd-small \"\n          />\n        </Feed>\n\n      </div>\n    </div>\n  </div>\n\n</template>\n\n\n<script setup=\"props\">\n  // Import libs\n  import { onMounted, watch, ref } from 'vue'\n  import { useRoute, useRouter } from 'vue-router'\n  import { useI18n } from 'vue-i18n'\n\n  import Feed from '@martyrs/src/components/Feed/Feed.vue'\n  import Filters  from '@martyrs/src/modules/core/views/components/sections/Filters.vue'\n  import FiltersGroup from '@martyrs/src/modules/core/views/components/sections/filters/FiltersGroup.vue'\n  import Field from \"@martyrs/src/components/Field/Field.vue\"\n\n  import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'\n\n  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'\n  import * as organization from '@martyrs/src/modules/organizations/store/organizations.js'\n  import * as marketplace from '../../store/marketplace'\n  import marketplaceStore from '../../store/marketplace'\n  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'\n\n  const route = useRoute()\n  const router = useRouter()\n  const store = useStore()\n  const { returnCurrency } = useGlobalMixins()\n\n  const localPosition = ref({\n    city: null,\n    state: null,\n    country: null\n  });\n\n  const localLocation = ref(null);\n  // Location filter\n  const searchLocation = ref('');\n\n  const selectedFilters = ref({\n    price: { min: null, max: null },\n    delivery: [],\n    payment: [],\n    availabilityDate: null,\n    rating: null\n  })\n\n\n  if (route.params) {\n    // Загружаем новые значения из параметров маршрута в состояние\n    let newState = {\n      country: denormalizeUrlParam(route.params.country),\n      state: denormalizeUrlParam(route.params.state),\n      city: denormalizeUrlParam(route.params.city),\n    };\n\n\t  // Обновляем глобальное состояние\n\t  localPosition.value = newState;\n\t}\n\n\tif (route.query) {\n\t \tconst query = route.query;\n\n\t\tmarketplace.state.filter.selected.categories = query.categories ? query.categories.split(',') : [];\n\t\tmarketplace.state.filter.selected.prices = query.prices ? query.prices.split(',') : [];\n\t\tmarketplace.state.filter.selected.delivery = query.delivery ? query.delivery.split(',') : [];\n\t}\n\n\tif (route.query.sortParam) marketplace.state.sort.param = route.query.sortParam\n\tif (route.query.sortOrder) marketplace.state.sort.order = route.query.sortOrder\n\n  function denormalizeUrlParam(param) {\n    return param\n      .replace(/-/g, ' ')\n      .replace(/\\b\\w/g, l => l.toUpperCase());\n  }\n\n  function normalizeUrlParam(param) {\n    return param\n      .toLowerCase()\n      .replace(/ /g, '-')\n      .replace(/[^a-z0-9-]/g, '');\n  }\n\n\twatch(() => marketplace.state.sort, (newSortValue, oldSortValue) => {\n\t\tlet query = { ...route.query}\n\t\t\n\t\tquery.sortParam = newSortValue.param\n\t\tquery.sortOrder = newSortValue.order\n\t  \n\t  // replace the current route\n\t  router.replace({ query });\n\t}, { deep: true });\n\n\n\twatch(() => marketplace.state.filter.selectedFilters, (newFilterValue, oldFilterValue) => {\n\t  // Переводим фильтр в формат query\n\t  const query = { ...route.query };\n\n\t  // Удаляем старые значения фильтра из query\n\t  Object.keys(oldFilterValue).forEach(key => {\n\t    if (query[key]) {\n\t      delete query[key];\n\t    }\n\t  });\n\n\t  // Добавляем новые значения фильтра в query\n\t  const newQueryValues = Object.fromEntries(\n\t    Object.entries(newFilterValue)\n\t      .filter(([key, value]) => Array.isArray(value) && value.length > 0)\n\t      .map(([key, value]) => [key, value.join(',')])\n\t  );\n\n\t  delete query.options;\n\t  Object.assign(query, newQueryValues);\n\n\t  // Обновляем маршрут с новым query\n\t  router.replace({ query });\n\t}, { deep: true })\n\n\twatch(() => store.core.state.position, (newPosition) => {\n   // get the current route\n   const currentRoute = { ...router.currentRoute.value };\n\t  \n   // create new parameters based on globals state position\n   let newParams = {\n     country: normalizeUrlParam(newPosition.country),\n     state: normalizeUrlParam(newPosition.state),\n     city: normalizeUrlParam(newPosition.city),\n   };\n\n  let newState = {\n    country: denormalizeUrlParam(newPosition.country),\n    state: denormalizeUrlParam(newPosition.state),\n    city: denormalizeUrlParam(newPosition.city),\n  };\n  \n   // update route params\n   localPosition.value = newState;\n   currentRoute.params = newParams;\n\n  \n   // replace the current route\n   router.replace(currentRoute);\n\t}, { deep: true });\n\n  const text = {\n    locale: 'en',\n    messages: {\n      en: {\n        meta: {\n          title: \"Marketplace – Shop Our Wide Selection of Quality Weed for Delivery\",\n          description: \"Browse our marketplace of top-grade weed strains and choose from a variety of delivery options. Order now and have your favorite strains delivered straight to your door. Safe, fast, and reliable.\",\n        }\n      },\n      ru: {\n        meta: {\n          title: \"Маркетплейс – Выбирайте из нашего ассортимента качественной травки для доставки\",\n          description: \"Маркетплейс – Изучите наши продукты высокого качества и выбирайте из различных вариантов доставки. Закажите сейчас и получите свои любимые сорта на дом. Безопасно, быстро и надежно.\",\n        }\n      }\n    }\n  }\n\n  const { t } = useI18n(text)\n</script>\n\n<style lang=\"scss\">\n\n\n</style>\n\n\n"],"names":["marketplace.state"],"mappings":"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"}

package/dist/martyrs/src/modules/marketplace/views/components/pages/Catalog.vue.js

@@ -1,73 +0,0 @@
-import { onMounted, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList } from "vue";
-import { useRoute } from "vue-router";
-import _sfc_main$1 from "../../../../../components/Feed/Feed.vue.js";
-import { useStore } from "../../../../core/views/store/core.store.js";
-import _sfc_main$2 from "../../../../organizations/components/blocks/CardOrganization.vue.js";
-import { state, marketplaceStore } from "../../store/marketplace.js";
-const _sfc_main = {
-  __name: "Catalog",
-  setup(__props) {
-    const store = useStore();
-    const route = useRoute();
-    onMounted(() => {
-      if (typeof gtag === "function") {
-        gtag("event", "view_marketplace", {
-          location: store.core.state.position?.location || "unknown",
-          page_path: window.location.pathname,
-          marketplace_id: route.params.id || "main"
-        });
-      }
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createBlock(_sfc_main$1, {
-        sort: state.sort,
-        "onUpdate:sort": _cache[0] || (_cache[0] = ($event) => state.sort = $event),
-        filter: state.filter,
-        "onUpdate:filter": _cache[1] || (_cache[1] = ($event) => state.filter = $event),
-        search: true,
-        showLoadMore: false,
-        states: {
-          empty: {
-            title: "No Shops Found",
-            description: "Currently, there are no shops."
-          }
-        },
-        store: {
-          read: (options) => unref(marketplaceStore).readCatalog(options)
-        },
-        options: {
-          country: unref(route).params.country,
-          state: unref(route).params.state,
-          city: unref(route).params.city,
-          categories: unref(route).query.categories,
-          prices: unref(route).query.prices,
-          delivery: unref(route).query.delivery,
-          location: unref(store).core.state.position?.location,
-          lookup: ["products", "spots"],
-          contain: ["products"]
-        },
-        class: "rows-1 gap-thin"
-      }, {
-        default: withCtx(({
-          items
-        }) => [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(items, (organization) => {
-            return openBlock(), createBlock(_sfc_main$2, {
-              key: organization._id,
-              organization,
-              showRating: true,
-              showFollowers: false,
-              showProducts: true,
-              class: "bg-light w-100 o-hidden radius-medium pd-small"
-            }, null, 8, ["organization"]);
-          }), 128))
-        ]),
-        _: 1
-      }, 8, ["sort", "filter", "store", "options"]);
-    };
-  }
-};
-export {
-  _sfc_main as default
-};
-//# sourceMappingURL=Catalog.vue.js.map

package/dist/martyrs/src/modules/marketplace/views/components/pages/Catalog.vue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Catalog.vue.js","sources":["../../../../../../../../src/modules/marketplace/views/components/pages/Catalog.vue"],"sourcesContent":["<template>\n\t<Feed\n\t\tv-model:sort=\"marketplace.state.sort\"\n\t\tv-model:filter=\"marketplace.state.filter\"\n    :search=\"true\"\n    :showLoadMore=\"false\"\n    :states=\"{\n      empty: {\n        title: 'No Shops Found',\n        description: 'Currently, there are no shops.'\n      },\n    }\"\n    :store=\"{\n      read: (options) => marketplaceStore.readCatalog(options)\n    }\"\n    :options=\"{\n      country: route.params.country,\n\t    state: route.params.state,\n\t    city: route.params.city,\n\t    categories: route.query.categories,\n\t    prices: route.query.prices,\n\t    delivery: route.query.delivery,\n\t    location: store.core.state.position?.location,\n\t    lookup: ['products','spots'],\n\t    contain: ['products'],\n    }\"\n    v-slot=\"{ \n      items \n    }\"\n    class=\"rows-1 gap-thin\"\n  >\n    <CardOrganization \n\t    v-for=\"organization in items\" \n\t    :key=\"organization._id\"\n\t    :organization=\"organization\"\n\t    :showRating=\"true\"\n\t    :showFollowers=\"false\"\n\t    :showProducts=\"true\"\n\t    class=\"bg-light w-100 o-hidden radius-medium pd-small \"\n\t  />\n  </Feed>\n</template>\n\n<script setup>\n\timport { computed,reactive,ref, onMounted,watch  } from 'vue'\n\timport { useRoute } from 'vue-router'\n\n\timport Feed from '@martyrs/src/components/Feed/Feed.vue'\n\t\n\timport * as organization from '@martyrs/src/modules/organizations/store/organizations.js'\n\timport { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'\n\tconst store = useStore()\n\n\timport CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'\n\n\timport * as marketplace from '../../store/marketplace';\n\timport marketplaceStore from '../../store/marketplace';\n\n\tconst route = useRoute()\n\n\tonMounted(() => {\n\t\t// Добавление Google Analytics event на открытие маркетплейса\n\t\tif (typeof gtag === 'function') {\n\t\t\tgtag('event', 'view_marketplace', {\n\t\t\t\tlocation: store.core.state.position?.location || 'unknown',\n\t\t\t\tpage_path: window.location.pathname,\n\t\t\t\tmarketplace_id: route.params.id || 'main',\n\t\t\t});\n\t\t}\n\t})\n</script>\n\n<style lang=\"scss\">\n</style>\n"],"names":[],"mappings":";;;;;;;;;AAmDC,UAAM,QAAQ,SAAQ;AAOtB,UAAM,QAAQ,SAAQ;AAEtB,cAAU,MAAM;AAEf,UAAI,OAAO,SAAS,YAAY;AAC/B,aAAK,SAAS,oBAAoB;AAAA,UACjC,UAAU,MAAM,KAAK,MAAM,UAAU,YAAY;AAAA,UACjD,WAAW,OAAO,SAAS;AAAA,UAC3B,gBAAgB,MAAM,OAAO,MAAM;AAAA,QACvC,CAAI;AAAA,MACF;AAAA,IACD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/src/modules/marketplace/marketplace.router.js

@@ -1,66 +0,0 @@
-function buildMarketplaceTree(options = {}) {
-  const layoutComponent = options.layoutComponent || (() => import(
-    /* webpackChunkName: 'marketplace-layout' */
-    './views/components/layouts/Marketplace.vue'
-  ));
-  const catalogComponent = options.catalogComponent || (() => import(
-    /* webpackChunkName: 'marketplace-catalog' */
-    './views/components/pages/Catalog.vue'
-  ));
-
-  const buildName = (suffix) => {
-    const prefix = options.routeNamePrefix || '';
-    return suffix ? `${prefix}${suffix}` : prefix || undefined;
-  };
-
-  return [
-    {
-      path: '',
-      name: buildName('Marketplace') || 'Marketplace',
-      component: layoutComponent,
-      meta: {
-        title: {
-          en: 'Marketplace',
-          ru: 'Маркетплейс',
-        },
-      },
-      children: [
-        {
-          path: ':country?',
-          component: catalogComponent,
-          children: [
-            {
-              path: ':state?',
-              name: buildName('State') || 'State',
-              component: catalogComponent,
-              children: [
-                {
-                  path: ':city?',
-                  name: buildName('City') || 'City',
-                  component: catalogComponent,
-                },
-              ],
-            },
-          ],
-        },
-      ],
-    },
-  ];
-}
-
-export function getRoutes(options = {}) {
-  const route = options.route || 'Home';
-  const routes = [];
-
-  routes.push({
-    parentName: route,
-    config: {
-      basePath: options.basePath || 'marketplace',
-      routes: buildMarketplaceTree(options),
-    },
-  });
-
-  return routes;
-}
-
-export default { getRoutes };

package/src/modules/marketplace/views/components/pages/Catalog.vue

@@ -1,74 +0,0 @@
-<template>
-	<Feed
-		v-model:sort="marketplace.state.sort"
-		v-model:filter="marketplace.state.filter"
-    :search="true"
-    :showLoadMore="false"
-    :states="{
-      empty: {
-        title: 'No Shops Found',
-        description: 'Currently, there are no shops.'
-      },
-    }"
-    :store="{
-      read: (options) => marketplaceStore.readCatalog(options)
-    }"
-    :options="{
-      country: route.params.country,
-	    state: route.params.state,
-	    city: route.params.city,
-	    categories: route.query.categories,
-	    prices: route.query.prices,
-	    delivery: route.query.delivery,
-	    location: store.core.state.position?.location,
-	    lookup: ['products','spots'],
-	    contain: ['products'],
-    }"
-    v-slot="{ 
-      items 
-    }"
-    class="rows-1 gap-thin"
-  >
-    <CardOrganization 
-	    v-for="organization in items" 
-	    :key="organization._id"
-	    :organization="organization"
-	    :showRating="true"
-	    :showFollowers="false"
-	    :showProducts="true"
-	    class="bg-light w-100 o-hidden radius-medium pd-small "
-	  />
-  </Feed>
-</template>
-
-<script setup>
-	import { computed,reactive,ref, onMounted,watch  } from 'vue'
-	import { useRoute } from 'vue-router'
-
-	import Feed from '@martyrs/src/components/Feed/Feed.vue'
-	
-	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js'
-	import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
-	const store = useStore()
-
-	import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'
-
-	import * as marketplace from '../../store/marketplace';
-	import marketplaceStore from '../../store/marketplace';
-
-	const route = useRoute()
-
-	onMounted(() => {
-		// Добавление Google Analytics event на открытие маркетплейса
-		if (typeof gtag === 'function') {
-			gtag('event', 'view_marketplace', {
-				location: store.core.state.position?.location || 'unknown',
-				page_path: window.location.pathname,
-				marketplace_id: route.params.id || 'main',
-			});
-		}
-	})
-</script>
-
-<style lang="scss">
-</style>