@ozdao/martyrs 0.2.519 → 0.2.520

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

@@ -5,6 +5,7 @@ const state = reactive({
   messages: [],
   currentChatId: null,
   username: null,
+  userId: null,
 });
 
 const methods = {
@@ -15,6 +16,7 @@ const methods = {
   async connectWebSocket(userId) {
     try {
       console.log('[Chat] Connecting to WebSocket with userId:', userId);
+      state.userId = userId; // Сохраняем userId
       await globalWebSocket.connect(userId);
       await globalWebSocket.subscribeModule('chat'); // 👈 Подписка на модуль чата
 
@@ -31,6 +33,35 @@ const methods = {
         },
         { module: 'chat' }
       );
+      
+      // Обработчик подтверждения прочтения
+      globalWebSocket.addEventListener(
+        'readReceipt',
+        data => {
+          console.log('[CHAT STORE] Received readReceipt:', data);
+          
+          // Обновляем статус прочтения для сообщений
+          if (data.messageIds && data.userId) {
+            data.messageIds.forEach(messageId => {
+              const message = state.messages.find(m => m._id === messageId);
+              if (message) {
+                if (!message.readBy) {
+                  message.readBy = [];
+                }
+                // Добавляем запись о прочтении если её еще нет
+                if (!message.readBy.some(r => r.userId === data.userId)) {
+                  message.readBy.push({
+                    userId: data.userId,
+                    readAt: data.readAt || new Date()
+                  });
+                  console.log('[CHAT STORE] Updated message read status:', messageId);
+                }
+              }
+            });
+          }
+        },
+        { module: 'chat' }
+      );
     } catch (error) {
       console.error('[Chat] WebSocket connection failed:', error);
       throw error;
@@ -76,6 +107,42 @@ const methods = {
       module: 'chat',
       type: 'message',
       chatId: state.currentChatId,
+      chatType: 'order', // TODO: динамически определять тип чата
+      userId: state.userId, // Добавляем userId отправителя
+    });
+  },
+
+  /**
+   * Отметить сообщения как прочитанные
+   * @param {Array<String>} messageIds
+   */
+  async markMessagesAsRead(messageIds) {
+    console.log('[CHAT STORE] markMessagesAsRead called with:', messageIds);
+    console.log('[CHAT STORE] Current userId:', state.userId);
+    
+    // Обновляем локальное состояние сразу для текущего пользователя
+    messageIds.forEach(messageId => {
+      const message = state.messages.find(m => m._id === messageId);
+      if (message) {
+        if (!message.readBy) {
+          message.readBy = [];
+        }
+        // Добавляем запись о прочтении если её еще нет
+        if (!message.readBy.some(r => r.userId === state.userId)) {
+          message.readBy.push({
+            userId: state.userId,
+            readAt: new Date()
+          });
+          console.log('[CHAT STORE] Locally updated message read status:', messageId);
+        }
+      }
+    });
+    
+    await globalWebSocket.send({
+      type: 'markAsRead',
+      module: 'chat',
+      messageIds: messageIds,
+      chatId: state.currentChatId,
     });
   },
 

package/src/modules/community/components/layouts/Community.vue

@@ -211,7 +211,7 @@ fetchComments();
 import * as blog from '@martyrs/src/modules/community/store/blogposts.js';
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js'
-import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
+import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js'
 
 // State
 const route = useRoute();
@@ -222,7 +222,7 @@ if (route.params.category === 'new') blog.state.sort.param = 'createdAt';
 
 
 const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
-  memberships.mutations.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
+  membershipsStore.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
 };
 
 </script>

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

@@ -15,154 +15,7 @@
       </button>
     </header>
 
-    <div class="cols-2-1_3 br-1px br-solid br-light z-index-3 pos-relative">
-
-      <div class="o-y-scroll br-r br-solid br-light pd-medium z-index-2 desktop-only h-100 pos-relative">
-        <div class="w-100 o-y-scroll h-100">
-          <!-- Categories -->
-          <div class="mn-b-medium">
-            <h4 class="mn-b-small">Categories</h4>
-            <div class="gap-micro">
-              <div
-                v-for="category in postCategories"
-                :key="category.value"
-                @click="selectCategory(category.value)"
-                :class="{ 'bg-light': selectedCategory === category.value }"
-                class="pd-small radius-small cursor-pointer hover-bg-light transition-all"
-              >
-                {{ category.label }}
-              </div>
-            </div>
-          </div>
-
-          <!-- Tags Filter -->
-          <Spoiler 
-            class="o-hidden mn-b-medium"
-            :status="true"
-          >
-            <template #header="{ isOpen }">
-              <div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
-                <h4 class="w-100">Tags</h4>
-                <div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
-                  <IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
-                </div>
-              </div>
-            </template>
-
-            <template #content>
-              <div class="mn-t-small">
-                <Field
-                  v-model="searchTag"
-                  placeholder="Search tags..."
-                  type="text"
-                  class="w-100 bg-light pd-small radius-small mn-b-small"
-                />
-                <Checkbox 
-                  v-for="tag in filteredTags"
-                  :key="tag"
-                  v-model:checkbox="selectedTags"
-                  :label="tag"
-                  :value="tag"
-                  mode="checkbox"
-                  class="mn-b-micro"
-                />
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Date Range Filter -->
-          <Spoiler 
-            class="o-hidden mn-b-medium"
-            :status="true"
-          >
-            <template #header="{ isOpen }">
-              <div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
-                <h4 class="w-100">Date Range</h4>
-                <div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
-                  <IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
-                </div>
-              </div>
-            </template>
-
-            <template #content>
-              <div class="mn-t-small">
-                <div 
-                  v-for="option in dateRangeOptions"
-                  :key="option.value"
-                  @click="selectDateRange(option.value)"
-                  :class="{ 'bg-light': selectedDateRange === option.value }"
-                  class="pd-small radius-small cursor-pointer hover-bg-light transition-all mn-b-micro"
-                >
-                  {{ option.label }}
-                </div>
-                
-                <div 
-                  @click="() => { tempSelectedDates = selectedDates; showDatePickerPopup = true; }"
-                  :class="{ 'bg-light': selectedDateRange === 'custom' }"
-                  class="pd-small radius-small cursor-pointer hover-bg-light transition-all mn-b-micro"
-                >
-                  {{ selectedDates ? `${formatDate(selectedDates.start, { dayMonth: true, language: 'en' })} - ${formatDate(selectedDates.end, { dayMonth: true, language: 'en' })}` : 'Select custom dates'}} 
-                </div>
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Author Filter -->
-          <Spoiler 
-            class="o-hidden mn-b-medium"
-            :status="true"
-          >
-            <template #header="{ isOpen }">
-              <div class="cursor-pointer w-100 flex-v-center flex-nowrap flex">
-                <h4 class="w-100">Author</h4>
-                <div class="h-2r w-2r flex-child-auto aspect-1x1 flex-center flex bg-light radius-extra">
-                  <IconChevronBottom :class="{ 'rotate-180 mn-t-micro-negative': isOpen }" fill="rgb(var(--black))" class="i-regular"/>
-                </div>
-              </div>
-            </template>
-
-            <template #content>
-              <div class="mn-t-small">
-                <Checkbox 
-                  label="My Posts Only"
-                  v-model:checkbox="showMyPostsOnly"
-                  mode="checkbox"
-                  class="mn-b-micro"
-                />
-              </div>
-            </template>
-          </Spoiler>
-
-          <!-- Clear Filters Button -->
-          <button 
-            @click="clearFilters"
-            class="bg-main w-100 button mn-t-medium"
-          >
-            Clear Filters
-          </button>
-        </div>
-      </div>
-
-      <div class="w-100 rows-1 pd-thin pos-relative o-hidden">
-        <Filters
-          v-model:filters="availableFilters"
-          v-model:selected="selectedFilters"
-        />
-
-        <div class="mn-b-thin w-100 o-y-scroll scroll-hide scroll-snap-type-x-mandatory scroll-pd-regular">
-          <div class="gap-thin flex-nowrap flex">
-            <div
-              v-for="category in postCategories"
-              :key="category.value"
-              @click="selectCategory(category.value)"
-              :class="{ 'bg-main t-white': selectedCategory === category.value }"
-              class="flex-child-default bg-light flex t-nowrap pd-medium radius-medium cursor-pointer hover-bg-light transition-all"
-            >
-              {{ category.label }}
-            </div>
-          </div>
-        </div>
-
+    <div class="w-100 rows-1 pd-thin pos-relative o-hidden">
         <Feed
           :search="true"
           v-model:filter="blog.state.filter"
@@ -183,17 +36,12 @@
             status: 'published',
             user: auth.state.user._id,
             owner: route.params._id || null,
-            category: selectedCategory !== 'all' ? selectedCategory : null,
-            tags: selectedTags.length > 0 ? selectedTags : null,
-            author: showMyPostsOnly ? auth.state.user._id : null,
-            dateStart: selectedDates?.start,
-            dateEnd: selectedDates?.end,
             search: route.query.search
           }"
           v-slot="{ 
             items 
           }"
-          class="cols-3 pos-relative w-100 rows-1 gap-thin"
+          class="cols-1 pos-relative w-100 rows-1 gap-thin"
         >
           <CardBlogpost 
             v-for="item in items" 
@@ -211,49 +59,7 @@
           />
         </Feed>
 
-        <button
-          v-if="hasAccess(route.params._id, 'posts', 'create', auth.state.accesses, auth.state.access.roles)"
-          @click="$router.push({
-            name: route.params?._id ? 'Organization_PostAdd' : 'CreateBlogPost'
-          })"
-          class="mn-t-medium bg-main button w-100"
-        >
-          Create New Post
-        </button>
-      </div>
     </div>
-  
-    <!-- Date Picker Popup -->
-    <Popup
-      :isPopupOpen="showDatePickerPopup"
-      @close-popup="showDatePickerPopup = false"
-      class="pd-medium bg-white radius-medium"
-      style="min-width: 350px;"
-    >
-      <h3 class="mn-b-medium">Select Date Range</h3>
-      
-      <Calendar
-        v-model:date="tempSelectedDates"
-        :allowRange="true"
-        :disablePastDates="false"
-        class="mn-b-medium"
-      />
-      
-      <div class="flex gap-small">
-        <button 
-          @click="applyDateFilter"
-          class="bg-main button flex-child-full"
-        >
-          Apply
-        </button>
-        <button 
-          @click="showDatePickerPopup = false"
-          class="bg-light button flex-child-full"
-        >
-          Cancel
-        </button>
-      </div>
-    </Popup>
   </div>
 </template>
 
@@ -264,17 +70,10 @@
 
   // Import components
   import Feed from '@martyrs/src/components/Feed/Feed.vue'
-  import Filters from '@martyrs/src/modules/globals/views/components/sections/Filters.vue'
-  import Spoiler from "@martyrs/src/components/Spoiler/Spoiler.vue"
-  import Field from "@martyrs/src/components/Field/Field.vue"
-  import Checkbox from "@martyrs/src/components/Checkbox/Checkbox.vue"
-  import Calendar from "@martyrs/src/components/Calendar/Calendar.vue"
-  import Popup from "@martyrs/src/components/Popup/Popup.vue"
 
   import CardBlogpost from '@martyrs/src/modules/community/components/blocks/CardBlogpost.vue'
 
   import IconPlus from '@martyrs/src/modules/icons/navigation/IconPlus.vue'
-  import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
 
   // Accessing router and store
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
@@ -285,7 +84,7 @@
 
   const route = useRoute()
   const router = useRouter()
-  const { hasAccess, formatDate } = useGlobalMixins()
+  const { hasAccess } = useGlobalMixins()
 
   // Props
   const props = defineProps({
@@ -295,130 +94,6 @@
     }
   })
 
-  // Categories
-  const postCategories = ref([
-    { label: 'All Posts', value: 'all' },
-    { label: 'News', value: 'news' },
-    { label: 'Updates', value: 'updates' },
-    { label: 'Events', value: 'events' },
-    { label: 'Announcements', value: 'announcements' },
-    { label: 'Stories', value: 'stories' }
-  ]);
-  const selectedCategory = ref('all');
-
-  // Tags
-  const searchTag = ref('');
-  const selectedTags = ref([]);
-  const availableTags = ref(['featured', 'important', 'trending', 'community', 'official']);
-  const filteredTags = computed(() => {
-    if (!searchTag.value) return availableTags.value;
-    return availableTags.value.filter(tag => 
-      tag.toLowerCase().includes(searchTag.value.toLowerCase())
-    );
-  });
-
-  // Date Range
-  const dateRangeOptions = ref([
-    { label: 'All Time', value: 'all' },
-    { label: 'Today', value: 'today' },
-    { label: 'This Week', value: 'week' },
-    { label: 'This Month', value: 'month' },
-    { label: 'This Year', value: 'year' }
-  ]);
-  const selectedDateRange = ref('all');
-  const showDatePickerPopup = ref(false);
-  const selectedDates = ref(null);
-  const tempSelectedDates = ref(null);
-
-  // Author
-  const showMyPostsOnly = ref(false);
-
-  const availableFilters = ref([
-    {
-      title: 'Category',
-      value: 'category',
-      type: 'radio',
-      options: postCategories.value
-    },
-    {
-      title: 'Status',
-      value: 'status',
-      type: 'radio',
-      options: [
-        { label: 'Published', value: 'published' },
-        { label: 'Draft', value: 'draft' },
-        { label: 'Archived', value: 'archived' }
-      ]
-    }
-  ])
-
-  const selectedFilters = ref({
-    category: 'all',
-    status: 'published'
-  })
-
-  const selectCategory = (category) => {
-    selectedCategory.value = category;
-    selectedFilters.value.category = category;
-  };
-
-  const selectDateRange = (range) => {
-    selectedDateRange.value = range;
-    const today = new Date();
-    
-    switch(range) {
-      case 'all':
-        selectedDates.value = null;
-        break;
-      case 'today':
-        selectedDates.value = {
-          start: today,
-          end: today
-        };
-        break;
-      case 'week':
-        const weekStart = new Date(today);
-        weekStart.setDate(today.getDate() - today.getDay());
-        selectedDates.value = {
-          start: weekStart,
-          end: today
-        };
-        break;
-      case 'month':
-        const monthStart = new Date(today.getFullYear(), today.getMonth(), 1);
-        selectedDates.value = {
-          start: monthStart,
-          end: today
-        };
-        break;
-      case 'year':
-        const yearStart = new Date(today.getFullYear(), 0, 1);
-        selectedDates.value = {
-          start: yearStart,
-          end: today
-        };
-        break;
-    }
-  };
-
-  const applyDateFilter = () => {
-    selectedDates.value = tempSelectedDates.value;
-    selectedDateRange.value = 'custom';
-    showDatePickerPopup.value = false;
-  };
-
-  const clearFilters = () => {
-    selectedCategory.value = 'all';
-    selectedTags.value = [];
-    selectedDateRange.value = 'all';
-    selectedDates.value = null;
-    showMyPostsOnly.value = false;
-    searchTag.value = '';
-    selectedFilters.value = {
-      category: 'all',
-      status: 'published'
-    };
-  };
 
   globals.state.navigation_bar.actions = [{
     component: IconPlus,

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

@@ -108,7 +108,7 @@
             {{ticket.client_refactor?.email || 'No email'}}
           </p>
 
-           <span class="pd-r-thin pd-l-thin pd-b-nano pd-t-nano bg-second radius-extra t-white t-medium d-block w-max uppercase">
+           <span class="pd-thin ]bg-second radius-extra t-white t-medium d-block w-max uppercase">
             {{ticket.status}}
           </span>
         </div>

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

@@ -160,13 +160,13 @@
   // Import state
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
   import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js'
-  import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
+  import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js'
 
 
   import * as events from '@martyrs/src/modules/events/store/events.js'; 
 
   const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
-    memberships.mutations.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
+    membershipsStore.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
   };
   // State
   const route = useRoute();

package/src/modules/globals/views/mixins/mixins.js

@@ -1,7 +1,13 @@
 import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+import { inject } from 'vue';
 
 // useGlobalMixins.js
 export function useGlobalMixins() {
+  const isModuleInstalled = (moduleName) => {
+    const store = inject('store');
+    if (!store || !store.modules) return false;
+    return store.modules.includes(moduleName);
+  };
   const isAdmin = roles => {
     if (roles) {
       const isAdmin = roles.includes('ROLE_ADMIN') ? roles.includes('ROLE_ADMIN') : false;
@@ -287,6 +293,7 @@ export function useGlobalMixins() {
   const isXXLDesktop = () => isMediaMin('--xxl-desktop-min');
 
   return {
+    isModuleInstalled,
     isAdmin,
     hasAccess,
     returnCurrency,