@ozdao/martyrs 0.2.564 → 0.2.566

package/src/modules/core/controllers/utils/queryProcessor.js

@@ -3,7 +3,7 @@ const ObjectId = { Types }.Types.ObjectId;
 
 function getBasicOptions(query) {
   console.log(query);
-  const { _id, url, status, notstatus, type, organization, owner, customer, creator, product } = query;
+  const { _id, url, status, notstatus, type, organization, owner, customer, creator, product, listing } = query;
   const stages = [];
   const conditions = [];
   if (_id) {
@@ -50,6 +50,9 @@ function getBasicOptions(query) {
   if (product) {
     conditions.push({ 'product': new ObjectId(product) });
   }
+  if (listing) {
+    conditions.push({ listing: listing });
+  }
 
   if (conditions.length > 0) {
     stages.push({ $match: { $and: conditions } });

package/src/modules/core/core.server.js

@@ -15,6 +15,7 @@ async function createWebSocketManager(...args) {
   return new _WebSocketManagerClass(...args);
 }
 
+
 // Для обратной совместимости экспортируем как WebSocketManager
 const WebSocketManager = createWebSocketManager;
 

package/src/modules/core/locales/en.js

@@ -25,5 +25,50 @@ export default {
       PREVIEW_GENERATION_ERROR: 'Error generating file previews.',
       IMAGE_CONVERSION_ERROR: 'Error converting image format.'
     }
+  },
+  footer: {
+    description: 'Get in touch with us',
+    phoneNumber: '+1 234 567 890',
+    emailAddress: "info{'@'}example.com",
+    hours_text: 'Mon-Fri: 9:00 AM - 6:00 PM',
+    app: 'Download our app',
+    subscribe: 'Subscribe to our newsletter',
+    subscribe_text: 'Stay updated with the latest news and updates',
+    follow: 'Follow us',
+    year: '2025',
+    heart: '♥',
+    copyright: 'All rights reserved',
+    ozdao: 'Made by OZ DAO',
+    navigationColumns: [
+      {
+        sections: [
+          {
+            title: 'Company',
+            items: [
+              { name: 'About', url: 'about' },
+              { name: 'Careers', url: 'careers' },
+              { name: 'Contact', url: 'contact' }
+            ]
+          }
+        ]
+      },
+      {
+        sections: [
+          {
+            title: 'Resources',
+            items: [
+              { name: 'Blog', url: 'blog' },
+              { name: 'Help Center', url: 'help' },
+              { name: 'Privacy', url: 'privacy' }
+            ]
+          }
+        ]
+      }
+    ],
+    socialLinks: [
+      { name: 'IconInstagram', url: 'https://instagram.com' },
+      { name: 'IconFacebook', url: 'https://facebook.com' },
+      { name: 'IconLinkedin', url: 'https://linkedin.com' }
+    ]
   }
 };

package/src/modules/core/locales/ru.js

@@ -17,5 +17,50 @@ export default {
       POST_URL_ALREADY_IN_USE: 'Ошибка! Публикация с этим URL уже используется!',
       NAME_CANNOT_BE_EMPTY: 'Ошибка: Название не может быть пустым. Пожалуйста, введите название.',
     }
+  },
+  footer: {
+    description: 'Свяжитесь с нами',
+    phoneNumber: '+1 234 567 890',
+    emailAddress: "info{'@'}example.com",
+    hours_text: 'Пн-Пт: 9:00 - 18:00',
+    app: 'Скачайте наше приложение',
+    subscribe: 'Подпишитесь на рассылку',
+    subscribe_text: 'Будьте в курсе последних новостей и обновлений',
+    follow: 'Подписывайтесь',
+    year: '2025',
+    heart: '♥',
+    copyright: 'Все права защищены',
+    ozdao: 'Сделано OZ DAO',
+    navigationColumns: [
+      {
+        sections: [
+          {
+            title: 'Компания',
+            items: [
+              { name: 'О нас', url: 'about' },
+              { name: 'Карьера', url: 'careers' },
+              { name: 'Контакты', url: 'contact' }
+            ]
+          }
+        ]
+      },
+      {
+        sections: [
+          {
+            title: 'Ресурсы',
+            items: [
+              { name: 'Блог', url: 'blog' },
+              { name: 'Помощь', url: 'help' },
+              { name: 'Конфиденциальность', url: 'privacy' }
+            ]
+          }
+        ]
+      }
+    ],
+    socialLinks: [
+      { name: 'IconInstagram', url: 'https://instagram.com' },
+      { name: 'IconFacebook', url: 'https://facebook.com' },
+      { name: 'IconLinkedin', url: 'https://linkedin.com' }
+    ]
   }
 };

package/src/modules/core/models/schemas/common.schema.js

@@ -2,7 +2,7 @@ export default (function applyCommonSchema(schema, db) {
   schema.add({
     status: {
       type: String,
-      enum: ['draft', 'published', 'featured', 'archived', 'removed'],
+      enum: ['draft', 'published', 'internal', 'archived', 'removed'],
       default: 'draft',
       required: true,
     },

package/src/modules/core/views/classes/i18n.manager.js

@@ -5,6 +5,11 @@ class I18nManager {
     this.moduleLocales = new Map();
     this.overrides = new Map();
     this.extensions = new Map();
+    this.i18nInstance = null;
+  }
+
+  setI18nInstance(i18n) {
+    this.i18nInstance = i18n;
   }
 
   register(moduleName, locales) {
@@ -12,6 +17,14 @@ class I18nManager {
       throw new TypeError('Invalid arguments for register()');
     }
     this.moduleLocales.set(moduleName, locales);
+
+    // Если i18n instance уже создан, добавляем переводы динамически
+    if (this.i18nInstance) {
+      Object.entries(locales).forEach(([locale, messages]) => {
+        this.i18nInstance.global.mergeLocaleMessage(locale, messages);
+      });
+    }
+
     return this;
   }
 

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

@@ -13,7 +13,7 @@
   	}"
 	>
 		<transition name="moveFromTop" appear>
-			<Loader v-if="!page || store.core.state.loading" class="pos-fixed"/>
+			<Loader v-if="!page || store.core.state.loading" :centered="true" class="pos-fixed"/>
 		</transition>
 
 	  <transition 

package/src/modules/core/views/components/sections/filters/FilterPrice.vue

@@ -0,0 +1,81 @@
+<!-- filters/FilterPrice.vue -->
+<template>
+  <div class="filter-price">
+    <div class="flex gap-thin align-center">
+      <Field
+        type="number"
+        v-model:field="localValue.min"
+        placeholder="Min"
+        class="flex-1 bg-light pd-medium radius-small"
+        @blur="updateValue"
+      />
+      <span class="t-small">—</span>
+      <Field
+        type="number"
+        v-model:field="localValue.max"
+        placeholder="Max"
+        class="flex-1 bg-light pd-medium radius-small"
+        @blur="updateValue"
+      />
+    </div>
+    
+    <div v-if="config?.presets" class="mt-thin">
+      <button
+        v-for="preset in config.presets"
+        :key="preset.label"
+        @click="applyPreset(preset)"
+        class="btn btn-small mr-thin mb-thin"
+        :class="isPresetActive(preset) ? 'btn-primary' : 'btn-secondary'"
+      >
+        {{ preset.label }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+import Field from '@martyrs/src/components/Field/Field.vue';
+
+const props = defineProps({
+  config: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const model = defineModel({
+  type: Object,
+  default: () => ({ min: null, max: null })
+})
+
+const localValue = ref({ 
+  min: model.value?.min || null, 
+  max: model.value?.max || null 
+})
+
+watch(model, (val) => {
+  if (val) {
+    localValue.value = { 
+      min: val.min || null, 
+      max: val.max || null 
+    }
+  }
+}, { deep: true })
+
+const updateValue = () => {
+  model.value = { ...localValue.value }
+}
+
+const applyPreset = (preset) => {
+  localValue.value = { 
+    min: preset.min || null, 
+    max: preset.max || null 
+  }
+  updateValue()
+}
+
+const isPresetActive = (preset) => {
+  return localValue.value.min === preset.min && localValue.value.max === preset.max
+}
+</script>

package/src/modules/core/views/mixins/mixins.js

@@ -1,10 +1,9 @@
 import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
-import { inject } from 'vue';
 
 // useGlobalMixins.js
 export function useGlobalMixins() {
   const isModuleInstalled = (moduleName) => {
-    const store = inject('store');
+    const store = useStore();
     const options = store.core.state.options;
 
     if (options && typeof options === 'object') {

package/src/modules/core/views/router/addRoutes.js

@@ -52,7 +52,12 @@ function addRoutes(router, config) {
     if (emptyRootBehavior.type === 'redirect') {
       // Используем пользовательский redirectPath или первый дочерний маршрут
       const redirectTo = emptyRootBehavior.redirectPath || filteredRoutes[0].path;
-      finalChildren = [{ path: '', redirect: redirectTo, meta: { ...meta, isAutoRedirect: true } }, ...filteredRoutes];
+      finalChildren = [{
+        path: '',
+        redirect: redirectTo,
+        name: `${routeNamePrefix}${basePath.charAt(0).toUpperCase() + basePath.slice(1)}Root`,
+        meta: { ...meta, isAutoRedirect: true }
+      }, ...filteredRoutes];
     } else if (emptyRootBehavior.type === 'fallback') {
       finalChildren = [
         {

package/src/modules/events/events.client.js

@@ -14,6 +14,7 @@ import EditEvent from './components/pages/EditEvent.vue';
 import Event from './components/pages/Event.vue';
 import EventsPage from './components/pages/Events.vue';
 import FeaturedEvents from './components/sections/FeaturedEvents.vue';
+import EventsHot from './components/sections/EventsHot.vue';
 import Feed from './components/sections/Feed.vue';
 import List from './components/sections/List.vue';
 
@@ -44,6 +45,7 @@ const ModuleEvents = {
       Feed,
       List,
       FeaturedEvents,
+      EventsHot,
       // Layouts
       EventsLayout,
       // Pages
@@ -64,6 +66,7 @@ export {
   EventsLayout,
   EventsPage,
   FeaturedEvents,
+  EventsHot,
   Feed,
   initializeEvents,
   List,

package/src/modules/events/routes/events.routes.js

@@ -1,5 +1,5 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import controllerFactory from '../controllers/events.controller.js';
 import middlewareFactoryEvents from '../middlewares/server/index.js';
 // ABAC

package/src/modules/inventory/components/pages/InventoryEdit.vue

@@ -188,7 +188,7 @@
 
      <!--  :actions="[{
           component: IconEdit,
-          handler: () => core.actions.add(leftovers.state.current.positions, position),
+          handler: () => store.core.actions.add(leftovers.state.current.positions, position),
           class: 'bg-light'
         },{
           component: IconDelete,
@@ -254,7 +254,7 @@
 
   import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
-  const core = useStore();
+  const store = useStore();
   import * as inventory from '@martyrs/src/modules/inventory/store/inventory.store.js';
   import * as products from '@martyrs/src/modules/products/store/products.js';
   import * as spots from '@martyrs/src/modules/spots/store/spots.js';
@@ -334,7 +334,7 @@
       }
     };
     // Add position to inventory state
-    core.actions.add(inventory.state.current.positions, position);
+    store.core.actions.add(inventory.state.current.positions, position);
     closeVariantsPopup();
   }
 

package/src/modules/inventory/policies/inventory.policies.js

@@ -1,4 +1,4 @@
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 
 const { getInstance } = coreabac;
 

package/src/modules/inventory/routes/inventory.routes.js

@@ -1,5 +1,5 @@
 import jwtFactory from '@martyrs/src/modules/auth/controllers/middlewares/authJwt.js';
-import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import adjustmentServiceFactory from '../services/adjustment.service.js';
 import availabilityServiceFactory from '../services/availability.service.js';
 import auditServiceFactory from '../services/audit.service.js';

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

@@ -0,0 +1,66 @@
+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 };