@ozdao/martyrs 0.2.548 → 0.2.550

package/src/modules/icons/entities/IconSettings.vue

@@ -1,24 +1,9 @@
 <template>
-<svg height="800px" width="800px" version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512"  xml:space="preserve">
-	<path :fill="fill"  d="M502.325,307.303l-39.006-30.805c-6.215-4.908-9.665-12.429-9.668-20.348c0-0.084,0-0.168,0-0.252
-		c-0.014-7.936,3.44-15.478,9.667-20.396l39.007-30.806c8.933-7.055,12.093-19.185,7.737-29.701l-17.134-41.366
-		c-4.356-10.516-15.167-16.86-26.472-15.532l-49.366,5.8c-7.881,0.926-15.656-1.966-21.258-7.586
-		c-0.059-0.06-0.118-0.119-0.177-0.178c-5.597-5.602-8.476-13.36-7.552-21.225l5.799-49.363
-		c1.328-11.305-5.015-22.116-15.531-26.472L337.004,1.939c-10.516-4.356-22.646-1.196-29.701,7.736l-30.805,39.005
-		c-4.908,6.215-12.43,9.665-20.349,9.668c-0.084,0-0.168,0-0.252,0c-7.935,0.014-15.477-3.44-20.395-9.667L204.697,9.675
-		c-7.055-8.933-19.185-12.092-29.702-7.736L133.63,19.072c-10.516,4.356-16.86,15.167-15.532,26.473l5.799,49.366
-		c0.926,7.881-1.964,15.656-7.585,21.257c-0.059,0.059-0.118,0.118-0.178,0.178c-5.602,5.598-13.36,8.477-21.226,7.552
-		l-49.363-5.799c-11.305-1.328-22.116,5.015-26.472,15.531L1.939,174.996c-4.356,10.516-1.196,22.646,7.736,29.701l39.006,30.805
-		c6.215,4.908,9.665,12.429,9.668,20.348c0,0.084,0,0.167,0,0.251c0.014,7.935-3.44,15.477-9.667,20.395L9.675,307.303
-		c-8.933,7.055-12.092,19.185-7.736,29.701l17.134,41.365c4.356,10.516,15.168,16.86,26.472,15.532l49.366-5.799
-		c7.882-0.926,15.656,1.965,21.258,7.586c0.059,0.059,0.118,0.119,0.178,0.178c5.597,5.603,8.476,13.36,7.552,21.226l-5.799,49.364
-		c-1.328,11.305,5.015,22.116,15.532,26.472l41.366,17.134c10.516,4.356,22.646,1.196,29.701-7.736l30.804-39.005
-		c4.908-6.215,12.43-9.665,20.348-9.669c0.084,0,0.168,0,0.251,0c7.936-0.014,15.478,3.44,20.396,9.667l30.806,39.007
-		c7.055,8.933,19.185,12.093,29.701,7.736l41.366-17.134c10.516-4.356,16.86-15.168,15.532-26.472l-5.8-49.366
-		c-0.926-7.881,1.965-15.656,7.586-21.257c0.059-0.059,0.119-0.119,0.178-0.178c5.602-5.597,13.36-8.476,21.225-7.552l49.364,5.799
-		c11.305,1.328,22.117-5.015,26.472-15.531l17.134-41.365C514.418,326.488,511.258,314.358,502.325,307.303z M281.292,329.698
-		c-39.68,16.436-85.172-2.407-101.607-42.087c-16.436-39.68,2.407-85.171,42.087-101.608c39.68-16.436,85.172,2.407,101.608,42.088
-		C339.815,267.771,320.972,313.262,281.292,329.698z"/>
+<svg width="100pt" height="100pt" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<g :fill="fill">
+<path :fill="fill" d="m92.57 55.332c-0.73047-0.44141-1.1328-1.2695-1.0312-2.1211 0.082032-1.0547 0.12891-2.1289 0.12891-3.2109s-0.046875-2.1602-0.12891-3.2227c-0.10156-0.84375 0.30078-1.6719 1.0312-2.1094 5-2.8945 6.7148-9.2891 3.832-14.297l-6.207-10.746c-2.9102-4.9922-9.3164-6.6875-14.316-3.793-0.69531 0.41406-1.5664 0.37891-2.2305-0.085937-1.8398-1.2656-3.7773-2.3789-5.793-3.332-0.75-0.35547-1.2148-1.1211-1.1875-1.9492-0.007813-5.7773-4.6914-10.457-10.469-10.465h-12.398c-5.793 0.011719-10.477 4.7148-10.469 10.504 0.003907 0.80469-0.45703 1.5352-1.1836 1.8828-2.0195 0.95312-3.957 2.0703-5.7969 3.3359-0.67187 0.46484-1.5547 0.49219-2.2539 0.074219-5.0078-2.8867-11.406-1.1758-14.297 3.8281l-6.2031 10.746c-2.8828 5.0078-1.168 11.402 3.832 14.297 0.73047 0.44141 1.1328 1.2695 1.0312 2.1211-0.082032 1.0508-0.12891 2.1289-0.12891 3.2109s0.046875 2.1602 0.12891 3.2227c0.10156 0.84375-0.30078 1.6719-1.0312 2.1094-5 2.8945-6.7148 9.2891-3.832 14.297l6.207 10.746c2.9023 5.0039 9.3086 6.707 14.316 3.8125 0.69531-0.41406 1.5664-0.37891 2.2305 0.085938 1.8398 1.2656 3.7773 2.3789 5.793 3.3359 0.74219 0.35156 1.207 1.1055 1.1875 1.9258 0.007813 5.7773 4.6914 10.457 10.469 10.465h12.398c5.793-0.011719 10.477-4.7148 10.469-10.504-0.003907-0.80469 0.45703-1.5352 1.1836-1.8828 2.0195-0.95312 3.957-2.0703 5.7969-3.3359 0.67187-0.46484 1.5547-0.49219 2.2539-0.074219 5.0078 2.8789 11.402 1.168 14.297-3.8281l6.2031-10.742c2.8867-5.0078 1.1719-11.406-3.832-14.301zm-9.2383-5.332c0 0.85547-0.039062 1.6992-0.10547 2.5352h0.003907c-0.33984 4.0469 1.6719 7.9336 5.1719 10 0.49219 0.28125 0.85156 0.74609 0.99609 1.2969 0.14453 0.54688 0.070312 1.1289-0.21484 1.6172l-6.1953 10.742c-0.60156 1.0234-1.918 1.3633-2.9414 0.76172-3.4883-1.9922-7.8086-1.8203-11.125 0.44531-1.4727 1.0156-3.0234 1.9062-4.6367 2.6719-3.6406 1.7461-5.957 5.4258-5.9531 9.4648 0 1.1758-0.95312 2.1328-2.1328 2.1328h-12.398c-0.57422-0.003907-1.1211-0.23438-1.5195-0.64062-0.40234-0.41016-0.62109-0.96094-0.61328-1.5312-0.011719-4.0234-2.3281-7.6797-5.957-9.4141-1.6094-0.76562-3.1602-1.6562-4.6328-2.668-3.3281-2.2695-7.6602-2.4336-11.148-0.41797-1.0195 0.58984-2.3242 0.23828-2.918-0.78125l-6.1797-10.75c-0.58594-1.0195-0.23828-2.3242 0.78125-2.9141 3.5-2.0625 5.5117-5.9492 5.1758-10-0.085937-0.85156-0.12109-1.6953-0.12109-2.5508s0.039062-1.6992 0.10547-2.5352h-0.003907c0.33984-4.0469-1.6719-7.9336-5.1719-10-0.49219-0.28125-0.85156-0.74609-0.99609-1.2969-0.14453-0.54688-0.070312-1.1289 0.21484-1.6172l6.1953-10.754c0.28906-0.49609 0.76172-0.85156 1.3125-0.99609s1.1406-0.058593 1.6289 0.23438c3.4883 1.9961 7.8086 1.8203 11.125-0.44922 1.4727-1.0117 3.0234-1.9023 4.6367-2.668 3.6367-1.7461 5.9531-5.418 5.9531-9.4531 0-0.5625 0.22266-1.1055 0.625-1.5078 0.39844-0.39844 0.94141-0.625 1.5078-0.625h12.398c0.57422 0.003907 1.1211 0.23438 1.5195 0.64062 0.40234 0.41016 0.62109 0.96094 0.61328 1.5312 0.011719 4.0234 2.3281 7.6797 5.957 9.4141 1.6094 0.76562 3.1602 1.6562 4.6328 2.668 3.3281 2.2695 7.6602 2.4297 11.148 0.41797 1.0195-0.58984 2.3242-0.23828 2.918 0.78125l6.1797 10.75c0.58594 1.0195 0.23828 2.3242-0.78125 2.9141-3.5 2.0625-5.5117 5.9492-5.1758 10 0.085937 0.85156 0.12109 1.7188 0.12109 2.5508z"/>
+<path :fill="fill" d="m50 29.168c-5.5234 0-10.824 2.1953-14.73 6.1016s-6.1016 9.207-6.1016 14.73 2.1953 10.824 6.1016 14.73 9.207 6.1016 14.73 6.1016 10.824-2.1953 14.73-6.1016 6.1016-9.207 6.1016-14.73c-0.003906-5.5234-2.2031-10.82-6.1094-14.723-3.9023-3.9062-9.1992-6.1055-14.723-6.1094zm0 33.332c-5.0547 0-9.6133-3.0469-11.547-7.7148-1.9375-4.6719-0.86719-10.051 2.707-13.625 3.5742-3.5742 8.9531-4.6445 13.625-2.707 4.668 1.9336 7.7148 6.4922 7.7148 11.547 0 6.9023-5.5977 12.5-12.5 12.5z"/>
+</g>
 </svg>
 </template>
 

package/src/modules/icons/icons.client.js

@@ -213,24 +213,26 @@ export {
   SkeletonOrganization,
 };
 
-import iconsRouter from './router/icons.router.js';
+// Router
+import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
+import { getRoutes } from './icons.router.js';
 
 // Icons page component
 import IconsPage from './pages/IconsPage.vue';
 
 
 function initializeIcons(app, store, router, options = {}) {
-  const route = options.route || 'Home';
-
-  // Регистрация маршрута для галереи иконок
-  router.addRoute(route, iconsRouter);
+  const routes = getRoutes(options);
+  routes.forEach(({ parentName, config }) => {
+    addRoutes(router, { ...config, parentName });
+  });
 }
 
 const ModuleIcons = {
   initialize: initializeIcons,
   views: {
     router: {
-      iconsRouter,
+      getRoutes,
     },
     components: {
       IconsPage,

package/src/modules/icons/icons.router.js

@@ -0,0 +1,29 @@
+// icons.router.js
+export function getRoutes(options = {}) {
+  const route = options.route || 'Home';
+  const routes = [];
+
+  routes.push({
+    parentName: route,
+    config: {
+      basePath: 'icons',
+      routes: [
+        {
+          path: '',
+          name: 'Icons Gallery',
+          meta: {
+            title: {
+              en: 'Icons',
+              ru: 'Иконки',
+            },
+          },
+          component: () => import(/* webpackChunkName: "icons" */ './pages/IconsPage.vue'),
+        },
+      ],
+    }
+  });
+
+  return routes;
+}
+
+export default { getRoutes };

package/src/modules/icons/icons.server.js

@@ -176,11 +176,11 @@ export function convertSvgToVueComponent(svgContent, iconName) {
   let cleanSvg = svgContent.replace(/<\?xml[^>]*\?>/g, '');
   cleanSvg = cleanSvg.replace(/<!DOCTYPE[^>]*>/g, '');
   cleanSvg = cleanSvg.trim();
-  
+
   // Replace fill attributes with :fill prop binding
   cleanSvg = cleanSvg.replace(/fill="[^"]*"/g, ':fill="fill"');
   cleanSvg = cleanSvg.replace(/stroke="[^"]*"/g, ':stroke="fill"');
-  
+
   // Add fill to SVG elements that don't have fill or stroke attributes
   const svgElements = ['path', 'rect', 'circle', 'ellipse', 'polygon', 'polyline', 'line', 'g'];
   svgElements.forEach(element => {
@@ -195,13 +195,13 @@ export function convertSvgToVueComponent(svgContent, iconName) {
       return `<${element} :fill="fill"${attributes || ''}${selfClosing || ''}>`;
     });
   });
-  
+
   // Ensure proper formatting with indentation
   cleanSvg = cleanSvg.replace(/<svg/g, '\n<svg');
   cleanSvg = cleanSvg.replace(/<\/svg>/g, '\n</svg>');
   cleanSvg = cleanSvg.replace(/<(path|rect|circle|ellipse|polygon|polyline|line|g)/g, '\n\t<$1');
   cleanSvg = cleanSvg.replace(/>\s*\n\s*</g, '>\n<');
-  
+
   const vueComponent = `<template>${cleanSvg}
 </template>
 
@@ -213,7 +213,7 @@ export function convertSvgToVueComponent(svgContent, iconName) {
 \t  }
 \t})
 </script>`;
-  
+
   return vueComponent;
 }
 

package/src/modules/icons/navigation/IconDelete.vue

@@ -1,10 +1,11 @@
 <template>
-	<svg width="46" height="52" viewBox="0 0 46 52" fill="none" xmlns="http://www.w3.org/2000/svg">
-		<path 
-			:fill="fill"
-			d="M43.9968 8.0683H33.5206V6.36226C33.5206 3.31016 31.0371 0.821533 27.9798 0.821533H18.0253C14.9732 0.821533 12.4846 3.30495 12.4846 6.36226V8.0683H2.00833C1.23096 8.0683 0.610107 8.68915 0.610107 9.46653C0.610107 10.2439 1.23096 10.8647 2.00833 10.8647H4.53348V43.7022C4.53348 47.8238 7.88818 51.1785 12.0098 51.1785H34.0005C38.1222 51.1785 41.4769 47.8238 41.4769 43.7022V10.8647H44.002C44.7794 10.8647 45.4002 10.2439 45.4002 9.46653C45.4002 8.68915 44.7742 8.0683 43.9968 8.0683ZM15.281 6.36226C15.281 4.84925 16.5123 3.61798 18.0253 3.61798H27.985C29.4981 3.61798 30.7293 4.84925 30.7293 6.36226V8.0683H15.281V6.36226ZM38.6856 43.7022H38.6752C38.6752 46.2795 36.5726 48.382 33.9953 48.382H12.0098C9.43249 48.382 7.32993 46.2795 7.32993 43.7022V10.8647H38.6909V43.7022H38.6856ZM30.7241 40.4309V18.8054C30.7241 18.028 31.345 17.4072 32.1223 17.4072C32.8997 17.4072 33.5206 18.028 33.5206 18.8054V40.4309C33.5206 41.2083 32.8997 41.8292 32.1223 41.8292C31.345 41.8292 30.7241 41.2083 30.7241 40.4309ZM21.6043 41.9648V17.2715C21.6043 16.4942 22.2252 15.8733 23.0026 15.8733C23.7799 15.8733 24.4008 16.4942 24.4008 17.2715V41.9752C24.4008 42.7526 23.7799 43.3735 23.0026 43.3735C22.2252 43.3735 21.6043 42.7422 21.6043 41.9648ZM12.4846 40.4309V18.8054C12.4846 18.028 13.1054 17.4072 13.8828 17.4072C14.6602 17.4072 15.281 18.028 15.281 18.8054V40.4309C15.281 41.2083 14.6602 41.8292 13.8828 41.8292C13.1159 41.8292 12.4846 41.2083 12.4846 40.4309Z"
-		/>
-	</svg>
+<svg width="100pt" height="100pt" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<g :fill="fill">
+<path :fill="fill" d="m75 16.668h-4.168v-4.168c0-6.9023-5.5938-12.5-12.5-12.5h-16.664c-6.9062 0-12.5 5.5977-12.5 12.5v4.168h-4.168c-6.9023 0-12.5 5.5938-12.5 12.5v8.332c0 1.1055 0.4375 2.1641 1.2188 2.9453s1.8438 1.2227 2.9492 1.2227h0.28906l3.332 46.727v-0.003906c0.48828 6.5312 5.9219 11.586 12.469 11.609h34.484c6.5469-0.023438 11.977-5.0781 12.465-11.609l3.3398-46.723h0.28516c1.1055 0 2.168-0.44141 2.9492-1.2227s1.2188-1.8398 1.2188-2.9453v-8.332c0-6.9062-5.5977-12.5-12.5-12.5zm-37.5-4.168c0-2.3008 1.8672-4.168 4.168-4.168h16.668-0.003907c1.1055 0 2.168 0.44141 2.9492 1.2227s1.2188 1.8398 1.2188 2.9453v4.168h-25zm-16.668 16.668c0-2.3008 1.8672-4.168 4.168-4.168h50c1.1055 0 2.1641 0.4375 2.9453 1.2188s1.2227 1.8438 1.2227 2.9492v4.1641h-58.336zm50.566 58.629c-0.15234 2.1836-1.9766 3.875-4.1641 3.8711h-34.477c-2.1914 0.003906-4.0117-1.6875-4.168-3.8711l-3.2812-46.129h49.383z"/>
+<path :fill="fill" d="m41.668 83.332c1.1055 0 2.1641-0.4375 2.9453-1.2188s1.2188-1.8398 1.2188-2.9453v-25c0-2.3008-1.8633-4.168-4.1641-4.168s-4.168 1.8672-4.168 4.168v25c0 1.1055 0.4375 2.1641 1.2188 2.9453s1.8438 1.2188 2.9492 1.2188z"/>
+<path :fill="fill" d="m58.332 83.332c1.1055 0 2.168-0.4375 2.9492-1.2188s1.2188-1.8398 1.2188-2.9453v-25c0-2.3008-1.8672-4.168-4.168-4.168s-4.1641 1.8672-4.1641 4.168v25c0 1.1055 0.4375 2.1641 1.2188 2.9453s1.8398 1.2188 2.9453 1.2188z"/>
+</g>
+</svg>
 </template>
 
 <script setup>
@@ -14,6 +15,4 @@
 	    default: 'rgb(var(--black))'
 	  }
 	})
-</script>
-
-
+</script>

package/src/modules/icons/router/icons.router.js

@@ -1,34 +1,29 @@
-// Router configuration for the icons module
+// icons.router.js
+export function getRoutes(options = {}) {
+  const route = options.route || 'Home';
+  const routes = [];
 
-import * as validationAuth from '@martyrs/src/modules/auth/views/middlewares/auth.validation.js';
-
-const iconsRouter = {
-  path: 'icons',
-  meta: {
-    title: {
-      en: 'Icons Gallery',
-      ru: 'Галерея иконок'
-    },
-    breadcrumbs: {
-      hidden: false,
-    }
-  },
-  children: [
-    {
-      path: '',
-      name: 'Icons',
-      meta: {
-        title: {
-          en: 'Icons Gallery',
-          ru: 'Галерея иконок'
+  routes.push({
+    parentName: route,
+    config: {
+      basePath: 'icons',
+      routes: [
+        {
+          path: '',
+          name: 'Icons Gallery',
+          meta: {
+            title: {
+              en: 'Icons',
+              ru: 'Иконки',
+            },
+          },
+          component: () => import(/* webpackChunkName: "icons" */ '../pages/IconsPage.vue'),
         },
-        breadcrumbs: {
-          hidden: false,
-        }
-      },
-      component: () => import('@martyrs/src/modules/icons/pages/IconsPage.vue')
+      ],
     }
-  ]
-};
+  });
+
+  return routes;
+}
 
-export default iconsRouter;
+export default { getRoutes };

package/src/modules/icons/routes/icons.routes.js

@@ -4,12 +4,11 @@ export default function iconsRoutes(app, db, origins, publicPath) {
   // Search icons endpoint with pagination
   app.post('/api/icons/search', async (req, res) => {
     try {
-      const { 
-        search: term, 
-        limit = 20, 
-        skip = 0,
+      const {
+        search: term,
+        limit = 50,
         next_page,
-        prev_page 
+        prev_page
       } = req.body;
 
       if (!term) {
@@ -18,12 +17,10 @@ export default function iconsRoutes(app, db, origins, publicPath) {
 
       // Remove "Icon" prefix from search term
       const cleanTerm = term.replace(/^Icon/i, '').trim();
-      
-      // Для skip-based пагинации запрашиваем больше результатов
-      const requestLimit = skip > 0 ? limit + skip : limit;
-      
-      let searchParams = { limit: requestLimit };
-      
+
+      // Используем только token-based пагинацию
+      const searchParams = { limit };
+
       if (next_page) {
         searchParams.next_page = next_page;
       } else if (prev_page) {
@@ -31,20 +28,10 @@ export default function iconsRoutes(app, db, origins, publicPath) {
       }
 
       const response = await searchIcons(cleanTerm, searchParams);
-      
-      let icons = response.icons || [];
-      
-      // Применяем skip и limit к результатам
-      if (skip > 0) {
-        icons = icons.slice(skip);
-      }
-      if (icons.length > limit) {
-        icons = icons.slice(0, limit);
-      }
 
       res.json({
         success: true,
-        icons: icons.map(icon => ({
+        icons: (response.icons || []).map(icon => ({
           id: icon.id,
           term: icon.term,
           preview_url: icon.thumbnail_url || icon.preview_url_84 || icon.preview_url_42,
@@ -53,7 +40,7 @@ export default function iconsRoutes(app, db, origins, publicPath) {
         pagination: {
           next_page: response.next_page || null,
           prev_page: response.prev_page || null,
-          total: response.total || icons.length
+          total: response.total || 0
         }
       });
     } catch (error) {

package/src/modules/integrations/stripe/controllers/webhooks/stripe.webhook.js

@@ -1,4 +1,4 @@
-import Webhook from '@martyrs/src/modules/globals/controllers/classes/globals.webhook.js';
+import Webhook from '@martyrs/src/modules/core/controllers/classes/core.webhook.js';
 import Stripe from 'stripe';
 
 const stripe = new Stripe(process.env.STRIPE_API_KEY ?? '', {

package/src/modules/inventory/CLAUDE.md

@@ -148,7 +148,7 @@ inventory/
 
 ### Ключевые зависимости:
 
-- **Глобальные модули**: `@martyrs/src/modules/globals/*` (cache, logger, validator, abac)
+- **Глобальные модули**: `@martyrs/src/modules/core/*` (cache, logger, validator, abac)
 - **Аутентификация**: `@martyrs/src/modules/auth/controllers/middlewares/authJwt.js`
 - **Vue компоненты**: Vue 3 Composition API + реактивное состояние
 - **MongoDB Change Streams**: Автоматический пересчёт при изменении ингредиентов
@@ -240,19 +240,19 @@ abac.registerResourcePolicy('stockAdjustment', async context => {
 - **Опциональная аутентификация** для публичных endpoints (`availability`)
 
 ### Валидация данных:
-- **Joi-схемы** через `globals.validator.js`
+- **Joi-схемы** через `core.validator.js`
 - **Строгая типизация** параметров и тела запросов
 - **Санитизация** входных данных
 
 ### Авторизация:
-- **ABAC система** через `globals.abac.js`
+- **ABAC система** через `core.abac.js`
 - **Контекстная авторизация** (resource + action)
 - **Роли и права доступа** настраиваются через политики
 
 ### Защита API:
 - **CORS** настройки через `origins`
 - **Rate limiting** на уровне Express
-- **Логирование** всех операций через `globals.logger.js`
+- **Логирование** всех операций через `core.logger.js`
 
 ### Транзакции:
 - **MongoDB сессии** для атомарных операций

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

@@ -198,7 +198,7 @@
 <script setup>
 import { ref, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js'
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'
 
 // Components
 import Table from '@martyrs/src/components/Table/Table.vue'

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

@@ -188,7 +188,7 @@
 
      <!--  :actions="[{
           component: IconEdit,
-          handler: () => globals.actions.add(leftovers.state.current.positions, position),
+          handler: () => core.actions.add(leftovers.state.current.positions, position),
           class: 'bg-light'
         },{
           component: IconDelete,
@@ -250,9 +250,9 @@
 
   import { computed, onMounted, ref, reactive } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
-  import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
+  import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
  
-  import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
   import * as inventory from '@martyrs/src/modules/inventory/store/inventory.store.js';
   import * as products from '@martyrs/src/modules/products/store/products.js';
@@ -333,7 +333,7 @@
       }
     };
     // Add position to inventory state
-    globals.actions.add(inventory.state.current.positions, position);
+    core.actions.add(inventory.state.current.positions, position);
     closeVariantsPopup();
   }
 

package/src/modules/inventory/inventory.client.js

@@ -1,4 +1,4 @@
-import addRoutes from '@martyrs/src/modules/globals/views/router/addRoutes.js';
+import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
 import routerInventory from './router/inventory.router.js';
 
 // Views

package/src/modules/inventory/inventory.router.js

@@ -0,0 +1,72 @@
+function createInventoryRoutes() {
+  return [
+    {
+      path: '',
+      name: 'InventoryList',
+      meta: {
+        title: {
+          en: 'Inventory',
+          ru: 'Инвентарь',
+        },
+        authorize: [],
+      },
+      component: () => import(/* webpackChunkName: 'inventory-list' */ './components/pages/Inventory.vue'),
+    },
+    {
+      path: 'audit',
+      name: 'InventoryAudit',
+      meta: {
+        title: {
+          en: 'Create Inventory Audit',
+          ru: 'Создать Инвентаризацию',
+        },
+        authorize: [],
+      },
+      component: () => import(/* webpackChunkName: 'inventory-audit' */ './components/pages/InventoryEdit.vue'),
+    },
+  ];
+}
+
+export function getRoutes(options = {}) {
+  const routes = [];
+  const routeBackoffice = options.routeBackoffice || 'Backoffice Root';
+  const routeOrganizations = options.routeOrganizations || 'OrganizationRoot';
+
+  if (!options.withBackoffice) {
+    routes.push({
+      parentName: routeBackoffice,
+      config: {
+        basePath: options.backofficeBasePath || 'inventory',
+        routes: createInventoryRoutes(),
+        routeNamePrefix: options.backofficeRouteNamePrefix || 'Backoffice',
+        filterConfig: {
+          include: ['InventoryList', 'InventoryAudit'],
+        },
+        meta: {
+          context: 'backoffice',
+        },
+      },
+    });
+  }
+
+  if (!options.withOrganizationRoutes) {
+    routes.push({
+      parentName: routeOrganizations,
+      config: {
+        basePath: options.organizationBasePath || 'inventory',
+        routes: createInventoryRoutes(),
+        routeNamePrefix: options.organizationRouteNamePrefix || 'Organization',
+        filterConfig: {
+          include: ['InventoryList', 'InventoryAudit'],
+        },
+        meta: {
+          context: 'organization',
+        },
+      },
+    });
+  }
+
+  return routes;
+}
+
+export default { getRoutes };

package/src/modules/inventory/middlewares/inventory.verifier.js

@@ -1,5 +1,5 @@
-import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
-import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+import Validator from '@martyrs/src/modules/core/controllers/classes/core.validator.js';
+import Verifier from '@martyrs/src/modules/core/controllers/classes/core.verifier.js';
 
 export default function(db) {
   // Stock Adjustment verifiers

package/src/modules/inventory/middlewares/stock.alerts.verifier.js

@@ -1,5 +1,5 @@
-import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
-import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+import Validator from '@martyrs/src/modules/core/controllers/classes/core.validator.js';
+import Verifier from '@martyrs/src/modules/core/controllers/classes/core.verifier.js';
 
 export default function(db) {
 

package/src/modules/inventory/models/stock.adjustment.model.js

@@ -1,4 +1,4 @@
-import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+import applyOwnershipSchema from '@martyrs/src/modules/core/models/schemas/ownership.schema.js';
 
 export default db => {
   const StockAdjustmentSchema = new db.mongoose.Schema({

package/src/modules/inventory/models/stock.alerts.model.js

@@ -1,4 +1,4 @@
-import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+import applyOwnershipSchema from '@martyrs/src/modules/core/models/schemas/ownership.schema.js';
 
 export default db => {
   const StockAlertSchema = new db.mongoose.Schema({

package/src/modules/inventory/models/stock.audit.model.js

@@ -1,4 +1,4 @@
-import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+import applyOwnershipSchema from '@martyrs/src/modules/core/models/schemas/ownership.schema.js';
 
 export default db => {
   const StockAuditSchema = new db.mongoose.Schema({

package/src/modules/inventory/models/stock.availability.model.js

@@ -1,4 +1,4 @@
-import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+import applyOwnershipSchema from '@martyrs/src/modules/core/models/schemas/ownership.schema.js';
 
 export default db => {
   const StockAvailabilitySchema = new db.mongoose.Schema({

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

@@ -1,6 +1,6 @@
-import globalsabac from '@martyrs/src/modules/globals/controllers/classes/globals.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 
-const { getInstance } = globalsabac;
+const { getInstance } = coreabac;
 
 export default function(db) {
   const abac = getInstance(db);

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

@@ -1,12 +1,12 @@
 import jwtFactory from '@martyrs/src/modules/auth/controllers/middlewares/authJwt.js';
-import globalsabac from '@martyrs/src/modules/globals/controllers/classes/globals.abac.js';
+import coreabac from '@martyrs/src/modules/core/controllers/classes/core.abac.js';
 import adjustmentServiceFactory from '../services/adjustment.service.js';
 import availabilityServiceFactory from '../services/availability.service.js';
 import auditServiceFactory from '../services/audit.service.js';
 import verifierFactory from '../middlewares/inventory.verifier.js';
 import setupStockAlertsRoutes from './stock.alerts.routes.js';
 
-const { getInstance } = globalsabac;
+const { getInstance } = coreabac;
 
 export default function(app, db) {
   const jwt = jwtFactory(db);

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

@@ -1,5 +1,5 @@
-import CRUD from '@martyrs/src/modules/globals/controllers/classes/crud/crud.js';
-import ABAC from '@martyrs/src/modules/globals/controllers/classes/abac/abac.js';
+import CRUD from '@martyrs/src/modules/core/controllers/classes/crud/crud.js';
+import ABAC from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
 import stockAlertsVerifierFactory from '../middlewares/stock.alerts.verifier.js';
 
 const { getInstance } = ABAC;

package/src/modules/inventory/services/adjustment.service.js

@@ -1,7 +1,7 @@
-import queryProcessor from '@martyrs/src/modules/globals/controllers/utils/queryProcessor.js';
-import Cache from '@martyrs/src/modules/globals/controllers/classes/globals.cache.js';
-import Logger from '@martyrs/src/modules/globals/controllers/classes/globals.logger.js';
-import Observer from '@martyrs/src/modules/globals/controllers/classes/globals.observer.js';
+import queryProcessor from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
+import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
+import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
+import Observer from '@martyrs/src/modules/core/controllers/classes/core.observer.js';
 import availabilityServiceFactory from './availability.service.js';
 
 const adjustmentServiceFactory = db => {

package/src/modules/inventory/services/audit.service.js

@@ -1,7 +1,7 @@
-import queryProcessor from '@martyrs/src/modules/globals/controllers/utils/queryProcessor.js';
-import Cache from '@martyrs/src/modules/globals/controllers/classes/globals.cache.js';
-import Logger from '@martyrs/src/modules/globals/controllers/classes/globals.logger.js';
-import Observer from '@martyrs/src/modules/globals/controllers/classes/globals.observer.js';
+import queryProcessor from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
+import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
+import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
+import Observer from '@martyrs/src/modules/core/controllers/classes/core.observer.js';
 import availabilityServiceFactory from './availability.service.js';
 
 const auditServiceFactory = db => {

package/src/modules/inventory/services/availability.service.js

@@ -1,6 +1,6 @@
-import Cache from '@martyrs/src/modules/globals/controllers/classes/globals.cache.js';
-import Logger from '@martyrs/src/modules/globals/controllers/classes/globals.logger.js';
-import queryProcessor from '@martyrs/src/modules/globals/controllers/utils/queryProcessor.js';
+import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
+import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
+import queryProcessor from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
 
 const availabilityServiceFactory = db => {
   const cache = new Cache({ ttlSeconds: 300 });

package/src/modules/inventory/services/inventory.helpers.old.js

@@ -1,6 +1,6 @@
-import Cache from '@martyrs/src/modules/globals/controllers/classes/globals.cache.js';
-import Logger from '@martyrs/src/modules/globals/controllers/classes/globals.logger.js';
-import Observer from '@martyrs/src/modules/globals/controllers/classes/globals.observer.js';
+import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
+import Logger from '@martyrs/src/modules/core/controllers/classes/core.logger.js';
+import Observer from '@martyrs/src/modules/core/controllers/classes/core.observer.js';
 
 // Update quantity in stockAvailability
 export async function updateStockQuantity(db, product, variant, storage, quantity, owner, creator, session) {

package/src/modules/inventory/store/inventory.store.js

@@ -1,6 +1,6 @@
 import { reactive, watch } from 'vue';
-import { setError } from '@martyrs/src/modules/globals/views/store/globals.js';
-import $axios from '@martyrs/src/modules/globals/views/utils/axios-instance.js';
+import { setError } from '@martyrs/src/modules/core/views/store/core.store.js';
+import $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';
 
 const state = reactive({
   adjustments: [],

package/src/modules/inventory/store/stock.alerts.store.js

@@ -1,4 +1,4 @@
-import Store from '@martyrs/src/modules/globals/views/classes/globals.store.js';
+import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
 
 const stockAlertsStore = new Store('/api/inventory/alerts');
 

package/src/modules/landing/landing.client.js

@@ -14,7 +14,7 @@ import SectionFeaturesImages from './components/sections/SectionFeaturesImages.v
 import SectionHeroToken from './components/sections/SectionHeroToken.vue';
 import SectionRoadmap from './components/sections/SectionRoadmap.vue';
 
-import { i18nManager } from '@martyrs/src/modules/globals/views/classes/globals.i18n.js';
+import { i18nManager } from '@martyrs/src/modules/core/views/classes/core.i18n.js';
 import locales from './locales/index.js';
 
 // Регистрируем локализацию для модуля landing