@ozdao/martyrs 0.2.538 → 0.2.540

package/dist/martyrs/src/modules/products/components/sections/FilterProducts.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.vue.cjs");
+const Spoiler = require("../../../../components/Spoiler/Spoiler.vue2.cjs");
 const Checkbox = require("../../../../components/Checkbox/Checkbox.vue.cjs");
 const vueI18n = require("vue-i18n");
 const vueRouter = require("vue-router");

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

@@ -1,5 +1,5 @@
 import { ref, watch, onMounted, createElementBlock, openBlock, createVNode, createElementVNode, withCtx, Fragment, renderList, createBlock, toDisplayString, unref } from "vue";
-import _sfc_main$1 from "../../../../components/Spoiler/Spoiler.vue.js";
+import _sfc_main$1 from "../../../../components/Spoiler/Spoiler.vue2.js";
 import _sfc_main$2 from "../../../../components/Checkbox/Checkbox.vue.js";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";

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.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.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.vue.js";
+import _sfc_main$4 from "../../../../components/Button/Button.vue2.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.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.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.vue.js";
+import _sfc_main$4 from "../../../../components/Button/Button.vue2.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.vue.cjs");
-const Tab = require("../../../../components/Tab/Tab.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Tab = require("../../../../components/Tab/Tab.vue2.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.vue.js";
-import _sfc_main$3 from "../../../../components/Tab/Tab.vue.js";
+import _sfc_main$4 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$3 from "../../../../components/Tab/Tab.vue2.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.vue.cjs");
-const Button = require("../../../../../../components/Button/Button.vue.cjs");
+const Tab = require("../../../../../../components/Tab/Tab.vue2.cjs");
+const Button = require("../../../../../../components/Button/Button.vue2.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.vue.js";
-import _sfc_main$3 from "../../../../../../components/Button/Button.vue.js";
+import _sfc_main$2 from "../../../../../../components/Tab/Tab.vue2.js";
+import _sfc_main$3 from "../../../../../../components/Button/Button.vue2.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.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.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.vue.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue2.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.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.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.vue.js";
+import _sfc_main$1 from "../../../../components/Button/Button.vue2.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.vue.cjs");
+const Spoiler = require("../../../../components/Spoiler/Spoiler.vue2.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.vue.js";
+import _sfc_main$1 from "../../../../components/Spoiler/Spoiler.vue2.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.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.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.vue.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue2.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.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.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.vue.js";
+import _sfc_main$1 from "../../../../components/Button/Button.vue2.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.vue.cjs");
+const Button = require("../../../../../components/Button/Button.vue2.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.vue.js";
+import _sfc_main$1 from "../../../../../components/Button/Button.vue2.js";
 import "vue-router";
 /* empty css                                            */
 /* empty css                                              */

package/dist/notifications.server.cjs

@@ -116,19 +116,25 @@ 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 });
+      let existingDevice;
+      if (userId) {
+        existingDevice = await db.userDevice.findOne({ userId, deviceId });
+      } else {
+        existingDevice = await db.userDevice.findOne({ anonymousId, deviceId });
+      }
       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;
+        console.log("[RegisterDevice] Found existing device by userId/anonymousId + deviceId, updating...");
+        if (existingDevice.deviceToken !== deviceToken) {
+          const tokenConflict = await db.userDevice.findOne({
+            deviceToken,
+            _id: { $ne: existingDevice._id }
+          });
+          if (tokenConflict) {
+            console.log("[RegisterDevice] Removing conflicting device with token:", tokenConflict._id);
+            await tokenConflict.deleteOne();
+          }
         }
-        existingDevice.deviceId = deviceId;
+        existingDevice.deviceToken = deviceToken;
         existingDevice.deviceType = deviceType;
         existingDevice.lastActive = Date.now();
         existingDevice.isActive = true;
@@ -136,13 +142,12 @@ const NotificationsController = (db, wss, notificationService) => {
         console.log("[RegisterDevice] Device updated:", existingDevice._id);
         return res.status(200).json(existingDevice);
       }
-      let filter;
-      if (userId) {
-        filter = { userId, deviceId };
-      } else {
-        filter = { anonymousId, deviceId };
+      const tokenDevice = await db.userDevice.findOne({ deviceToken });
+      if (tokenDevice) {
+        console.log("[RegisterDevice] Token already exists for different device, removing old device:", tokenDevice._id);
+        await tokenDevice.deleteOne();
       }
-      const updateData = {
+      const deviceData = {
         deviceId,
         deviceType,
         deviceToken,
@@ -151,19 +156,13 @@ const NotificationsController = (db, wss, notificationService) => {
         isAnonymous: !userId
       };
       if (userId) {
-        updateData.userId = userId;
-        updateData.$unset = { anonymousId: 1 };
+        deviceData.userId = userId;
       } else {
-        updateData.anonymousId = anonymousId;
-        updateData.$unset = { userId: 1 };
+        deviceData.anonymousId = anonymousId;
       }
-      const device = await db.userDevice.findOneAndUpdate(
-        filter,
-        updateData,
-        { upsert: true, new: true, setDefaultsOnInsert: true }
-      );
-      console.log("[RegisterDevice] Device registered/updated:", device._id);
-      return res.status(200).json(device);
+      const device = await db.userDevice.create(deviceData);
+      console.log("[RegisterDevice] New device created:", device._id);
+      return res.status(201).json(device);
     } catch (err) {
       console.error("[RegisterDevice] Error:", err.message);
       return res.status(500).json({ message: err.message });

package/dist/notifications.server.js

@@ -114,19 +114,25 @@ 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 });
+      let existingDevice;
+      if (userId) {
+        existingDevice = await db.userDevice.findOne({ userId, deviceId });
+      } else {
+        existingDevice = await db.userDevice.findOne({ anonymousId, deviceId });
+      }
       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;
+        console.log("[RegisterDevice] Found existing device by userId/anonymousId + deviceId, updating...");
+        if (existingDevice.deviceToken !== deviceToken) {
+          const tokenConflict = await db.userDevice.findOne({
+            deviceToken,
+            _id: { $ne: existingDevice._id }
+          });
+          if (tokenConflict) {
+            console.log("[RegisterDevice] Removing conflicting device with token:", tokenConflict._id);
+            await tokenConflict.deleteOne();
+          }
         }
-        existingDevice.deviceId = deviceId;
+        existingDevice.deviceToken = deviceToken;
         existingDevice.deviceType = deviceType;
         existingDevice.lastActive = Date.now();
         existingDevice.isActive = true;
@@ -134,13 +140,12 @@ const NotificationsController = (db, wss, notificationService) => {
         console.log("[RegisterDevice] Device updated:", existingDevice._id);
         return res.status(200).json(existingDevice);
       }
-      let filter;
-      if (userId) {
-        filter = { userId, deviceId };
-      } else {
-        filter = { anonymousId, deviceId };
+      const tokenDevice = await db.userDevice.findOne({ deviceToken });
+      if (tokenDevice) {
+        console.log("[RegisterDevice] Token already exists for different device, removing old device:", tokenDevice._id);
+        await tokenDevice.deleteOne();
       }
-      const updateData = {
+      const deviceData = {
         deviceId,
         deviceType,
         deviceToken,
@@ -149,19 +154,13 @@ const NotificationsController = (db, wss, notificationService) => {
         isAnonymous: !userId
       };
       if (userId) {
-        updateData.userId = userId;
-        updateData.$unset = { anonymousId: 1 };
+        deviceData.userId = userId;
       } else {
-        updateData.anonymousId = anonymousId;
-        updateData.$unset = { userId: 1 };
+        deviceData.anonymousId = anonymousId;
       }
-      const device = await db.userDevice.findOneAndUpdate(
-        filter,
-        updateData,
-        { upsert: true, new: true, setDefaultsOnInsert: true }
-      );
-      console.log("[RegisterDevice] Device registered/updated:", device._id);
-      return res.status(200).json(device);
+      const device = await db.userDevice.create(deviceData);
+      console.log("[RegisterDevice] New device created:", device._id);
+      return res.status(201).json(device);
     } catch (err) {
       console.error("[RegisterDevice] Error:", err.message);
       return res.status(500).json({ message: err.message });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.538",
+  "version": "0.2.540",
   "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/store/auth.js

@@ -41,9 +41,7 @@ const actions = {
         setAuthToken(accessToken);
 
         // Проверка токена через серверный маршрут
-        console.log('[PERF] Auth API call start:', Date.now());
         const response = await $axios.get('/api/organizations/check-accesses');
-        console.log('[PERF] Auth API call done:', Date.now());
         const userAccesses = response.data;
         state.accesses = userAccesses;
 

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

@@ -71,10 +71,7 @@ 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,15 +50,8 @@ export function createUniversalApp({
     });
     
     // Основная функция создания приложения
-    async function createApp() {
+    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);
@@ -84,10 +77,8 @@ 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);
           }
@@ -202,19 +193,14 @@ 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 на сервере перед каждым запросом
-      // чтобы избежать загрязнения между запросами
+      // Set SSR store for useStore calls
       if (typeof window === 'undefined') {
-        // Сброс SSR store для нового запроса
         const { setSSRStore } = await import('./store.js');
-        setSSRStore(null);
-        
-        // Устанавливаем новый store для этого запроса
         setSSRStore(store);
       }
       
+      
       // if (typeof window === 'undefined') {
       //   moduleRegistry.initialized.clear();
       //   moduleRegistry.modules.clear();
@@ -281,26 +267,18 @@ export function createUniversalApp({
     
     // FOR SSR / CLIENT ENTRY
     if (typeof window !== 'undefined' && !process.env.MOBILE_APP) {
-      createApp().then(({ app, router, store, moduleRegistry }) => {
-        // Ждем когда роутер будет готов
-        router.isReady().then(() => {
-          // Хук ДО гидратации
-          if (hooks.beforeHydration) {
-            hooks.beforeHydration({ app, router, store, moduleRegistry });
-          }
-          
-          app.mount('#app');
-          
-          // Хук ПОСЛЕ гидратации
-          if (hooks.afterHydration) {
-            hooks.afterHydration({ app, router, store, moduleRegistry });
-          }
-          
-          // Создаем context для загрузки модулей
-          const context = { app, store, router, config };
-          
-          // Загружаем auth модуль сразу - он критичен
-          moduleRegistry.load('auth', context).then(() => {
+      // Используем renderAndMountApp для правильной гидратации со state
+      appRenderer.renderAndMountApp({ createApp, hooks }).then(({ app, router, store, moduleRegistry }) => {
+        // Хук ПОСЛЕ гидратации
+        if (hooks.afterHydration) {
+          hooks.afterHydration({ app, router, store, moduleRegistry });
+        }
+        
+        // Создаем context для загрузки модулей
+        const context = { app, store, router, config };
+        
+        // Загружаем auth модуль сразу - он критичен
+        moduleRegistry.load('auth', context).then(() => {
             // Загружаем важные модули в следующем тике
             setTimeout(async () => {
               try {
@@ -325,9 +303,8 @@ export function createUniversalApp({
                 console.error('Error loading non-critical modules:', error);
               }
             });
-          }).catch(error => {
-            console.error('Error loading auth module:', error);
-          });
+        }).catch(error => {
+          console.error('Error loading auth module:', error);
         });
       }).catch(error => {
         console.error('Hydration failed:', error);

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

@@ -97,11 +97,8 @@ 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);