@ozdao/martyrs 0.2.602 → 0.2.603

package/src/modules/community/router/community.user.router.js

@@ -0,0 +1,15 @@
+const communityUserRoutes = [
+  {
+    path: '',
+    name: 'Posts',
+    meta: {
+      title: {
+        en: 'Posts',
+        ru: 'Посты',
+      },
+    },
+    component: () => import(/* webpackChunkName: "profile-blogposts" */ '@martyrs/src/modules/auth/views/components/pages/ProfileBlogposts.vue'),
+  },
+];
+
+export default communityUserRoutes;

package/src/modules/constructor/components/elements/Textarea.vue

@@ -252,7 +252,7 @@ const handleKeyDown = (event) => {
     currentContent.value = sanitizedContent
     
     emit('update:modelValue', sanitizedContent)
-    emit('addBlock', 'Textarea', newBlockContent, props.index + 1)
+    emit('addBlock', 'Textarea', newBlockContent, props.index)
   } else if (event.key === 'Backspace' && editableDiv.value.innerHTML.trim() === "") {
     event.preventDefault()
     emit('deleteBlock', props.prop, { setCaretToEnd: true })

package/src/modules/constructor/components/sections/Constructor.vue

@@ -59,7 +59,7 @@
                 Remove
               </span>
               <span 
-                @click="handleAddBlock('ImageUpload', '', index)" 
+                @click="handleAddBlock('ImageUpload', '', index)"
                 class="mn-b-thin w-max t-black bg-white button-small button"
               >
                 Add Image

package/src/modules/core/controllers/classes/core.validator.js

@@ -366,7 +366,13 @@ class Validator {
           if (!(validator instanceof Validator)) {
             throw new TypeError(`Property "${key}" must be a Validator instance`);
           }
-          const result = validator.validate(value[key]);
+          const fieldValue = value[key];
+          // Пропускаем null/undefined если поле не обязательное
+          const isRequired = validator.rules.some(r => r.type === 'required');
+          if ((fieldValue === null || fieldValue === undefined) && !isRequired) {
+            continue;
+          }
+          const result = validator.validate(fieldValue);
           if (!result.isValid) {
             this.errors.push(`"${key}" ${result.errors.join(', ')}`);
             return false;

package/src/modules/core/controllers/classes/core.verifier.js

@@ -187,7 +187,6 @@ class Verifier {
         result.verificationErrors = null;
       }
 
-      console.log('Verification result:', result);
       return result;
     };
 
@@ -216,7 +215,6 @@ class Verifier {
           next();
         };
 
-        console.log('verifier result is', processResult)
         if (result instanceof Promise) {
           result.then(processResult).catch(next);
         } else {

package/src/modules/core/controllers/classes/crud/crud.controller.js

@@ -210,9 +210,6 @@ class CRUDController {
   _handleError(error, res) {
     if (res.headersSent) return;
 
-    
-    console.log(error)
-    
     const statusCode = error.statusCode || error.code === 'NOT_FOUND' ? 404 : 500;
     const message = error.message || 'Internal Server Error';
     
@@ -244,7 +241,6 @@ class CRUDController {
       }
       
       // Сохраняем верифицированные данные
-      console.log('verified result', result)
       req.verified = result.verifiedData || data;
       next();
     };

package/src/modules/core/controllers/classes/crud/crud.service.js

@@ -204,6 +204,7 @@ export default class CRUDService {
     
     // Базовые стадии из coreQuery
     stages.push(...coreQuery.getBasicOptions(query));
+    stages.push(...coreQuery.getFilterDate(query.dateStart, query.dateEnd));
 
     // Middle extension
     if (extensions.middle) {

package/src/modules/core/models/schemas/engagement.schema.js

@@ -1,26 +1,23 @@
 export default (function applyEngagementSchema(schema, db) {
   // Добавление нового поля в схему
   schema.add({ views: { type: Number, default: 0 } });
-  // Middleware после агрегации
-  schema.post('aggregate', async function (docs) {
-    // Если документы отсутствуют, выход из функции
-    if (docs.length === 0) return;
-    console.log('Post-aggregate hook in engagement schema triggered');
-    const model = this._model;
-    if (!model) {
-      console.error('No model is associated with this schema!');
-      return;
-    }
-    // Обновление просмотров с обработкой ошибок
-    try {
-      await updateDocumentViews(docs, model);
-    } catch (error) {
-      console.error('Error updating views:', error);
-    }
-  });
-  // Функция для обновления просмотров документов
-  async function updateDocumentViews(docs, model) {
-    const updateViewsPromises = docs.map(doc => model.findOneAndUpdate({ _id: doc._id }, { $inc: { views: 1 } }).exec());
-    await Promise.all(updateViewsPromises);
-  }
+  // // Middleware после агрегации
+  // schema.post('aggregate', async function (docs) {
+  //   if (docs.length === 0) return;
+  //   console.log('Post-aggregate hook in engagement schema triggered');
+  //   const model = this._model;
+  //   if (!model) {
+  //     console.error('No model is associated with this schema!');
+  //     return;
+  //   }
+  //   try {
+  //     await updateDocumentViews(docs, model);
+  //   } catch (error) {
+  //     console.error('Error updating views:', error);
+  //   }
+  // });
+  // async function updateDocumentViews(docs, model) {
+  //   const updateViewsPromises = docs.map(doc => model.findOneAndUpdate({ _id: doc._id }, { $inc: { views: 1 } }).exec());
+  //   await Promise.all(updateViewsPromises);
+  // }
 });

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

@@ -156,9 +156,9 @@ export function createUniversalApp({
             console.log(`[LOADING 18] Modules loaded for route in ${measure18?.duration?.toFixed(2)}ms`);
 
             // После загрузки модулей и регистрации их роутов,
-            // возвращаем объект с оригинальным путем и replace: true
+            // возвращаем объект с оригинальным путем
             // Это заставит роутер заново резолвить маршрут с новыми роутами
-            return { path: target.fullPath, replace: true };
+            return { path: target.fullPath };
           }
         });
       }
@@ -202,7 +202,8 @@ export function createUniversalApp({
 
         if (useWebsocket && typeof window !== 'undefined') {
           // Откладываем инициализацию WebSocket после гидратации
-          requestIdleCallback(() => {
+          const _ric = typeof requestIdleCallback !== 'undefined' ? requestIdleCallback : (cb) => setTimeout(cb, 1);
+          _ric(() => {
             wsManager.initialize({
               wsUrl: process.env.WSS_URL || undefined,
               maxReconnectAttempts: 5,
@@ -214,7 +215,8 @@ export function createUniversalApp({
 
         // 3. Предзагрузка важных модулей в фоне
         if (typeof window !== 'undefined') {
-          requestIdleCallback(() => {
+          const _ric2 = typeof requestIdleCallback !== 'undefined' ? requestIdleCallback : (cb) => setTimeout(cb, 1);
+          _ric2(() => {
             moduleManager.preloadModules(context);
           });
         }

package/src/modules/core/views/classes/i18n.manager.js

@@ -25,9 +25,16 @@ class I18nManager {
     this.moduleLocales.set(moduleName, locales);
 
     // Если i18n instance уже создан, добавляем переводы динамически
+    // и переприменяем extensions/overrides чтобы сохранить приоритет слоёв
     if (this.i18nInstance) {
-      Object.entries(locales).forEach(([locale, messages]) => {
-        this.i18nInstance.global.mergeLocaleMessage(locale, messages);
+      const localeKeys = Object.keys(locales);
+      const ext = this.extensions.get(moduleName);
+      const ovr = this.overrides.get(moduleName);
+
+      localeKeys.forEach(locale => {
+        if (locales[locale]) this.i18nInstance.global.mergeLocaleMessage(locale, locales[locale]);
+        if (ext?.[locale]) this.i18nInstance.global.mergeLocaleMessage(locale, ext[locale]);
+        if (ovr?.[locale]) this.i18nInstance.global.mergeLocaleMessage(locale, ovr[locale]);
       });
     }
 

package/src/modules/core/views/classes/ws.manager.js

@@ -59,7 +59,8 @@ class WebSocketManager {
 
   connect(userId = null) {
     if (typeof window === 'undefined') return Promise.resolve(false);
-    this.userId = userId;
+
+    console.log('[WS DEBUG] connect() called, userId:', userId, 'current this.userId:', this.userId, 'isConnected:', this.isConnected, 'baseUrl:', this.baseUrl, 'hasConnectPromise:', !!this.connectPromise);
 
     // Проверяем существующее соединение
     if (this.isConnected && this.socket?.readyState === WebSocket.OPEN) {
@@ -68,19 +69,24 @@ class WebSocketManager {
         console.log('[WebSocket] UserId changed, reconnecting...');
         return this.reconnectWithAuth(userId);
       }
+      console.log('[WS DEBUG] Already connected, returning existing socket');
       return Promise.resolve(this.socket);
     }
 
+    this.userId = userId;
+
     // Предотвращаем создание множества промисов при параллельных вызовах
     if (this.connectPromise) {
+      console.log('[WS DEBUG] Returning existing connectPromise');
       return this.connectPromise;
     }
 
     this.connectPromise = new Promise((resolve, reject) => {
-      this.disconnect();
+      // Очищаем старый сокет без сброса userId и подписок
+      this._cleanupSocket();
 
       // Используем baseUrl без параметров, так как аутентификация через cookie
-      console.log('[WebSocket] Connecting to:', this.baseUrl, 'userId:', userId);
+      console.log('[WS DEBUG] Creating new WebSocket to:', this.baseUrl, 'userId:', userId);
       this.socket = new WebSocket(this.baseUrl);
 
       this.socket.onopen = () => {
@@ -107,9 +113,7 @@ class WebSocketManager {
     return this.connectPromise;
   }
 
-  disconnect() {
-    if (typeof window === 'undefined') return;
-
+  _cleanupSocket() {
     if (this.socket) {
       this.socket.onopen = null;
       this.socket.onmessage = null;
@@ -133,8 +137,14 @@ class WebSocketManager {
     }
 
     this.isConnected = false;
+  }
+
+  disconnect() {
+    if (typeof window === 'undefined') return;
+
+    this._cleanupSocket();
     this.userId = null;
-    this.subscribedModules.clear(); // Очищаем подписки при отключении
+    this.subscribedModules.clear(); // Очищаем подписки при полном отключении
   }
 
   async send(data) {

package/src/modules/core/views/components/blocks/Card.vue

@@ -1,5 +1,5 @@
 <template>
-  <component :is="tag || 'div'" @click="handleClick">
+  <component :is="to ? 'router-link' : (tag || 'div')" :to="to" @click="handleClick">
     <!-- Skeleton режим -->
     <Skeleton
       v-if="loading"
@@ -7,33 +7,51 @@
       :horizontal="true"
       :loading="true"
     />
-    
+
     <!-- Обычный режим -->
     <template v-else>
       <!-- Изображение -->
       <slot name="image">
-        <img
-          v-if="photo"
-          :src="(FILE_SERVER_URL || '') + photo"
-          :alt="title"
-          loading="lazy"
-        />
-        <component
-          v-else-if="placeholder"
-          :is="placeholder"
-        />
-        <PlaceholderUserpic class="h-100" v-else />
+        <div v-if="classImage" :class="classImage">
+          <img
+            v-if="photo"
+            :src="(FILE_SERVER_URL || '') + photo"
+            :alt="title"
+            loading="lazy"
+            class="w-100 h-100 object-fit-cover"
+          />
+          <component
+            v-else-if="placeholder"
+            :is="placeholder"
+            class="i-regular"
+            :fill="'rgb(var(--main))'"
+          />
+          <PlaceholderUserpic class="h-100" v-else />
+        </div>
+        <template v-else>
+          <img
+            v-if="photo"
+            :src="(FILE_SERVER_URL || '') + photo"
+            :alt="title"
+            loading="lazy"
+          />
+          <component
+            v-else-if="placeholder"
+            :is="placeholder"
+          />
+          <PlaceholderUserpic class="h-100" v-else />
+        </template>
       </slot>
 
       <!-- Контент -->
-      <div>
+      <div :class="classContent">
         <slot name="header">
-          <p v-if="title">{{ title }}</p>
-          <span v-if="subtitle">{{ subtitle }}</span>
+          <p v-if="title" class="fw-medium t-truncate" :class="{ 'mn-b-thin': subtitle }">{{ title }}</p>
+          <p v-if="subtitle" class="t-dark t-small">{{ subtitle }}</p>
         </slot>
-        
+
         <slot />
-        
+
         <slot name="footer" />
       </div>
 
@@ -43,9 +61,9 @@
           v-if="action"
           @click.stop="action.method"
         >
-          <component 
-            v-if="action.label?.is" 
-            :is="action.label.is" 
+          <component
+            v-if="action.label?.is"
+            :is="action.label.is"
             v-bind="action.label.props"
             class="i-medium"
           />
@@ -69,12 +87,17 @@ const props = defineProps({
   title: String,
   subtitle: String,
   action: Object,
-  
+
   // Функционал
+  to: [String, Object],
   tag: String,
   placeholder: [String, Object],
   loading: Boolean,
-  skeletonStructure: Array
+  skeletonStructure: Array,
+
+  // Классы для layout
+  classImage: String,
+  classContent: String
 })
 
 const emit = defineEmits(['click'])
@@ -83,4 +106,4 @@ const slots = useSlots()
 const handleClick = () => {
   emit('click')
 }
-</script>
+</script>

package/src/modules/core/views/components/blocks/CardStat.vue

@@ -0,0 +1,27 @@
+<template>
+	<div class="bg-light pd-medium radius-medium">
+		<div class="flex  gap-small">
+
+			<div class="radius-small bg-main flex flex-center">
+				<component :is="icon" class="i-medium mn-small" :fill="'rgb(var(--white))'"/>
+			</div>
+
+			<div class="w-100">
+				<p class="h2 mn-b-small fw-semi">{{ displayValue }}</p>
+				<span class="t-dark t-small mn-b-small">{{ title }}</span>
+				<p v-if="subtitle" class="t-green t-small mn-t-nano">{{ subtitle }}</p>
+			</div>
+
+		</div>
+	</div>
+</template>
+
+<script setup>
+defineProps({
+	icon: { type: [Object, Function], required: true },
+	title: { type: String, required: true },
+	value: { type: [String, Number], default: null },
+	displayValue: { type: String, default: '—' },
+	subtitle: { type: String, default: '' }
+})
+</script>

package/src/modules/core/views/components/blocks/PopupAuth.vue

@@ -20,7 +20,7 @@
         
         <span>
           Already have an account? 
-          <a @click="handleSignIn" class="t-grey cursor-pointer">Sign in</a>
+          <a @click="handleSignIn" class="t-dark cursor-pointer">Sign in</a>
         </span>
       </div>
     </div>

package/src/modules/core/views/components/layouts/Client.vue

@@ -52,7 +52,7 @@
         :is="route.meta.header_navigation"
         :horizontal="true"
         :navigationItems="route.meta.header_navigation_items"
-        :stateSidebar="store.core.state.isOpenSidebar"
+        v-model:stateSidebar="store.core.state.isOpenSidebar"
         :theme="headerTheme"
       />
       <template #right>
@@ -108,9 +108,9 @@
           <component
             v-if="route.meta?.sidebar_navigation"
             :is="route.meta.sidebar_navigation"
-            :key="route.meta.sidebar_navigation"
+            :key="route.meta.sidebar_navigation_items"
             :navigationItems="route.meta.sidebar_navigation_items"
-            :stateSidebar="store.core.state.isOpenSidebar"
+            v-model:stateSidebar="store.core.state.isOpenSidebar"
             :theme="headerTheme"
           />
         </transition>
@@ -386,7 +386,8 @@ const componentKey = computed(() => {
     .filter(Boolean)
     .join('-');
 
-  return significantParams || route.meta.layoutKey || route.name;
+  const identity = route.meta.layoutKey || route.name;
+  return significantParams ? `${significantParams}-${identity}` : identity;
 });
 </script>
 

package/src/modules/core/views/components/partials/BottomNavigationBar.vue

@@ -4,7 +4,7 @@
           <!-- Home -->
           <router-link 
             class="no-hover-color t-center fw-medium" 
-            :class="{ 't-grey': $route.path === '/', 't-transp': $route.path !== '/' }"
+            :class="{ 't-dark': $route.path === '/', 't-transp': $route.path !== '/' }"
             to="/"
           >
             <IconHome 
@@ -17,7 +17,7 @@
           <!-- Gallery -->
           <router-link 
             class="no-hover-color t-center fw-medium"
-            :class="{ 't-grey': $route.path === '/marketplac', 't-transp': $route.path !== '/marketplac' }"
+            :class="{ 't-dark': $route.path === '/marketplac', 't-transp': $route.path !== '/marketplac' }"
             to="/marketplac"
           >
             <IconCatalog 
@@ -30,7 +30,7 @@
           <!-- Events -->
           <router-link 
             class="no-hover-color t-center fw-medium"
-            :class="{ 't-grey': $route.path === '/rents', 't-transp': $route.path !== '/rents' }"
+            :class="{ 't-dark': $route.path === '/rents', 't-transp': $route.path !== '/rents' }"
             to="/rents"
           >
             <IconShopcart 
@@ -43,7 +43,7 @@
           <!-- Community -->
           <router-link 
             class="no-hover-color t-center fw-medium"
-            :class="{ 't-grey': $route.path === '/community', 't-transp': $route.path !== '/community' }"
+            :class="{ 't-dark': $route.path === '/community', 't-transp': $route.path !== '/community' }"
             to="/community"
           >
             <IconCommunity 
@@ -57,7 +57,7 @@
           <router-link 
             class="no-hover-color t-center fw-medium"
             :class="{ 
-              't-grey': $route.path.startsWith('/auth/') || $route.path.startsWith('/users/'),
+              't-dark': $route.path.startsWith('/auth/') || $route.path.startsWith('/users/'),
               't-transp': !$route.path.startsWith('/auth/') && !$route.path.startsWith('/users/')
             }"
             :to="auth.state.access.status === false ? {name: 'Sign In'} : { name: 'User Profile', params: { _id: auth.state.user._id }}"

package/src/modules/core/views/components/partials/Header.vue

@@ -137,12 +137,12 @@ onMounted(() => {
         <IconSearch class="i-medium" :fill="theme === 'light' ? 'rgb(var(--black))' : 'rgb(var(--white))'" />
       </Button>
 
+      <NotificationBadge v-if="showNotifications && auth.state.user._id" :fill="theme === 'light' ? 'rgb(var(--black))' : 'rgb(var(--white))'" />
+
       <Button v-if="showCart" class="pd-zero mn-r-micro" aria-label="shopcart" :submit="a => shopcart.actions.toggleShopcart()" :counter="shopcart.getters.cartTotalAmount" :showSucces="false" :showLoader="false">
         <IconShopcart class="i-medium" :fill="theme === 'light' ? 'rgb(var(--black))' : 'rgb(var(--white))'" />
       </Button>
 
-      <NotificationBadge v-if="showNotifications && auth.state.user._id" :fill="theme === 'light' ? 'rgb(var(--black))' : 'rgb(var(--white))'" />
-
       <Button
         v-if="showProfile"
         class="pd-zero bg-transparent"

package/src/modules/core/views/components/partials/Navigation.vue

@@ -20,26 +20,25 @@ const props = defineProps({
     type: String,
     default: "light"
   },
-  stateSidebar: {
-    type: Boolean,
-    default: false
-  },
   horizontal: {
     type: Boolean,
     default: false
   }
 })
 
-const emits = defineEmits([
-  'closeSidebar'
-])
+const stateSidebar = defineModel('stateSidebar', { type: Boolean, default: false })
 
-const expandedSections = ref([])
+const expandedSections = ref(
+  (props.navigationItems || [])
+    .flatMap(section => section.items)
+    .filter(item => item.expanded && item.subItems)
+    .map(item => item.title)
+)
 
 const toggleSection = (title) => {
-  if (!props.stateSidebar) {
+  if (!stateSidebar.value) {
     if (menuItems.value.flatMap(section => section.items).find(item => item.title === title && item.subItems)) {
-      emits('closeSidebar')
+      stateSidebar.value = true
       setTimeout(() => {
         expandedSections.value.push(title)
       }, 50)
@@ -122,7 +121,7 @@ const processRoute = (routeFn) => {
               class="ease-quint-out w-100 flex radius-small flex-nowrap cursor-pointer flex-v-center pd-thin"
               @click="item.route ? router.push(processRoute(item.route)) : null"
               :class="[
-                item.route && route.path === processRoute(item.route) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
+                item.route && route.path.startsWith(processRoute(item.route)) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
                 theme === 'light' ? 'hover:bg-light' : 'hover:bg-dark'
               ]"
             >
@@ -137,7 +136,7 @@ const processRoute = (routeFn) => {
                 href="#"
                 class="group ease-quint-out flex flex-v-center flex-nowrap gap-thin pd-thin radius-small"
                 :class="[
-                  subItem.route && route.path === processRoute(subItem.route) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
+                  subItem.route && route.path.startsWith(processRoute(subItem.route)) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
                   theme === 'light' ? 'hover:bg-light' : 'hover:bg-dark'
                 ]"
               >
@@ -158,7 +157,7 @@ const processRoute = (routeFn) => {
           @click="item.route ? (isPhone ? (stateSidebar = false) : null, route.path !== processRoute(item.route) ? router.push(processRoute(item.route)) : null) : null"
           :class="[
               horizontal ? 'pd-thin' : '',
-              item.route && route.path === processRoute(item.route) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
+              item.route && route.path.startsWith(processRoute(item.route)) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
               theme === 'light' ? 'hover:bg-light' : 'hover:bg-dark'
             ]"
         >
@@ -211,7 +210,7 @@ const processRoute = (routeFn) => {
                 href="#"
                 class="group ease-quint-out flex flex-v-center flex-nowrap gap-thin pd-thin radius-small"
                 :class="[
-                  subItem.route && route.path === processRoute(subItem.route) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
+                  subItem.route && route.path.startsWith(processRoute(subItem.route)) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
                     theme === 'light' ? 'hover:bg-light' : 'hover:bg-dark'
                     ]"
               >

package/src/modules/core/views/components/partials/Sidebar.vue

@@ -88,7 +88,7 @@ router.beforeEach((to, from) => {
 <template>
   <aside
     data-sidebar
-    class="ease-quint-out w-min-0 o-hidden flex-child-default z-index-2 br-r-1px flex flex-column h-100"
+    class="ease-quint-out w-min-0 o-hidden flex-child-default z-index-2 br-r-1px br-grey flex flex-column h-100"
     :class="[
       { 'mobile-opened': isManuallyOpened },
       stateSidebar
@@ -96,8 +96,8 @@ router.beforeEach((to, from) => {
       : `${widthHidden} mobile:w-0`,
       //
       theme === 'light'
-      ? 't-black bg-white br-light'
-      : 't-white bg-black br-dark'
+      ? 't-black bg-white '
+      : 't-white bg-black'
     ]"
     @mouseenter="handleMouseEnter"
     @mouseleave="handleMouseLeave"
@@ -124,12 +124,10 @@ router.beforeEach((to, from) => {
       </div>
     </div>
     <div
-      class="flex-shrink-0 w-100 br-t-1px"
+      class="flex-shrink-0 w-100 br-t-1px br-grey"
       :class="{ 
         'pd-micro': !stateSidebar, 
         'pd-small': stateSidebar,
-        'br-light': theme === 'light',
-        'br-dark':  theme === 'dark'
       }"
     >
       <button