@ozdao/martyrs 0.2.536 → 0.2.538

package/dist/martyrs/src/modules/products/components/sections/ProductConfigurator.vue.cjs

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const vueI18n = require("vue-i18n");
 const IconShopcartAdd = require("../../../icons/actions/IconShopcartAdd.vue.cjs");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 const ProductVariants = require("../blocks/ProductVariants.vue.cjs");
 const ProductDiscounts = require("../blocks/ProductDiscounts.vue.cjs");
 const QuantitySelector = require("../elements/QuantitySelector.vue.cjs");

package/dist/martyrs/src/modules/products/components/sections/ProductConfigurator.vue.js

@@ -1,7 +1,7 @@
 import { ref, computed, createElementBlock, createCommentVNode, openBlock, createVNode, createElementVNode, toDisplayString, withCtx, unref, Fragment } from "vue";
 import { useI18n } from "vue-i18n";
 import _sfc_main$5 from "../../../icons/actions/IconShopcartAdd.vue.js";
-import _sfc_main$4 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$4 from "../../../../components/Button/Button.vue.js";
 import _sfc_main$1 from "../blocks/ProductVariants.vue.js";
 import ProductDiscounts from "../blocks/ProductDiscounts.vue.js";
 import _sfc_main$3 from "../elements/QuantitySelector.vue.js";

package/dist/martyrs/src/modules/products/components/sections/ProductsRecommended.vue.cjs

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const vueRouter = require("vue-router");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 const Checkbox = require("../../../../components/Checkbox/Checkbox.vue.cjs");
 const CardProduct = require("../blocks/CardProduct.vue.cjs");
 const IconProducts = require("../../../icons/entities/IconProducts.vue.cjs");

package/dist/martyrs/src/modules/products/components/sections/ProductsRecommended.vue.js

@@ -1,6 +1,6 @@
 import { getCurrentInstance, ref, computed, createElementBlock, openBlock, createElementVNode, Fragment, renderList, createBlock, withCtx, createVNode, withModifiers, toDisplayString } from "vue";
 import { useRouter } from "vue-router";
-import _sfc_main$4 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$4 from "../../../../components/Button/Button.vue.js";
 import _sfc_main$2 from "../../../../components/Checkbox/Checkbox.vue.js";
 import _sfc_main$1 from "../blocks/CardProduct.vue.js";
 import _sfc_main$3 from "../../../icons/entities/IconProducts.vue.js";

package/dist/martyrs/src/modules/products/components/sections/SectionProduct.vue.cjs

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
-const Tab = require("../../../../components/Tab/Tab.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
+const Tab = require("../../../../components/Tab/Tab.vue.cjs");
 const IconEdit = require("../../../icons/navigation/IconEdit.vue.cjs");
 const PlaceholderImage = require("../../../icons/placeholders/PlaceholderImage.vue.cjs");
 const Image360 = require("../elements/Image360.vue.cjs");
 const ProductImages = require("../blocks/ProductImages.vue.cjs");
-;/* empty css                    */
+;/* empty css                     */
 const Price = require("../elements/Price.vue.cjs");
 const vueRouter = require("vue-router");
 const vueI18n = require("vue-i18n");

package/dist/martyrs/src/modules/products/components/sections/SectionProduct.vue.js

@@ -1,11 +1,11 @@
 import { computed, ref, createElementBlock, openBlock, createElementVNode, createBlock, createCommentVNode, createVNode, unref, toDisplayString, Transition, withCtx, Fragment, renderList, createTextVNode } from "vue";
-import _sfc_main$4 from "../../../../components/Button/Button.vue2.js";
-import _sfc_main$3 from "../../../../components/Tab/Tab.vue2.js";
+import _sfc_main$4 from "../../../../components/Button/Button.vue.js";
+import _sfc_main$3 from "../../../../components/Tab/Tab.vue.js";
 import _sfc_main$1 from "../../../icons/navigation/IconEdit.vue.js";
 import PlaceholderImage from "../../../icons/placeholders/PlaceholderImage.vue.js";
 import Image360 from "../elements/Image360.vue.js";
 import ProductImages from "../blocks/ProductImages.vue.js";
-/* empty css                  */
+/* empty css                   */
 import _sfc_main$2 from "../elements/Price.vue.js";
 import { useRoute, useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";

package/dist/martyrs/src/modules/rents/views/components/pages/Gant/GanttToolbar.vue.cjs

@@ -2,8 +2,8 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const dayjs_min = require("../../../../../../../../_virtual/dayjs.min.cjs");
-const Tab = require("../../../../../../components/Tab/Tab.vue2.cjs");
-const Button = require("../../../../../../components/Button/Button.vue2.cjs");
+const Tab = require("../../../../../../components/Tab/Tab.vue.cjs");
+const Button = require("../../../../../../components/Button/Button.vue.cjs");
 const Dropdown = require("../../../../../../components/Dropdown/Dropdown.vue2.cjs");
 const Calendar = require("../../../../../../components/Calendar/Calendar.vue2.cjs");
 const DateLabel = require("./DateLabel.vue.cjs");

package/dist/martyrs/src/modules/rents/views/components/pages/Gant/GanttToolbar.vue.js

@@ -1,7 +1,7 @@
 import { computed, ref, watch, createElementBlock, openBlock, createElementVNode, createVNode, withCtx, createTextVNode } from "vue";
 import dayjs from "../../../../../../../../_virtual/dayjs.min.js";
-import _sfc_main$2 from "../../../../../../components/Tab/Tab.vue2.js";
-import _sfc_main$3 from "../../../../../../components/Button/Button.vue2.js";
+import _sfc_main$2 from "../../../../../../components/Tab/Tab.vue.js";
+import _sfc_main$3 from "../../../../../../components/Button/Button.vue.js";
 import _sfc_main$4 from "../../../../../../components/Dropdown/Dropdown.vue2.js";
 import Calendar from "../../../../../../components/Calendar/Calendar.vue2.js";
 import _sfc_main$1 from "./DateLabel.vue.js";

package/dist/martyrs/src/modules/rents/views/components/pages/Rents.vue.cjs

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const dayjs_min = require("../../../../../../../_virtual/dayjs.min.cjs");
-;/* empty css                                      */
+;/* empty css                                       */
 const Feed = require("../../../../../components/Feed/Feed.vue.cjs");
 ;/* empty css                        */
 const GanttChart = require("./Gant/GanttChart.vue.cjs");

package/dist/martyrs/src/modules/rents/views/components/pages/Rents.vue.js

@@ -1,6 +1,6 @@
 import { ref, computed, createElementBlock, openBlock, createElementVNode, createVNode, unref, toDisplayString, withCtx } from "vue";
 import dayjs from "../../../../../../../_virtual/dayjs.min.js";
-/* empty css                                    */
+/* empty css                                     */
 import _sfc_main$1 from "../../../../../components/Feed/Feed.vue.js";
 /* empty css                      */
 import _sfc_main$2 from "./Gant/GanttChart.vue.js";

package/dist/martyrs/src/modules/reports/components/sections/FormReport.vue.cjs

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const Popup = require("../../../../components/Popup/Popup.vue.cjs");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const reports = require("../../store/reports.cjs");
 const _sfc_main = {

package/dist/martyrs/src/modules/reports/components/sections/FormReport.vue.js

@@ -1,6 +1,6 @@
 import { reactive, ref, createElementBlock, openBlock, renderSlot, createVNode, withCtx, createElementVNode, createTextVNode } from "vue";
 import _sfc_main$1 from "../../../../components/Popup/Popup.vue.js";
-import _sfc_main$2 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue.js";
 import Select from "../../../../components/Select/Select.vue.js";
 import { actions } from "../../store/reports.js";
 const _sfc_main = {

package/dist/martyrs/src/modules/spots/components/layouts/Spots.vue.cjs

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const vueRouter = require("vue-router");
 const vueI18n = require("vue-i18n");
-;/* empty css                                           */
+;/* empty css                                            */
 ;/* empty css                                        */
 ;/* empty css                                                   */
 ;/* empty css                                             */

package/dist/martyrs/src/modules/spots/components/layouts/Spots.vue.js

@@ -1,7 +1,7 @@
 import { ref, onMounted, watch, resolveComponent, createElementBlock, openBlock, createElementVNode, createVNode, createCommentVNode, toDisplayString, withCtx, Transition, createBlock, resolveDynamicComponent } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";
-/* empty css                                         */
+/* empty css                                          */
 /* empty css                                      */
 /* empty css                                                 */
 /* empty css                                           */

package/dist/martyrs/src/modules/spots/components/pages/Map.vue.cjs

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const vueRouter = require("vue-router");
 const index = require("../../../../../../node_modules/.pnpm/@googlemaps_js-api-loader@1.16.10/node_modules/@googlemaps/js-api-loader/dist/index.cjs");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 const organizations = require("../../../organizations/store/organizations.cjs");
 const globals = require("../../../globals/views/store/globals.cjs");
 const marketplace = require("../../../marketplace/views/store/marketplace.cjs");

package/dist/martyrs/src/modules/spots/components/pages/Map.vue.js

@@ -1,7 +1,7 @@
 import { ref, onMounted, createElementBlock, openBlock, createElementVNode, createVNode, withCtx, createTextVNode } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { Loader } from "../../../../../../node_modules/.pnpm/@googlemaps_js-api-loader@1.16.10/node_modules/@googlemaps/js-api-loader/dist/index.js";
-import _sfc_main$1 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$1 from "../../../../components/Button/Button.vue.js";
 import { actions, state as state$2 } from "../../../organizations/store/organizations.js";
 import { state } from "../../../globals/views/store/globals.js";
 import { state as state$1 } from "../../../marketplace/views/store/marketplace.js";

package/dist/martyrs/src/modules/spots/components/pages/Spot.vue.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Spoiler = require("../../../../components/Spoiler/Spoiler.vue2.cjs");
+const Spoiler = require("../../../../components/Spoiler/Spoiler.vue.cjs");
 const Map = require("../../../../components/Map/Map.vue.cjs");
 const SpotSub = require("../blocks/SpotSub.vue.cjs");
 const CardUser = require("../../../auth/views/components/blocks/CardUser.vue.cjs");

package/dist/martyrs/src/modules/spots/components/pages/Spot.vue.js

@@ -1,5 +1,5 @@
 import { createElementBlock, openBlock, createVNode, createElementVNode, withCtx, createCommentVNode, Fragment, renderList, createBlock, toDisplayString } from "vue";
-import _sfc_main$1 from "../../../../components/Spoiler/Spoiler.vue2.js";
+import _sfc_main$1 from "../../../../components/Spoiler/Spoiler.vue.js";
 import Map from "../../../../components/Map/Map.vue.js";
 import SpotSub from "../blocks/SpotSub.vue.js";
 import _sfc_main$2 from "../../../auth/views/components/blocks/CardUser.vue.js";

package/dist/martyrs/src/modules/spots/components/pages/SpotEdit.vue.cjs

@@ -4,13 +4,13 @@ const vue = require("vue");
 const vueRouter = require("vue-router");
 const Block = require("../../../../components/Block/Block.vue.cjs");
 const UploadImage = require("../../../../components/UploadImage/UploadImage.vue.cjs");
-;/* empty css                                   */
+;/* empty css                                    */
 const Field = require("../../../../components/Field/Field.vue.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const Checkbox = require("../../../../components/Checkbox/Checkbox.vue.cjs");
 const Address = require("../../../../components/Address/Address.vue.cjs");
 const LocationMarker = require("../../../../components/LocationMarker/LocationMarker.vue.cjs");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 ;/* empty css                                        */
 const WorktimeEdit = require("../sections/WorktimeEdit.vue.cjs");
 const spots = require("../../store/spots.cjs");

package/dist/martyrs/src/modules/spots/components/pages/SpotEdit.vue.js

@@ -2,13 +2,13 @@ import { ref, onMounted, createElementBlock, openBlock, createVNode, createEleme
 import { useRouter, useRoute } from "vue-router";
 import _sfc_main$1 from "../../../../components/Block/Block.vue.js";
 import _sfc_main$3 from "../../../../components/UploadImage/UploadImage.vue.js";
-/* empty css                                 */
+/* empty css                                  */
 import Field from "../../../../components/Field/Field.vue.js";
 import Select from "../../../../components/Select/Select.vue.js";
 import _sfc_main$4 from "../../../../components/Checkbox/Checkbox.vue.js";
 import _sfc_main$5 from "../../../../components/Address/Address.vue.js";
 import _sfc_main$6 from "../../../../components/LocationMarker/LocationMarker.vue.js";
-import _sfc_main$2 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue.js";
 /* empty css                                      */
 import WorktimeEdit from "../sections/WorktimeEdit.vue.js";
 import { actions, state } from "../../store/spots.js";

package/dist/martyrs/src/modules/spots/components/sections/WorktimeEdit.vue.cjs

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const vueI18n = require("vue-i18n");
-const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../components/Button/Button.vue.cjs");
 const Field = require("../../../../components/Field/Field.vue.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const Checkbox = require("../../../../components/Checkbox/Checkbox.vue.cjs");

package/dist/martyrs/src/modules/spots/components/sections/WorktimeEdit.vue.js

@@ -1,6 +1,6 @@
 import { mergeModels, useModel, ref, computed, onMounted, createElementBlock, openBlock, createElementVNode, createVNode, toDisplayString, unref, withCtx, createTextVNode, Fragment, renderList, normalizeClass, createCommentVNode, createBlock } from "vue";
 import { useI18n } from "vue-i18n";
-import _sfc_main$1 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$1 from "../../../../components/Button/Button.vue.js";
 import Field from "../../../../components/Field/Field.vue.js";
 import Select from "../../../../components/Select/Select.vue.js";
 import _sfc_main$3 from "../../../../components/Checkbox/Checkbox.vue.js";

package/dist/martyrs/src/modules/wallet/views/components/pages/Wallet.vue.cjs

@@ -6,7 +6,7 @@ const Web3 = require("web3");
 const wallet_store = require("../../store/wallet.store.cjs");
 const wallet = require("../../localization/wallet.json.cjs");
 const Popup = require("../../../../../components/Popup/Popup.vue.cjs");
-const Button = require("../../../../../components/Button/Button.vue2.cjs");
+const Button = require("../../../../../components/Button/Button.vue.cjs");
 require("vue-router");
 ;/* empty css                                              */
 ;/* empty css                                                */

package/dist/martyrs/src/modules/wallet/views/components/pages/Wallet.vue.js

@@ -4,7 +4,7 @@ import Web3 from "web3";
 import { state, actions } from "../../store/wallet.store.js";
 import text from "../../localization/wallet.json.js";
 import _sfc_main$3 from "../../../../../components/Popup/Popup.vue.js";
-import _sfc_main$1 from "../../../../../components/Button/Button.vue2.js";
+import _sfc_main$1 from "../../../../../components/Button/Button.vue.js";
 import "vue-router";
 /* empty css                                            */
 /* empty css                                              */

package/dist/notifications.server.cjs

@@ -116,6 +116,26 @@ const NotificationsController = (db, wss, notificationService) => {
       if (!userId && !anonymousId) {
         return res.status(400).json({ message: "Either userId or anonymousId is required" });
       }
+      let existingDevice = await db.userDevice.findOne({ deviceToken });
+      if (existingDevice) {
+        console.log("[RegisterDevice] Found existing device by token, updating...");
+        if (userId) {
+          existingDevice.userId = userId;
+          existingDevice.anonymousId = void 0;
+          existingDevice.isAnonymous = false;
+        } else {
+          existingDevice.anonymousId = anonymousId;
+          existingDevice.userId = void 0;
+          existingDevice.isAnonymous = true;
+        }
+        existingDevice.deviceId = deviceId;
+        existingDevice.deviceType = deviceType;
+        existingDevice.lastActive = Date.now();
+        existingDevice.isActive = true;
+        await existingDevice.save();
+        console.log("[RegisterDevice] Device updated:", existingDevice._id);
+        return res.status(200).json(existingDevice);
+      }
       let filter;
       if (userId) {
         filter = { userId, deviceId };

package/dist/notifications.server.js

@@ -114,6 +114,26 @@ const NotificationsController = (db, wss, notificationService) => {
       if (!userId && !anonymousId) {
         return res.status(400).json({ message: "Either userId or anonymousId is required" });
       }
+      let existingDevice = await db.userDevice.findOne({ deviceToken });
+      if (existingDevice) {
+        console.log("[RegisterDevice] Found existing device by token, updating...");
+        if (userId) {
+          existingDevice.userId = userId;
+          existingDevice.anonymousId = void 0;
+          existingDevice.isAnonymous = false;
+        } else {
+          existingDevice.anonymousId = anonymousId;
+          existingDevice.userId = void 0;
+          existingDevice.isAnonymous = true;
+        }
+        existingDevice.deviceId = deviceId;
+        existingDevice.deviceType = deviceType;
+        existingDevice.lastActive = Date.now();
+        existingDevice.isActive = true;
+        await existingDevice.save();
+        console.log("[RegisterDevice] Device updated:", existingDevice._id);
+        return res.status(200).json(existingDevice);
+      }
       let filter;
       if (userId) {
         filter = { userId, deviceId };

package/dist/style.css

@@ -1398,21 +1398,21 @@ to {
   margin-left: 0.5rem;
 }
 
-.notification-badge-container[data-v-c9d03610] {
+.notification-badge-container[data-v-f08c11b0] {
   position: relative;
   display: inline-block;
 }
-.notification-button[data-v-c9d03610] {
+.notification-button[data-v-f08c11b0] {
   background: none;
   border: none;
   cursor: pointer;
   position: relative;
   font-size: 1.2rem;
 }
-.notification-icon[data-v-c9d03610] {
+.notification-icon[data-v-f08c11b0] {
   font-size: 1.4rem;
 }
-.button-counter[data-v-c9d03610] {
+.button-counter[data-v-f08c11b0] {
   position: absolute;
   right: -8px;
   bottom: -8px;
@@ -1426,8 +1426,8 @@ to {
   line-height: 16px;
   font-size: 10px;
 }
-.notifications-loading[data-v-c9d03610],
-.notifications-empty[data-v-c9d03610] {
+.notifications-loading[data-v-f08c11b0],
+.notifications-empty[data-v-f08c11b0] {
   padding: 24px;
   text-align: center;
   color: rgb(var(--text-light));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.536",
+  "version": "0.2.538",
   "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/auth/views/components/pages/SignIn.vue

@@ -118,8 +118,8 @@ import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/i
 
 // Get store
 const store = useStore()
-const auth = store.auth || { state: {}, actions: {} }
-const globals = store.globals || { state: {}, actions: {} }
+const auth = store.auth
+const globals = store.globals
 
 // Init validation
 const phoneValidation = ref(null)

package/src/modules/globals/globals.client.js

@@ -71,7 +71,10 @@ function initializeGlobals(app, store, router, config, options = {}) {
 
   if (config && config.modules) storeGlobals.state.options = config.modules;
 
+  console.log('[DEBUG] initializeGlobals called with store:', !!store);
+  console.log('[DEBUG] Adding globals to store...');
   store.addStore('globals', storeGlobals);
+  console.log('[DEBUG] globals added to store:', !!store.globals);
 
   router.addRoute(route, {
     path: '404',

package/src/modules/globals/views/classes/globals.app.js

@@ -50,8 +50,15 @@ export function createUniversalApp({
     });
     
     // Основная функция создания приложения
-    function createApp() {
+    async function createApp() {
       const store = getStore();
+      console.log('[DEBUG createApp] store created:', !!store);
+      
+      // Установить SSR store для useStore
+      if (typeof window === 'undefined') {
+        const { setSSRStore } = await import('./store.js');
+        setSSRStore(store);
+      }
       const app = process.env.MOBILE_APP 
         ? createVueApp(layoutApp, config) 
         : createVueSSRApp(layoutApp, config);
@@ -77,8 +84,10 @@ export function createUniversalApp({
         
         for (const moduleName of criticalModules) {
           try {
+            console.log(`[DEBUG] Loading module ${moduleName}, context.store:`, !!context.store);
             await moduleRegistry.load(moduleName, context);
             await moduleRegistry.initialize(moduleName, context);
+            console.log(`[DEBUG] Module ${moduleName} initialized, store.${moduleName}:`, !!context.store[moduleName]);
           } catch (error) {
             console.error(`Failed to load critical module ${moduleName}:`, error);
           }
@@ -193,20 +202,32 @@ export function createUniversalApp({
     // FOR SSR / SERVER ENTRY
     async function renderApp({ url, cookies, languages, ssrContext }) {
       const { app, router, store, i18n, meta, moduleRegistry } = await createApp();
+      console.log('[DEBUG SSR] After createApp - store.globals:', !!store.globals);
       
       // ВАЖНО: Очищаем состояние moduleRegistry на сервере перед каждым запросом
       // чтобы избежать загрязнения между запросами
       if (typeof window === 'undefined') {
-        moduleRegistry.initialized.clear();
-        moduleRegistry.modules.clear();
-        moduleRegistry.loadingPromises.clear();
+        // Сброс SSR store для нового запроса
+        const { setSSRStore } = await import('./store.js');
+        setSSRStore(null);
         
-        // На сервере загружаем auth для SSR рендеринга (vue-app-renderer требует его)
-        const context = { app, store, router, config };
-        await moduleRegistry.load('auth', context);
-        await moduleRegistry.initialize('auth', context);
+        // Устанавливаем новый store для этого запроса
+        setSSRStore(store);
       }
       
+      // if (typeof window === 'undefined') {
+      //   moduleRegistry.initialized.clear();
+      //   moduleRegistry.modules.clear();
+      //   moduleRegistry.loadingPromises.clear();
+        
+      //   // На сервере загружаем auth для SSR рендеринга (vue-app-renderer требует его)
+      //   const context = { app, store, router, config };
+      //   await moduleRegistry.load('globals', context);
+      //   await moduleRegistry.initialize('globals', context);
+      //   await moduleRegistry.load('auth', context);
+      //   await moduleRegistry.initialize('auth', context);
+      // }
+      
       const context = {
         app,
         store,
@@ -244,6 +265,7 @@ export function createUniversalApp({
       }
       
       // Передаем только модули текущего роута + критические модули
+      // Это не реальные модули а метаданные для дегидратации
       const criticalModules = ['globals', 'auth', 'organizations', 'backoffice'];
       const allModulesForRoute = [...new Set([...criticalModules, ...currentRouteModules])];
       

package/src/modules/globals/views/classes/module-registry.js

@@ -97,8 +97,11 @@ export class ModuleRegistry {
     // Инициализируем модуль
     // Поддерживаем оба варианта: module.initialize и module.default.initialize для обратной совместимости
     const initFunc = module.initialize || (module.default && module.default.initialize);
+    console.log(`[DEBUG registry] Module ${name} initFunc found:`, !!initFunc);
     if (initFunc) {
+      console.log(`[DEBUG registry] Calling initialize for ${name}`);
       await initFunc(app, store, router, config);
+      console.log(`[DEBUG registry] Module ${name} initialize completed`);
     }
     
     this.initialized.set(name, true);
@@ -114,9 +117,9 @@ export class ModuleRegistry {
     for (const [name, config] of this.loaders) {
       if (config.routes.some(route => {
         if (typeof route === 'string') {
-          // Для корневого роута проверяем точное совпадение
+          // Для корневого роута матчим все пути
           if (route === '/') {
-            return normalizedPath === '/';
+            return true;
           }
           // Для остальных роутов проверяем начало пути
           // но учитываем границы сегментов (не /events должен матчить /event)

package/src/modules/globals/views/classes/store.js

@@ -67,9 +67,21 @@ export function createStore() {
 // Синглтон для клиента
 let clientStore = null;
 
+// Store для SSR должен создаваться в createApp и передаваться сюда
+let ssrStore = null;
+
+export function setSSRStore(store) {
+  ssrStore = store;
+}
+
 export function useStore() {
   if (typeof window === 'undefined') {
-    // SSR: новый store каждый раз
+    // SSR: используем переданный store
+    if (ssrStore) {
+      return ssrStore;
+    }
+    // Fallback для обратной совместимости
+    console.warn('[WARN] SSR store not set, creating new store instance');
     return createStore();
   }
   // Client: синглтон

package/src/modules/notifications/components/elements/NotificationBadge.vue

@@ -82,7 +82,18 @@ const props = defineProps({
 
 // Get router and notification functionality
 const router = useRouter();
-const { notifications, unreadCount, loading, markAllAsRead, getNotifications } = inject('useNotifications')();
+
+// Check if notifications module is loaded
+const useNotifications = inject('useNotifications');
+
+// Provide fallback values if module is not loaded
+const { notifications, unreadCount, loading, markAllAsRead, getNotifications } = useNotifications ? useNotifications() : {
+  notifications: ref([]),
+  unreadCount: ref(0),
+  loading: ref(false),
+  markAllAsRead: () => {},
+  getNotifications: () => {}
+};
 
 // Local state
 const isOpen = ref(false);

package/src/modules/notifications/controllers/notifications.controller.js

@@ -129,6 +129,37 @@ const NotificationsController = (db, wss, notificationService) => {
         return res.status(400).json({ message: 'Either userId or anonymousId is required' });
       }
       
+      // First, try to find existing device by deviceToken
+      let existingDevice = await db.userDevice.findOne({ deviceToken });
+      
+      if (existingDevice) {
+        // Device with this token already exists, update it
+        console.log('[RegisterDevice] Found existing device by token, updating...');
+        
+        if (userId) {
+          // Transfer device from anonymous to authenticated user
+          existingDevice.userId = userId;
+          existingDevice.anonymousId = undefined;
+          existingDevice.isAnonymous = false;
+        } else {
+          // Update anonymous device
+          existingDevice.anonymousId = anonymousId;
+          existingDevice.userId = undefined;
+          existingDevice.isAnonymous = true;
+        }
+        
+        // Update common fields
+        existingDevice.deviceId = deviceId;
+        existingDevice.deviceType = deviceType;
+        existingDevice.lastActive = Date.now();
+        existingDevice.isActive = true;
+        
+        await existingDevice.save();
+        console.log('[RegisterDevice] Device updated:', existingDevice._id);
+        return res.status(200).json(existingDevice);
+      }
+      
+      // No existing device with this token, proceed with original logic
       // Build the filter based on whether user is authenticated or anonymous
       let filter;
       if (userId) {

package/dist/martyrs/src/components/Button/Button.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Button.vue2.cjs","sources":["../../../../../src/components/Button/Button.vue"],"sourcesContent":["<script setup>\nimport { ref } from 'vue'\n\nimport Loader from '@martyrs/src/components/Loader/Loader.vue'\n\nimport IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue';\nimport IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';\n\nconst props = defineProps({\n  submit: {\n    type: Function,\n    default: async () => { console.log('Button click.') }\n  },\n  text: {\n    type: Object,\n    default: () => ({\n      success: null,\n      error: null\n    })\n  },\n  counter: {\n    type: Object\n  },\n  callback: {\n    type: Function,\n    default: async () => { console.log('Button callback.') }\n  },\n  callbackDelay: {\n    type: Number,\n    default: 750\n  },\n  showSucces: {\n    type: Boolean,\n    default: true\n  },\n  showLoader: {\n    type: Boolean,\n    default: true\n  },\n  validation: {\n    type: Boolean,\n    default: false\n  },\n})\n\nconst emits = defineEmits(['error'])\n\nconst button = ref(null)\nconst error = ref(null)\nconst loading = ref(false)\nconst finished = ref(false)\n\nasync function Submit() {\n  console.log('click')\n  \n  button.value.style['pointer-events'] = 'none'\n  error.value = null\n  loading.value = true\n\n  // Функция для сброса состояния кнопки\n  const resetButton = () => {\n    if (button.value) {\n      button.value.style.pointerEvents = 'auto'\n      loading.value = false\n      finished.value = false\n      error.value = null\n    }\n  }\n\n  try {\n    await props.submit()\n\n    button.value.classList.replace('bg-main', 'bg-second')\n    loading.value = false\n\n    // Используем функцию сброса состояния кнопки здесь\n    if (props.showSucces) { \n      finished.value = true\n      setTimeout(() => {\n        resetButton()\n        button.value.classList.replace('bg-second', 'bg-main')\n      }, 500)\n    } else {\n      resetButton()\n      button.value.classList.replace('bg-second', 'bg-main')\n    }\n\n    // Если есть callback, мы также установим таймер для его вызова\n    if (props.callback) setTimeout(() => props.callback(), props.callbackDelay)\n\n  } catch (err) {\n    emits('error', err)\n    // Если возникла ошибка, мы изменяем стили и устанавливаем сообщение об ошибке\n    button.value.classList.replace('bg-main', 'bg-fourth-nano')\n    loading.value = false\n    error.value = true\n    \n    // После задержки снова сбрасываем состояние кнопки\n    setTimeout(() => {\n      resetButton()\n      // Так как класс кнопки был изменен, вернем его в исходное состояние\n      button.value.classList.replace('bg-fourth-nano', 'bg-main')\n    }, 1330)\n  }\n}\n</script>\n\n<template>\n  <button \n    @click.stop=\"Submit\"\n    :disabled=\"validation\"\n    ref=\"button\"\n\t\tclass=\"button\"\n    :class=\"{ 'button--disabled': loading || validation }\"\n  >\n    <Transition name=\"content\" mode=\"out-in\">\n      <!-- Default slot content -->\n      <span v-if=\"!loading && !error && !finished || !showLoader\" class=\"button-content\">\n        <slot></slot>\n      </span>\n      <!-- Loading state -->\n      <Loader v-else-if=\"loading && !error && showLoader\"   class=\"icon button-content pos-relative pos-t-0 pos-l-0 loading\"/>\n      <!-- Success state -->\n      <span v-else-if=\"finished && showSucces\" class=\"button-content t-semi t-center w-100 loading t-black\">\n        <template v-if=\"text.success\">\n          {{ text.success }}\n        </template>\n        <IconCheckmark v-else class=\"icon\" />\n      </span>\n      <!-- Error state -->\n      <span v-else-if=\"error\" class=\"button-content t-center w-100 error\">\n        <template v-if=\"text.error\">\n          {{ text.error }}\n        </template>\n        <IconCross v-else class=\"icon\" />\n      </span>\n    </Transition>\n    \n    <!-- Counter -->\n    <div v-if=\"counter\" class=\"button-counter flex flex-center\">\n      <span>{{ counter }}</span>\n    </div>\n  </button>\n</template>\n\n<style lang=\"scss\">\nbutton[disabled] {\n  opacity: 0.75 !important;\n  pointer-events: none !important;\n  cursor: default !important;\n  color: rgba(var(--dark), 0.33) !important;\n  background: rgba(var(--light), 1) !important;\n}\n\na.button {\n  text-box: trim-both cap alphabetic;\n}\n\n.button {\n  display: flex;\n  padding: var(--small);\n  border-radius: var(--small);\n  text-box: trim-both cap alphabetic;\n  transform: scale(1);\n  opacity: 1;\n  align-items: center;\n  justify-content: center;\n  color: black;\n  text-align: center;\n  text-transform: uppercase;\n  font-size: 1rem;\n  letter-spacing: 5%;\n  transition: all 0.33s ease;\n\n  &:hover {\n    cursor: pointer;\n    opacity: 0.9;\n  }\n\n  &:active {\n    transform: scale(0.95);\n  }\n\n  &-small {\n    padding: 0.75rem;\n    border-radius: 0.5rem;\n    height: fit-content;\n  }\n\n  .button-counter {\n    position: absolute;\n    right: -8px;\n    bottom: -8px;\n    background: yellow;\n    height: 16px;\n    border-radius: 16px;\n    width: 16px;\n    font-weight: 500;\n    text-align: center;\n    line-height: 16px;\n    font-size: 10px;\n  }\n}\n\n.button-content {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  gap: 8px;\n}\n\n.icon {\n  width: 1rem;\n  height: 1rem;\n}\n\n/* Vue Transitions */\n.content-enter-active,\n.content-leave-active {\n  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);\n}\n\n.content-enter-from {\n  opacity: 0;\n  transform: translateY(8px) scale(0.95);\n}\n\n.content-leave-to {\n  opacity: 0;\n  transform: translateY(-8px) scale(0.95);\n}\n\n.content-enter-to,\n.content-leave-from {\n  opacity: 1;\n  transform: translateY(0) scale(1);\n}\n</style>"],"names":["ref"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,UAAM,QAAQ;AAqCd,UAAM,QAAQ;AAEd,UAAM,SAASA,IAAAA,IAAI,IAAI;AACvB,UAAM,QAAQA,IAAAA,IAAI,IAAI;AACtB,UAAM,UAAUA,IAAAA,IAAI,KAAK;AACzB,UAAM,WAAWA,IAAAA,IAAI,KAAK;AAE1B,mBAAe,SAAS;AACtB,cAAQ,IAAI,OAAO;AAEnB,aAAO,MAAM,MAAM,gBAAgB,IAAI;AACvC,YAAM,QAAQ;AACd,cAAQ,QAAQ;AAGhB,YAAM,cAAc,MAAM;AACxB,YAAI,OAAO,OAAO;AAChB,iBAAO,MAAM,MAAM,gBAAgB;AACnC,kBAAQ,QAAQ;AAChB,mBAAS,QAAQ;AACjB,gBAAM,QAAQ;AAAA,QAChB;AAAA,MACF;AAEA,UAAI;AACF,cAAM,MAAM,OAAM;AAElB,eAAO,MAAM,UAAU,QAAQ,WAAW,WAAW;AACrD,gBAAQ,QAAQ;AAGhB,YAAI,MAAM,YAAY;AACpB,mBAAS,QAAQ;AACjB,qBAAW,MAAM;AACf,wBAAW;AACX,mBAAO,MAAM,UAAU,QAAQ,aAAa,SAAS;AAAA,UACvD,GAAG,GAAG;AAAA,QACR,OAAO;AACL,sBAAW;AACX,iBAAO,MAAM,UAAU,QAAQ,aAAa,SAAS;AAAA,QACvD;AAGA,YAAI,MAAM,SAAU,YAAW,MAAM,MAAM,SAAQ,GAAI,MAAM,aAAa;AAAA,MAE5E,SAAS,KAAK;AACZ,cAAM,SAAS,GAAG;AAElB,eAAO,MAAM,UAAU,QAAQ,WAAW,gBAAgB;AAC1D,gBAAQ,QAAQ;AAChB,cAAM,QAAQ;AAGd,mBAAW,MAAM;AACf,sBAAW;AAEX,iBAAO,MAAM,UAAU,QAAQ,kBAAkB,SAAS;AAAA,QAC5D,GAAG,IAAI;AAAA,MACT;AAAA,IACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Loader/Loader.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Loader.vue2.cjs","sources":["../../../../../src/components/Loader/Loader.vue"],"sourcesContent":["<template>\n  <div class=\"circular-loader pos-relative z-index-1 w-100 h-100 w-max-2r h-max-2r\" :class=\"{ 'circular-loader-centered': centered }\">\n    <svg viewBox=\"25 25 50 50\">\n      <circle class=\"circular-loader-fill\" cx=\"50\" cy=\"50\" r=\"20\" fill=\"none\" stroke-width=\"4\" stroke-miterlimit=\"10\" />\n      <circle class=\"circular-loader-circle\" cx=\"50\" cy=\"50\" r=\"20\" fill=\"none\" stroke-width=\"4\" stroke-miterlimit=\"10\" />\n    </svg>\n    <div v-if=\"progress\" class=\"progress-text\">{{ progress }}</div>\n    <div v-if=\"status\" class=\"uppercase t-semi w-m-10r status-text\">{{ status }}</div>\n  </div>\n</template>\n\n<script>\nexport default {\n  props: {\n    progress: {\n      type: Number,\n      default: null,\n    },\n    status: {\n      type: String,\n      default: null,\n    },\n    centered: {\n      type: Boolean,\n      default: true, // По умолчанию лоадер центрирован (для обратной совместимости)\n    },\n  },\n};\n</script>\n\n<style>\n.circular-loader-centered {\n  top: calc(50% - 1rem);\n  left: calc(50% - 1rem);\n}\n\n.circular-loader svg {\n  animation: rotate 2s linear infinite;\n}\n\n.circular-loader-circle {\n  stroke-dasharray: 1, 200;\n  stroke-dashoffset: 0;\n  stroke-linecap: round;\n  stroke: rgb(var(--main));\n  animation: dash 1.5s ease-in-out infinite;\n}\n\n.circular-loader-fill {\n  stroke-linecap: round;\n  stroke: rgba(var(--black),0.2);\n}\n\n.progress-text {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  font-size: 0.8rem;\n  color: rgb(var(--main));;\n}\n\n.status-text {\n  position: absolute;\n  top: 120%;\n  left: calc(50% - 5rem);\n  font-size: 0.8rem;\n  width: 10rem !important;\n  text-align: center;\n}\n\n@keyframes rotate {\n  100% {\n    transform: rotate(360deg);\n  }\n}\n\n@keyframes dash {\n  0% {\n    stroke-dasharray: 1, 200;\n    stroke-dashoffset: 0;\n  }\n  50% {\n    stroke-dasharray: 89, 200;\n    stroke-dashoffset: -35;\n  }\n  100% {\n    stroke-dasharray: 1, 200;\n    stroke-dashoffset: -124;\n  }\n}\n</style>"],"names":["_createElementBlock","_normalizeClass","_createElementVNode","_toDisplayString","_createCommentVNode"],"mappings":";;;;;AAYA,MAAK,YAAU;AAAA,EACb,OAAO;AAAA,IACL,UAAU;AAAA,MACR,MAAM;AAAA,MACN,SAAS;AAAA;IAEX,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,SAAS;AAAA;IAEX,UAAU;AAAA,MACR,MAAM;AAAA,MACN,SAAS;AAAA;AAAA;;AAGf;;EA3BA,KAAA;AAAA,EAMyB,OAAM;;;EAN/B,KAAA;AAAA,EAOuB,OAAM;;;0BAN3BA,IAAAA,mBAOM,OAAA;AAAA,IAPD,OADPC,IAAAA,eAAA,CACa,wEAAsE,EAAA,4BAAuC,OAAA,UAAQ,CAAA;AAAA;8BAC9HC,IAAAA,mBAGM,OAAA,EAHD,SAAQ,iBAAa;AAAA,MACxBA,IAAAA,mBAAkH,UAAA;AAAA,QAA1G,OAAM;AAAA,QAAuB,IAAG;AAAA,QAAK,IAAG;AAAA,QAAK,GAAE;AAAA,QAAK,MAAK;AAAA,QAAO,gBAAa;AAAA,QAAI,qBAAkB;AAAA;MAC3GA,IAAAA,mBAAoH,UAAA;AAAA,QAA5G,OAAM;AAAA,QAAyB,IAAG;AAAA,QAAK,IAAG;AAAA,QAAK,GAAE;AAAA,QAAK,MAAK;AAAA,QAAO,gBAAa;AAAA,QAAI,qBAAkB;AAAA;;IAEpG,OAAA,6BAAXF,IAAAA,mBAA+D,OAA/D,YAA+DG,IAAAA,gBAAjB,OAAA,QAAQ,GAAA,CAAA,KAN1DC,IAAAA,mBAAA,IAAA,IAAA;AAAA,IAOe,OAAA,2BAAXJ,IAAAA,mBAAkF,OAAlF,YAAkFG,IAAAA,gBAAf,OAAA,MAAM,GAAA,CAAA,KAP7EC,IAAAA,mBAAA,IAAA,IAAA;AAAA;;;;"}