@ozdao/martyrs 0.2.542 → 0.2.544

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-ByKkD9qa.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, p as h, L as b, q as k, M as x, r as B, I, s as T, t as U, u as f, v as w, S as D, w as E, x as L, y as P, z as q, A as y, B as A, D as G, E as j, U as v, G as z, H, m as R } from "./main-d9n_ibdE.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/core/utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utils = require("../../../../../../../_virtual/utils2.cjs");
+const utils = require("../../../../../../../_virtual/utils.cjs");
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils.__exports;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/core/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utils = require("../../../../../../../_virtual/utils.cjs");
+const utils = require("../../../../../../../_virtual/utils2.cjs");
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils.__exports;

package/dist/node_modules/.pnpm/qrcode@1.5.4/node_modules/qrcode/lib/renderer/utils.js

@@ -1,4 +1,4 @@
-import { __exports as utils } from "../../../../../../../_virtual/utils.js";
+import { __exports as utils } from "../../../../../../../_virtual/utils2.js";
 var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;

package/dist/style.css

@@ -795,7 +795,7 @@ button[data-v-2ba40647]:disabled {
   background: white;
 }
 
-.filters-content[data-v-c337ccbe] {
+.filters-content[data-v-d582f4fc] {
   max-height: 60vh;
   overflow-y: auto;
 }
@@ -938,16 +938,16 @@ button[data-v-2ba40647]:disabled {
   height: 100% !important;
   position: relative !important;
 }
-.image-upload-area[data-v-78cc3140] {
+.image-upload-area[data-v-26da6988] {
   overflow: hidden;
   transition: all 0.3s ease;
 }
-.image-upload-area[data-v-78cc3140]:hover {
+.image-upload-area[data-v-26da6988]:hover {
   opacity: 0.95;
 }
 
 /* Hover controls */
-.hover-controls[data-v-78cc3140] {
+.hover-controls[data-v-26da6988] {
   top: 0;
   left: 0;
   background: rgba(0, 0, 0, 0.7);
@@ -955,25 +955,25 @@ button[data-v-2ba40647]:disabled {
   transition: opacity 0.3s ease;
   pointer-events: none;
 }
-.image-upload-area:hover .hover-controls[data-v-78cc3140] {
+.image-upload-area:hover .hover-controls[data-v-26da6988] {
   opacity: 1;
   pointer-events: all;
 }
-.hover-upload-icon[data-v-78cc3140] {
-  animation: pulse-78cc3140 1.5s infinite;
+.hover-upload-icon[data-v-26da6988] {
+  animation: pulse-26da6988 1.5s infinite;
 }
-.hover-button[data-v-78cc3140] {
+.hover-button[data-v-26da6988] {
   transition: transform 0.2s ease, background-color 0.2s ease;
 }
-.hover-button[data-v-78cc3140]:hover {
+.hover-button[data-v-26da6988]:hover {
   transform: scale(1.1);
 }
-.hover-button[data-v-78cc3140]:active {
+.hover-button[data-v-26da6988]:active {
   transform: scale(0.95);
 }
 
 /* Loading overlay */
-.loading-overlay[data-v-78cc3140] {
+.loading-overlay[data-v-26da6988] {
   top: 0;
   left: 0;
   background: rgba(255, 255, 255, 0.9);
@@ -981,7 +981,7 @@ button[data-v-2ba40647]:disabled {
 }
 
 /* Animations */
-@keyframes pulse-78cc3140 {
+@keyframes pulse-26da6988 {
 0% {
     transform: scale(1);
     opacity: 1;
@@ -997,10 +997,10 @@ button[data-v-2ba40647]:disabled {
 }
 
 /* Upload icon in empty state */
-.upload-icon[data-v-78cc3140] {
+.upload-icon[data-v-26da6988] {
   transition: transform 0.3s ease;
 }
-.image-upload-area:hover .upload-icon[data-v-78cc3140] {
+.image-upload-area:hover .upload-icon[data-v-26da6988] {
   transform: scale(1.1);
 }
 .editable-div {
@@ -1136,12 +1136,12 @@ button[data-v-2ba40647]:disabled {
     font-size: .85em;
 }
 
-.fade-enter-active[data-v-c1b1de8c],
-.fade-leave-active[data-v-c1b1de8c] {
+.fade-enter-active[data-v-92c9eb06],
+.fade-leave-active[data-v-92c9eb06] {
   transition: opacity 0.3s ease;
 }
-.fade-enter-from[data-v-c1b1de8c],
-.fade-leave-to[data-v-c1b1de8c] {
+.fade-enter-from[data-v-92c9eb06],
+.fade-leave-to[data-v-92c9eb06] {
   opacity: 0;
 }
 .slider-hotpost :deep(.carousel__slide) {
@@ -2537,10 +2537,10 @@ to { opacity: 1; transform: translateY(0);
     min-width: 0;
 }
 }
-.discount-card[data-v-e5d1ccd1] {
+.discount-card[data-v-e985863b] {
   transition: all 0.2s ease;
 }
-.discount-card[data-v-e5d1ccd1]:hover {
+.discount-card[data-v-e985863b]:hover {
   border-color: rgb(var(--main));
 }
 
@@ -3464,10 +3464,10 @@ html.barcode-scanner-active-html {
 .order-card .block {
   border-radius: 0;
   border: 0;
-}.blink[data-v-83eadb3a] {
-  animation: blink-animation-83eadb3a 1s ease infinite;
+}.blink[data-v-895f54da] {
+  animation: blink-animation-895f54da 1s ease infinite;
 }
-@keyframes blink-animation-83eadb3a {
+@keyframes blink-animation-895f54da {
 0%, 100% {
     opacity: 1;
 }

package/dist/{web-BklgIiYr.js → web-BkaOiiSn.js}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-ByKkD9qa.js";
+import { W as p } from "./main-d9n_ibdE.js";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/dist/{web-CQBm7C6L.cjs → web-CROHFHoW.cjs}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-Czyu-VcC.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-8f945Ngn.cjs");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.542",
+  "version": "0.2.544",
   "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/builder/modes/ssr.prod.js

@@ -42,6 +42,7 @@ export default function createSsrProdServer(projectRoot, configs, createServer)
       }
 
       const initialState = JSON.stringify(state);
+      const loadedModulesJson = JSON.stringify(loadedModules || []);
 
       // Используем loadedModules если они есть, иначе usedModules
       const modulesToLoad = loadedModules || usedModules || [];
@@ -55,6 +56,7 @@ export default function createSsrProdServer(projectRoot, configs, createServer)
         head,
         body,
         initialState,
+        loadedModulesJson,
       });
       
       // Обрабатываем HTML через Beasties для извлечения критического CSS

package/src/builder/modes/ssr.rspack.dev.js

@@ -120,6 +120,7 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
       }
 
       const initialState = JSON.stringify(state);
+      const loadedModulesJson = JSON.stringify(loadedModules || []);
 
       let completeHtml = await renderHtml({
         appHtml: html,
@@ -127,6 +128,7 @@ export default function createSsrDevServer(projectRoot, configs, createServer) {
         head,
         body,
         initialState,
+        loadedModulesJson,
       });
       
       // Обрабатываем HTML через Beasties для извлечения критического CSS

package/src/builder/templates/page.js

@@ -25,6 +25,10 @@ export default `
       <script type="application/json" data-state>
         {{{ initialState }}}
       </script>
+
+      <script type="application/json" data-loaded-modules>
+        {{{ loadedModulesJson }}}
+      </script>
       
       {{{ meta.body }}} {{{ body }}}
       

package/src/builder/templates/screen.js

@@ -31,6 +31,10 @@ export default `
         {{{ initialState }}}
       </script>
 
+      <script type="application/json" data-loaded-modules>
+        {{{ loadedModulesJson }}}
+      </script>
+
       <script>
         window.dataLayer = window.dataLayer || [];
         function gtag(){dataLayer.push(arguments);}

package/src/components/Feed/Carousel.vue

@@ -34,10 +34,13 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
 import Loader from '@martyrs/src/components/Loader/Loader.vue'
 import Slider from '@martyrs/src/components/Slider/Slider.vue'
 import EmptyState from '@martyrs/src/components/EmptyState/EmptyState.vue';
 
+const { replaceClasses } = useGlobalMixins();
+
 const props = defineProps({
   showDots: Boolean,
   store: Object,

package/src/components/Feed/Feed.vue

@@ -166,6 +166,7 @@
 
 <script setup>
 import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
 
 import SkeletonEvent from '@martyrs/src/modules/icons/skeletons/SkeletonEvent.vue'
 
@@ -187,6 +188,8 @@ import ButtonDate  from '@martyrs/src/modules/globals/views/components/elements/
 import IconFilter from '@martyrs/src/modules/icons/navigation/IconFilter.vue'
 import IconEvents from '@martyrs/src/modules/icons/entities/IconEvents.vue'
 
+const { replaceClasses } = useGlobalMixins();
+
 const search = defineModel('search')
 const sort = defineModel('sort')
 const filter = defineModel('filter')

package/src/components/Tab/Tab.vue

@@ -18,7 +18,9 @@
 
 <script setup>
 import { ref, computed, watch } from 'vue'
+import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
 
+const { replaceClasses } = useGlobalMixins();
 const emit = defineEmits(['update:selected', 'tab-click']);
 
 const props = defineProps({

package/src/components/UploadImage/UploadImage.vue

@@ -4,21 +4,21 @@
       @click="onComponentClick"
       @drop="onDrop"
       @dragover.prevent
-      class="pos-relative bg-light radius-small br-solid br-1px br-black-transp-10 h-100 aspect-1x1 flex-v-center flex-h-center flex cursor-pointer"
+      class="pos-relative radius-small br-solid br-1px br-black-transp-10 h-100 aspect-1x1 flex-v-center flex-h-center flex cursor-pointer"
     >
       <img loading="lazy" 
         v-if="imageUrl || photo || previewUrl" 
         :src="previewUrl || (FILE_SERVER_URL || '') + (imageUrl || photo)"
         alt="Uploaded image" 
-        class="pos-absolute z-index-1 w-100 h-100 object-fit-cover"
+        class="pos-absolute  radius-small o-hidden z-index-1 w-100 h-100 object-fit-cover"
       />
       
-      <div v-else class="flex-v-center z-index-2 flex-h-center flex w-100 h-100 bg-second" >
+      <div v-else class="flex-v-center pos-relative z-index-2 flex-h-center flex w-100 h-100 radius-small  bg-second" >
         <IconUpload class="i-medium upload-icon" fill="rgb(var(--white))" />
       </div>
       
       <!-- Hover controls -->
-      <div class="z-index-2 hover-controls pos-absolute w-100 h-100 flex-v-center flex-h-center flex">
+      <div class="z-index-2 pos-relative  hover-controls pos-absolute w-100 h-100 flex-v-center flex-h-center flex">
         <div v-if="!imageUrl && !photo && !previewUrl" class="hover-upload-icon">
           <IconUpload class="i-medium" fill="rgb(var(--white))" />
         </div>

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -14,7 +14,7 @@
     	:creator="blogpost.creator"
     	:date="blogpost.createdAt"
     	:actions="user && user === blogpost.creator.target._id ? [
-        { to: { name: 'Edit BlogPost', params: {url: blogpost.url } }, label: 'Edit' }
+        { to: `/community/posts/${blogpost.url}/edit`, label: 'Edit' }
        ]: null"
 		/>
 
@@ -30,12 +30,7 @@
 				 	:text="blogpost.name || ''" 
 				 	:maxLen="80" 
 				 	class="h3 d-block"
-				 	@click="router.push({
-						name: 'BlogPost', 
-						params: { 
-							url: blogpost.url 
-						}
-					})"
+				 	@click="router.push(`/community/posts/${blogpost.url}`)"
 				/>
 
 				<div 

package/src/modules/community/components/blocks/FooterBlogpost.vue

@@ -1,11 +1,6 @@
 <template>
   <footer class="t-semi br-top-dark flex-nowrap flex-nojustify flex">
-    <router-link :to="{
-      name: 'BlogPost', 
-      params: { 
-        url: blogpost.url 
-      }
-    }" 
+    <router-link :to="`/community/posts/${blogpost.url}`" 
     class="font-second cursor-pointer hover-bg-white pd-l-thin pd-r-thin radius-big">
       👁️ {{blogpost.views}}
     </router-link>
@@ -18,13 +13,7 @@
         👍 {{reactionsCount }}
       </div>
     </div>
-    <router-link :to="{
-      name: 'BlogPost', 
-      hash: '#comments',
-      params: { 
-        url: blogpost.url 
-      }
-    }" 
+    <router-link :to="`/community/posts/${blogpost.url}#comments`" 
     class="font-second cursor-pointer hover-bg-white pd-l-thin pd-r-thin radius-big">
       💬 {{ blogpost.numberOfComments }}
     </router-link>

package/src/modules/events/components/pages/Event.vue

@@ -143,8 +143,10 @@ import * as tickets from '@martyrs/src/modules/events/store/tickets.js';
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 
 import { useRoute } from 'vue-router';
+import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
 
 const route = useRoute();
+const { returnCurrency, formatDate } = useGlobalMixins();
 const qrcode = ref(null);
 
 const handleTicketUpdate = ({ ticket, hasTicket, targetId }) => {

package/src/modules/globals/TASK.MD

@@ -1 +1,105 @@
-TASK.MD
+# Проблема с отображением лоадера при загрузке модулей
+
+## Описание проблемы
+При переходе на роут, который требует загрузки нового модуля:
+1. После клика на ссылку UI полностью блокируется
+2. Начинается загрузка модуля (2-3 секунды)
+3. Лоадер показывается только ПОСЛЕ загрузки модуля на мгновение
+4. Затем происходит переход на новый роут
+
+**Ожидаемое поведение:** Лоадер должен показываться СРАЗУ после клика, до начала загрузки модулей.
+
+## Технические детали
+
+### Архитектура загрузки модулей
+- **Файл:** `globals.app.js:89-119`
+- Модули загружаются динамически в `router.beforeEach` guard
+- Модули регистрируют роуты через `router.addRoute()` после загрузки
+- После загрузки возвращается `to.fullPath` для повторной навигации
+
+### Условие показа лоадера
+- **Файл:** `Client.vue:16`
+- Условие: `v-if="!page || globals.state.loading"`
+- `page` - ref на текущий компонент страницы
+- `globals.state.loading` - глобальный флаг загрузки
+
+## Корень проблемы
+Vue Router `beforeEach` guard блокирует все обновления DOM до своего завершения:
+- Guards выполняются синхронно и блокируют навигацию
+- Vue не может обновить DOM пока `beforeEach` не завершится
+- Даже установка `globals.state.loading = true` не приводит к рендерингу
+
+**Подтверждение из документации Vue Router:**
+> "Guards may be resolved asynchronously, and the navigation is considered pending before all hooks have been resolved"
+
+**GitHub issue vuejs/vue #9200:**
+> "Vue.nextTick doesn't seem to cover browser re-render"
+
+## Что пробовали и не сработало
+
+### 1. nextTick после установки loading флага
+```javascript
+store.globals.state.loading = true;
+await nextTick();
+```
+**Результат:** Не работает, т.к. nextTick работает с микротасками, которые выполняются ДО отрисовки браузером
+
+### 2. requestAnimationFrame
+```javascript
+store.globals.state.loading = true;
+await new Promise(resolve => requestAnimationFrame(resolve));
+```
+**Результат:** Не работает, beforeEach все равно блокирует рендеринг
+
+### 3. setTimeout с return false
+```javascript
+setTimeout(async () => {
+  // загрузка модулей
+  router.push(to.fullPath);
+}, 0);
+return false;
+```
+**Результат:** Приводит к 404, т.к. роуты еще не зарегистрированы
+
+### 4. Watch на route.path в Client.vue
+```javascript
+watch(() => route.path, () => {
+  page.value = null;
+});
+```
+**Результат:** Не работает, т.к. route.path меняется только ПОСЛЕ завершения beforeEach
+
+### 5. Свой beforeEach в Client.vue
+```javascript
+router.beforeEach((to, from) => {
+  page.value = null;
+});
+```
+**Результат:** Не работает, все beforeEach выполняются синхронно и блокируют рендеринг
+
+### 6. Создание DOM элемента напрямую
+```javascript
+const loader = document.createElement('div');
+document.body.appendChild(loader);
+```
+**Результат:** Работает, но это хак, обходящий Vue реактивность
+
+## Ограничения
+1. **Нельзя загружать модули после навигации** - модули регистрируют роуты, без них будет 404
+2. **Нельзя загружать модули вне beforeEach** - нужно гарантировать загрузку ДО навигации
+3. **return to.fullPath необходим** - для повторной навигации с новыми роутами
+
+## Возможные решения
+
+### 1. Использовать HTML лоадер (не Vue компонент)
+Добавить лоадер прямо в index.html, показывать/скрывать через классы
+
+### 2. Изменить архитектуру загрузки
+- Предзагружать все возможные роуты
+- Использовать другой подход к динамической регистрации
+
+### 3. Использовать Web Workers
+Загружать модули в воркере, но это потребует полного рефакторинга
+
+## Вывод
+Проблема фундаментальная: Vue Router beforeEach блокирует рендеринг, а мы обязаны загружать модули именно там из-за динамической регистрации роутов. Единственное рабочее решение - создавать лоадер в обход Vue (прямой DOM манипуляцией).