@ozdao/martyrs 0.2.551 → 0.2.553

package/src/components/Media/Media.vue

@@ -1,52 +1,7 @@
-<template>
-  <div class="media-container pos-relative">
-    <!-- Изображение с ленивой загрузкой и placeholder -->
-    <img
-      v-if="isImage"
-      :src="isIntersecting ? url : ''"
-      :data-src="url"
-      :alt="options?.alt || 'Image'"
-      class="media-item"
-      :class="{ 'loading': !isLoaded }"
-      loading="lazy"
-      @load="handleLoad"
-      @error="handleImageError"
-      v-bind="options"
-      ref="imageElement"
-    />
-    
-    <!-- Видео с предварительной загрузкой -->
-    <video
-      v-else-if="isVideo"
-      ref="videoElement"
-      :class="{ 'loading': !isLoaded }"
-      class="media-item"
-      :controls="!options?.hideControls"
-      :loop="options?.loop !== false"
-      :muted="options?.muted !== false"
-      :autoplay="options?.autoplay"
-      :playsinline="options?.playsinline !== false"
-      :preload="options?.preload || 'metadata'"
-      @loadeddata="handleLoad"
-      v-bind="options"
-    >
-      <source :src="url" :type="videoType">
-    </video>
-    
-    <!-- Плейсхолдер во время загрузки -->
-    <div v-if="!isLoaded && !error" class="media-placeholder">
-      Loading...
-    </div>
-    
-    <!-- Сообщение об ошибке -->
-    <div v-if="error" class="media-error">
-      {{ error }}
-    </div>
-  </div>
-</template>
-
 <script setup>
 import { ref, onMounted, computed, onUnmounted } from 'vue'
+import Loader from '@martyrs/src/components/Loader/Loader.vue'
+import IconGallery from '@martyrs/src/modules/icons/entities/IconGallery.vue'
 
 const props = defineProps({
   url: {
@@ -70,6 +25,7 @@ const imageElement = ref(null)
 const isLoaded = ref(false)
 const error = ref(null)
 const isIntersecting = ref(false)
+const hasStartedLoading = ref(false)
 let observer = null
 let isPlaying = false
 let loadTimeout = null
@@ -101,6 +57,7 @@ const videoType = computed(() => {
 
 // Обработчик загрузки медиа
 function handleLoad() {
+  error.value = null
   isLoaded.value = true
   clearTimeout(loadTimeout)
 }
@@ -158,20 +115,31 @@ function setupIntersectionObserver() {
   observer = new IntersectionObserver((entries) => {
     entries.forEach(entry => {
       isIntersecting.value = entry.isIntersecting
-      
+
       if (entry.isIntersecting) {
+        // Отключаем observer сразу чтобы избежать повторных срабатываний
+        observer.disconnect()
+
+        // Защита от повторных срабатываний
+        if (hasStartedLoading.value) return
+
+        hasStartedLoading.value = true
+
+        // Очищаем старый таймаут если он был
+        if (loadTimeout) {
+          clearTimeout(loadTimeout)
+        }
+
         // Устанавливаем таймаут для обнаружения зависшей загрузки
         loadTimeout = setTimeout(() => {
           if (!isLoaded.value && !error.value) {
             error.value = 'Истекло время ожидания загрузки'
           }
         }, 10000) // 10 секунд таймаут
-        
+
         if (isVideo.value && props.options?.autoplay) {
           playVideo()
         }
-        // Отключаем observer после первой загрузки
-        observer.disconnect()
       }
     })
   }, options)
@@ -198,12 +166,62 @@ onUnmounted(() => {
 })
 </script>
 
+<template>
+  <div class="media-container pos-relative">
+    <!-- Изображение с ленивой загрузкой и placeholder -->
+    <img
+      v-if="isImage"
+      :src="hasStartedLoading ? url : ''"
+      :data-src="url"
+      :alt="options?.alt || 'Image'"
+      class="media-item"
+      :class="{ 'loading': !isLoaded }"
+      loading="lazy"
+      @load="handleLoad"
+      @error="handleImageError"
+      v-bind="options"
+      ref="imageElement"
+    />
+    
+    <!-- Видео с предварительной загрузкой -->
+    <video
+      v-else-if="isVideo"
+      ref="videoElement"
+      :class="{ 'loading': !isLoaded }"
+      class="media-item"
+      :controls="!options?.hideControls"
+      :loop="options?.loop !== false"
+      :muted="options?.muted !== false"
+      :autoplay="options?.autoplay"
+      :playsinline="options?.playsinline !== false"
+      :preload="options?.preload || 'metadata'"
+      @loadeddata="handleLoad"
+      v-bind="options"
+    >
+      <source :src="url" :type="videoType">
+    </video>
+    
+    <!-- Плейсхолдер во время загрузки -->
+    <div v-if="!isLoaded && !error" class="media-placeholder">
+      <Loader :centered="false" />
+    </div>
+    
+    <!-- Сообщение об ошибке -->
+    <div v-if="error" class="media-error">
+      <IconGallery :fill="'rgba(var(--dark), 0.1)'" />
+    </div>
+  </div>
+</template>
+
+
 <style scoped>
 .media-container {
 }
 
 .media-item {
-  all: inherit;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
   opacity: 1;
   transition: opacity 0.3s ease;
 }
@@ -221,12 +239,22 @@ onUnmounted(() => {
   display: flex;
   align-items: center;
   justify-content: center;
-  background-color: #f5f5f5;
 }
 
 .media-error {
-  color: #ff4444;
-  padding: 1rem;
-  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(var(--light), 1);
+}
+
+.media-error svg {
+  width: 50%;
+  height: 50%;
 }
 </style>

package/src/components/UploadImageMultiple/UploadImageMultiple.vue

@@ -30,7 +30,8 @@ import axios from 'axios';
 import Loader from '@martyrs/src/components/Loader/Loader.vue';
 import PlaceholderImage from '@martyrs/src/modules/icons/placeholders/PlaceholderImage.vue'
 import IconUpload from '@martyrs/src/modules/icons/navigation/IconUpload.vue'
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+const core = useStore();
 
 const images = ref([]);
 const loading = ref(false);

package/src/modules/auth/auth.client.js

@@ -1,8 +1,16 @@
+// [LOADING 36] Auth module import started
+performance.mark('loading-36-start');
+console.log('[LOADING 36] Auth module import started...');
+
 // Functional imports (needed for initialize function)
 import * as storeAuth from './views/store/auth.js';
 import * as storeTwofa from './views/store/twofa.js';
 import * as storeUsers from './views/store/users.js';
 
+performance.mark('loading-36-stores-end');
+const storesTime = performance.measure('loading-36-stores', 'loading-36-start', 'loading-36-stores-end');
+console.log(`[LOADING 36] Store imports completed in ${storesTime.duration.toFixed(2)}ms`);
+
 // Router
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
 import { getRoutes } from './auth.router.js';
@@ -10,10 +18,14 @@ import { getRoutes } from './auth.router.js';
 // Middlewares
 import * as validationAuth from '@martyrs/src/modules/auth/views/middlewares/auth.validation.js';
 
-import { i18nManager }  from '@martyrs/src/modules/core/views/classes/core.i18n.js';
+import { i18nManager }  from '@martyrs/src/modules/core/views/classes/i18n.manager.js';
 
 import locales from './locales/index.js';
 
+performance.mark('loading-36-imports-end');
+const importsTime = performance.measure('loading-36-imports', 'loading-36-stores-end', 'loading-36-imports-end');
+console.log(`[LOADING 36] Router/middleware/locales imports completed in ${importsTime.duration.toFixed(2)}ms`);
+
 // Component re-exports (enables tree shaking)
 export { default as Auth } from './views/components/layouts/Auth.vue';
 export { default as EnterCode } from './views/components/pages/EnterCode.vue';
@@ -70,4 +82,10 @@ export {
   initializeAuth as initialize,
 };
 
+// [LOADING 36] Auth module import completed
+performance.mark('loading-36-end');
+performance.measure('loading-36-total', 'loading-36-start', 'loading-36-end');
+const totalTime = performance.getEntriesByName('loading-36-total')[0];
+console.log(`[LOADING 36] Auth module fully imported in ${totalTime?.duration?.toFixed(2)}ms`);
+
 export default ModuleAuth;

package/src/modules/auth/auth.router.js

@@ -1,12 +1,14 @@
 // auth.meta.js
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
 import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
 import IconPlus from '@martyrs/src/modules/icons/navigation/IconPlus.vue';
 import { navigationItems } from '@martyrs/src/modules/auth/views/configs/navigation.user.config.js';
 import ProfileCard from '@martyrs/src/modules/auth/views/components/blocks/ProfileCard.vue';
 import HelpCard from '@martyrs/src/modules/core/views/components/blocks/HelpCard.vue';
 
+const { isPhone, isTablet } = useGlobalMixins();
+
 export function getRoutes(options = {}) {
   const route = options.route || 'Home';
   const routes = [];
@@ -133,16 +135,6 @@ export function getRoutes(options = {}) {
         {
           path: ':_id',
           name: 'User Profile Root',
-          beforeEnter: [
-            (to, from) => {
-              const { isPhone, isTablet } = useGlobalMixins();
-              if (!isPhone() && !isTablet()) {
-                core.state.isOpenSidebar = true;  // Desktop: open
-              } else {
-                core.state.isOpenSidebar = false; // Mobile: closed
-              }
-            }
-          ],
           meta: {
             title: {
               en: 'Profile',
@@ -152,6 +144,8 @@ export function getRoutes(options = {}) {
             sidebar_navigation_items: navigationItems,
             sidebar_header_component: ProfileCard,
             sidebar_footer_component: HelpCard,
+            sidebarOpenOnEnter: true,
+            sidebarCloseOnLeave: true
           },
           children: [
             {

package/src/modules/auth/views/components/pages/ProfileEdit.old.vue

@@ -133,9 +133,11 @@
   // Import state
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
   import * as users from '@martyrs/src/modules/auth/views/store/users.js'
-  import * as core from '@martyrs/src/modules/core/views/store/core.store.js'
+  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
   // Import validation
   import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/inputs.validation'
+  const store = useStore()
+  const core = store.core
   const passswordValidation = ref(null)
   // Accessing router
   const route = useRoute()

package/src/modules/auth/views/components/pages/ProfileEditAccount.vue

@@ -36,11 +36,13 @@
   import ProfileEditCredentials from '@martyrs/src/modules/auth/views/components/sections/ProfileEditCredentials.vue'
   
   import { useRouter } from 'vue-router'
-  
+
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
   import * as users from '@martyrs/src/modules/auth/views/store/users.js'
-  import * as core from '@martyrs/src/modules/core/views/store/core.store.js'
-  
+  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
+
+  const store = useStore()
+  const core = store.core
   const router = useRouter()
   
   defineProps({

package/src/modules/auth/views/store/auth.js

@@ -6,8 +6,8 @@ import { Preferences } from '@capacitor/preferences';
 // Vue modules
 import { reactive, watch } from 'vue';
 // Globals
-import { session, setError } from '@martyrs/src/modules/core/views/store/core.store.js';
-import globalWebSocket from '@martyrs/src/modules/core/views/classes/core.websocket.js';
+import { useSession, setError } from '@martyrs/src/modules/core/views/store/core.store.js';
+import wsManager from '@martyrs/src/modules/core/views/classes/ws.manager.js';
 // State
 import * as twofa from './twofa.js';
 
@@ -30,6 +30,9 @@ const state = reactive({
   accesses: [],
 });
 
+// Session manager
+const session = useSession();
+
 const actions = {
   async initialize(cookie) {
     try {
@@ -43,19 +46,19 @@ const actions = {
         // Проверка токена через серверный маршрут
         const response = await $axios.get('/api/organizations/check-accesses');
         const userAccesses = response.data;
+
+        // ТОЛЬКО ПОСЛЕ УСПЕШНОЙ ПРОВЕРКИ устанавливаем состояние
         state.accesses = userAccesses;
+        Object.assign(state.user, { _id, email, phone, avatar });
+        Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
 
         // Update Session with full user data
         session.set({ ...userCookie, accesses: userAccesses });
 
-        // Обновление состояния приложения с информацией о пользователе и его правах доступа
-        Object.assign(state.user, { _id, email, phone, avatar });
-        Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
-        
         // Переподключаем WebSocket если пользователь аутентифицирован
         if (_id && accessToken) {
           console.log('[AUTH] Reconnecting WebSocket for authenticated user:', _id);
-          await globalWebSocket.reconnectWithAuth(_id);
+          await wsManager.reconnectWithAuth(_id);
         }
       } else {
         console.log('no cookies');
@@ -197,7 +200,7 @@ const actions = {
 
     // Отключаем WebSocket при выходе
     console.log('[AUTH] Disconnecting WebSocket on logout');
-    globalWebSocket.disconnect();
+    wsManager.disconnect();
   },
 
   async resetPassword(user, type) {
@@ -269,7 +272,7 @@ const actions = {
 
 // Cookies
 const optionsDefault = {
-  development: { secure: false, expires: 7, sameSite: 'Lax' },
+  development: { path: '/', domain: process.env.DOMAIN_URL, secure: false, expires: 7, sameSite: 'Lax' },
   production: {
     expires: 7,
     path: '/',
@@ -289,7 +292,7 @@ async function getCookie(name) {
   }
 }
 
-async function setCookie(name, data, env = process.env.DOMAIN_URL) {
+async function setCookie(name, data, mode = process.env.NODE_ENV) {
   if (process.env.MOBILE_APP) {
     // Если приложение запущено в Capacitor
     await Preferences.set({
@@ -298,18 +301,24 @@ async function setCookie(name, data, env = process.env.DOMAIN_URL) {
     });
   } else {
     // Для веб-версии
-    Cookies.set(name, JSON.stringify(data), optionsDefault[env]);
+    const options = optionsDefault[mode];
+    console.log('[AUTH COOKIE DEBUG] setCookie', { name, mode, options, domain: process.env.DOMAIN_URL });
+    Cookies.set(name, JSON.stringify(data), options);
   }
 }
 
-async function removeCookie(name, env = process.env.NODE_ENV) {
+async function removeCookie(name, mode = process.env.NODE_ENV) {
   if (process.env.MOBILE_APP) {
     // Если приложение запущено в Capacitor
     await Preferences.remove({ key: name });
   } else {
     // Для веб-версии
-    const options = env === 'production' ? { domain: process.env.DOMAIN_URL, path: '/' } : {};
+    const options = optionsDefault[mode];
+    const allCookiesBefore = typeof document !== 'undefined' ? document.cookie : 'SSR - no document';
+    console.log('[AUTH COOKIE DEBUG] removeCookie BEFORE', { name, mode, options, domain: process.env.DOMAIN_URL, allCookies: allCookiesBefore });
     Cookies.remove(name, options);
+    const allCookiesAfter = typeof document !== 'undefined' ? document.cookie : 'SSR - no document';
+    console.log('[AUTH COOKIE DEBUG] removeCookie AFTER', { allCookies: allCookiesAfter });
   }
 }
 

package/src/modules/chats/store/chat.store.js

@@ -1,4 +1,4 @@
-import globalWebSocket from '@martyrs/src/modules/core/views/classes/core.websocket.js';
+import wsManager from '@martyrs/src/modules/core/views/classes/ws.manager.js';
 import { reactive, readonly } from 'vue';
 
 const state = reactive({
@@ -35,13 +35,13 @@ const methods = {
       console.log('[Chat Store] Subscribing to chat module...');
       
       // Очистка старых листенеров ДО подписки, чтобы избежать дублирования
-      globalWebSocket.removeModuleListeners('chat');
+      wsManager.removeModuleListeners('chat');
       
-      await globalWebSocket.subscribeModule('chat'); // 👈 Подписка на модуль чата
+      await wsManager.subscribeModule('chat'); // 👈 Подписка на модуль чата
       console.log('[Chat Store] Subscribed to chat module');
 
       // Добавляем обработчик входящих сообщений
-      globalWebSocket.addEventListener(
+      wsManager.addEventListener(
         'message',
         data => {
           console.log('[Chat Store] Received message:', data);
@@ -59,7 +59,7 @@ const methods = {
       );
       
       // Обработчик подтверждения прочтения
-      globalWebSocket.addEventListener(
+      wsManager.addEventListener(
         'readReceipt',
         data => {
           console.log('[CHAT STORE] Received readReceipt:', data);
@@ -104,7 +104,7 @@ const methods = {
     // Отправляем joinChat через WebSocket
     const joinMessage = { type: 'joinChat', module: 'chat', chatId };
     console.log('[Chat Store] Sending joinChat:', joinMessage);
-    await globalWebSocket.send(joinMessage);
+    await wsManager.send(joinMessage);
 
     // Загружаем историю сообщений
     try {
@@ -146,7 +146,7 @@ const methods = {
     }
     
     console.log('[Chat Store] Sending message:', messageData);
-    const sendResult = await globalWebSocket.send(messageData);
+    const sendResult = await wsManager.send(messageData);
     console.log('[Chat Store] Send result:', sendResult);
   },
 
@@ -176,7 +176,7 @@ const methods = {
       }
     });
     
-    await globalWebSocket.send({
+    await wsManager.send({
       type: 'markAsRead',
       module: 'chat',
       messageIds: messageIds,
@@ -196,8 +196,8 @@ const methods = {
    * Отключение от чата (очистка листенеров)
    */
   disconnectChat() {
-    globalWebSocket.removeModuleListeners('chat');
-    // globalWebSocket.disconnect(); // включить, если нужно полностью разорвать соединение
+    wsManager.removeModuleListeners('chat');
+    // wsManager.disconnect(); // включить, если нужно полностью разорвать соединение
   },
 };
 

package/src/modules/community/components/pages/Posts.vue

@@ -77,10 +77,11 @@
 
   // Accessing router and store
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
-  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as blog from '@martyrs/src/modules/community/store/blogposts.js';
   import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
   import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
+  const core = useStore();
 
   const route = useRoute()
   const router = useRouter()

package/src/modules/core/TASK.MD

@@ -1,4 +1,6 @@
 Переиименовать все в менеджеры - storeMaganer, wsManager, moduleManager и сделать одинаковый экспорт и имена ws.manager.js, store.manager.js, module.manager.js, i18n.manager.js
+/Users/magicofoz/Development/OZDAO/ozdao.dev/app/martyrs/src/modules/core 
+/Users/magicofoz/Development/OZDAO/ozdao.dev/app/martyrs/src/modules/core/core.client.js
 
 ну и в целом в store.js все сделать как это менеджер сторов названия
 
@@ -7,6 +9,6 @@ import websockets from './views/classes/core.websocket.js';
 import { i18nManager }  from '@martyrs/src/modules/core/views/classes/core.i18n.js';
 import { moduleRegistry } from './views/classes/module-registry.js';
 
-сюда же потом пойдет
+сюда же потом пойдет (это в коменты добавь)
 -нотификейшен менеджер
 -алерт менеджер

package/src/modules/core/core.client.js

@@ -4,7 +4,8 @@ import scrollBehavior from './views/router/scrollBehavior.js';
 
 import * as mixins from './views/mixins/mixins.js';
 import * as storeCore from './views/store/core.store.js';
-import { session } from './views/store/core.store.js';
+import store from './views/store/core.store.js';
+import { useSession } from './views/store/core.store.js';
 import * as appRenderer from './views/utils/vue-app-renderer.js';
 import './views/utils/polyfills.js'; // Auto-apply polyfills
 
@@ -13,10 +14,14 @@ import popupAuthPlugin from './views/plugins/popup.auth.plugin.js';
 import datePickerPlugin from './views/plugins/date-picker.plugin.js';
 import storeDebuggerPlugin from './views/plugins/store-debugger/store-debugger.plugin.js';
 
-import store from './views/store/core.store.js';
-import websockets from './views/classes/core.websocket.js';
-import { i18nManager }  from '@martyrs/src/modules/core/views/classes/core.i18n.js';
-import { moduleRegistry } from './views/classes/module-registry.js';
+
+import { wsManager } from './views/classes/ws.manager.js';
+import { i18nManager }  from '@martyrs/src/modules/core/views/classes/i18n.manager.js';
+import { moduleManager } from './views/classes/module.manager.js';
+
+// Будущие менеджеры:
+// import { notificationManager } from './views/classes/notification.manager.js';
+// import { alertManager } from './views/classes/alert.manager.js';
 
 import en from './locales/en.js';
 import ru from './locales/ru.js';
@@ -71,8 +76,8 @@ function initializeCore(app, store, router, config, options = {}) {
   });
 
   if (config) {
-    if (config.modules) storeCore.state.options = config.modules;
-    storeCore.state.config = config;
+    if (config.modules) store.core.state.options = config.modules;
+    store.core.state.config = config;
   }
 
   // Core module is already registered by default in createStore()
@@ -124,13 +129,13 @@ export {
   appRenderer,
   getBrowserLocale,
   mixins,
-  moduleRegistry,
+  moduleManager,
   scrollBehavior,
   store,
   i18nManager,
   storeCore,
-  session,
-  websockets,
+  useSession,
+  wsManager,
 };
 
 // Export client factory