@ozdao/martyrs 0.2.428 → 0.2.430

package/dist/style.css

@@ -1116,15 +1116,18 @@ div.vue-tags-input.disabled * {
 }
 .moveFromTop-enter-active,
 .moveFromTop-leave-active {
-  transform: translateY(0);
-  opacity: 1;
-  transition: all 0.5s ease;
+  transition: all 0.3s ease, max-height 0.2s ease;
+  overflow: hidden;
 }
 .moveFromTop-enter-from,
 .moveFromTop-leave-to {
   transform: translateY(-1rem);
   opacity: 0;
-  transition: all 0.5s ease;
+  max-height: 0;
+}
+.moveFromTop-enter-to,
+.moveFromTop-leave-from {
+  max-height: 100vh;
 }
 .moveFromTopAbsolute-enter-active,
 .moveFromTopAbsolute-leave-active {
@@ -1277,21 +1280,21 @@ div.vue-tags-input.disabled * {
   margin-left: 0.5rem;
 }
 
-.notification-badge-container[data-v-31a828f9] {
+.notification-badge-container[data-v-73074f7a] {
   position: relative;
   display: inline-block;
 }
-.notification-button[data-v-31a828f9] {
+.notification-button[data-v-73074f7a] {
   background: none;
   border: none;
   cursor: pointer;
   position: relative;
   font-size: 1.2rem;
 }
-.notification-icon[data-v-31a828f9] {
+.notification-icon[data-v-73074f7a] {
   font-size: 1.4rem;
 }
-.button-counter[data-v-31a828f9] {
+.button-counter[data-v-73074f7a] {
   position: absolute;
   right: -8px;
   bottom: -8px;
@@ -1305,7 +1308,7 @@ div.vue-tags-input.disabled * {
   line-height: 16px;
   font-size: 10px;
 }
-.notifications-dropdown[data-v-31a828f9] {
+.notifications-dropdown[data-v-73074f7a] {
   position: absolute;
   top: 100%;
   right: 0;
@@ -1317,40 +1320,40 @@ div.vue-tags-input.disabled * {
   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
   z-index: 1000;
 }
-.notifications-header[data-v-31a828f9] {
+.notifications-header[data-v-73074f7a] {
   display: flex;
   justify-content: space-between;
   align-items: center;
   padding: 12px 16px;
   border-bottom: 1px solid #eee;
 }
-.notifications-header h3[data-v-31a828f9] {
+.notifications-header h3[data-v-73074f7a] {
   margin: 0;
   font-size: 1rem;
 }
-.mark-all-read-btn[data-v-31a828f9] {
+.mark-all-read-btn[data-v-73074f7a] {
   background: none;
   border: none;
   color: #2196f3;
   font-size: 0.8rem;
   cursor: pointer;
 }
-.notifications-loading[data-v-31a828f9],
-.notifications-empty[data-v-31a828f9] {
+.notifications-loading[data-v-73074f7a],
+.notifications-empty[data-v-73074f7a] {
   padding: 24px;
   text-align: center;
   color: #666;
 }
-.notifications-list[data-v-31a828f9] {
+.notifications-list[data-v-73074f7a] {
   max-height: 300px;
   overflow-y: auto;
 }
-.notifications-footer[data-v-31a828f9] {
+.notifications-footer[data-v-73074f7a] {
   padding: 12px 16px;
   text-align: center;
   border-top: 1px solid #eee;
 }
-.notifications-footer a[data-v-31a828f9] {
+.notifications-footer a[data-v-73074f7a] {
   color: #2196f3;
   text-decoration: none;
   font-size: 0.9rem;
@@ -1432,29 +1435,23 @@ div.vue-tags-input.disabled * {
   transform: translateX(0%);
   opacity: 1;
 }
-.sidebar-item-btn:hover .sidebar-item-icon[data-v-baa33ec9],
-.sidebar-subitem-link:hover .sidebar-subitem-icon[data-v-baa33ec9] {
+.sidebar-item-btn:hover .sidebar-item-icon[data-v-43d4ca8b],
+.sidebar-subitem-link:hover .sidebar-subitem-icon[data-v-43d4ca8b] {
   transform: scale(1.1);
 }
-.sidebar-item-btn:hover .sidebar-item-icon[data-v-baa33ec9] {
+.sidebar-item-btn:hover .sidebar-item-icon[data-v-43d4ca8b] {
   transform: scale(1.1);
 }
-.sidebar-subitem-link:hover .sidebar-subitem-icon[data-v-baa33ec9] {
+.sidebar-subitem-link:hover .sidebar-subitem-icon[data-v-43d4ca8b] {
   transform: scale(1.1);
 }
-.sidebar-subitem-link[data-v-baa33ec9]:hover {
-  background: var(--light-regular);
-}
-.sidebar-item-btn[data-v-baa33ec9]:hover {
-  background: var(--light-regular);
-}
-.expanded-item[data-v-baa33ec9] {
+.expanded-item[data-v-43d4ca8b] {
   display: flex;
   align-items: center;
   width: 100%;
   border-radius: var(--small);
 }
-.sidebar-item-btn[data-v-baa33ec9] {
+.sidebar-item-btn[data-v-43d4ca8b] {
   align-items: center;
   border-radius: var(--small);
   transition: all 0.2s;
@@ -1462,16 +1459,16 @@ div.vue-tags-input.disabled * {
   border: none;
   cursor: pointer;
 }
-.sidebar-item-title[data-v-baa33ec9] {
+.sidebar-item-title[data-v-43d4ca8b] {
   font-weight: 500;
   transition: opacity 0.2s, width 0.2s;
   white-space: nowrap;
 }
-.sidebar-item-icon[data-v-baa33ec9] {
+.sidebar-item-icon[data-v-43d4ca8b] {
   font-size: 1.25rem;
   transition: transform 0.2s;
 }
-.sidebar-category[data-v-baa33ec9] {
+.sidebar-category[data-v-43d4ca8b] {
   font-size: 0.75rem;
   font-weight: 600;
   text-transform: uppercase;
@@ -1481,7 +1478,7 @@ div.vue-tags-input.disabled * {
   transition: opacity 0.2s;
   color: var(--grey-medium);
 }
-.sidebar-highlight-indicator[data-v-baa33ec9] {
+.sidebar-highlight-indicator[data-v-43d4ca8b] {
   position: absolute;
   left: 0;
   width: 4px;
@@ -1490,60 +1487,60 @@ div.vue-tags-input.disabled * {
   background: linear-gradient(to bottom, var(--second-regular), var(--second-small));
   transition: opacity 0.2s;
 }
-.sidebar-dropdown-icon[data-v-baa33ec9] {
+.sidebar-dropdown-icon[data-v-43d4ca8b] {
   color: var(--grey-medium);
   transition: transform 0.2s;
 }
-.rotate-180[data-v-baa33ec9] {
+.rotate-180[data-v-43d4ca8b] {
   transform: rotate(180deg);
 }
-.sidebar-submenu[data-v-baa33ec9] {
+.sidebar-submenu[data-v-43d4ca8b] {
   margin-top: var(--micro);
   margin-left: var(--semi);
   display: flex;
   flex-direction: column;
   gap: var(--micro);
 }
-.sidebar-subitem-link[data-v-baa33ec9] {
+.sidebar-subitem-link[data-v-43d4ca8b] {
   display: flex;
   align-items: center;
   text-decoration: none;
   transition: all 0.2s;
 }
-.sidebar-subitem-title[data-v-baa33ec9] {
+.sidebar-subitem-title[data-v-43d4ca8b] {
   font-size: 0.875rem;
 }
-.hidden[data-v-baa33ec9] {
+.hidden[data-v-43d4ca8b] {
   opacity: 0;
   width: 0;
   display: none;
 }
-.visible[data-v-baa33ec9] {
+.visible[data-v-43d4ca8b] {
   opacity: 1;
   display: block;
 }
 
 /* Dropdown animations */
-.dropdown-enter[data-v-baa33ec9], .dropdown-leave[data-v-baa33ec9] {
+.dropdown-enter[data-v-43d4ca8b], .dropdown-leave[data-v-43d4ca8b] {
   transition: all 0.3s ease-in-out;
 }
-.dropdown-enter-from[data-v-baa33ec9], .dropdown-leave-to[data-v-baa33ec9] {
+.dropdown-enter-from[data-v-43d4ca8b], .dropdown-leave-to[data-v-43d4ca8b] {
   opacity: 0;
   transform: translateY(-0.5rem);
 }
-.dropdown-enter-to[data-v-baa33ec9], .dropdown-leave-from[data-v-baa33ec9] {
+.dropdown-enter-to[data-v-43d4ca8b], .dropdown-leave-from[data-v-43d4ca8b] {
   opacity: 1;
   transform: translateY(0);
 }
 
 /* Base sidebar styling */
-.sidebar-container[data-v-be741cc6] {
+.sidebar-container[data-v-948b3b5a] {
   position: relative;
   left: 0;
   top: 0;
   transition: all 0.3s ease-in-out;
 }
-.dark-mode-toggle[data-v-be741cc6] {
+.dark-mode-toggle[data-v-948b3b5a] {
   align-items: center;
   width: 100%;
   border-radius: var(--small);
@@ -1553,48 +1550,43 @@ div.vue-tags-input.disabled * {
   background: transparent;
   cursor: pointer;
 }
-.dark-mode-toggle[data-v-be741cc6]:hover {
+.dark-mode-toggle[data-v-948b3b5a]:hover {
   background: var(--light-regular);
 }
-.dark-mode-label[data-v-be741cc6] {
+.dark-mode-label[data-v-948b3b5a] {
   font-weight: 500;
   transition: opacity 0.2s, width 0.2s;
   white-space: nowrap;
 }
-.dark-mode-icon[data-v-be741cc6] {
+.dark-mode-icon[data-v-948b3b5a] {
   font-size: 1.25rem;
   transition: transform 0.2s;
 }
-.dark-mode-toggle:hover .dark-mode-icon[data-v-be741cc6] {
+.dark-mode-toggle:hover .dark-mode-icon[data-v-948b3b5a] {
   transform: scale(1.1);
 }
-.sidebar-footer[data-v-be741cc6] {
-  border-top-width: 1px;
-  border-top-style: solid;
-  border-top-color: var(--light-regular);
-}
-.hidden[data-v-be741cc6] {
+.hidden[data-v-948b3b5a] {
   opacity: 0;
   width: 0;
   display: none;
 }
-.visible[data-v-be741cc6] {
+.visible[data-v-948b3b5a] {
   opacity: 1;
   display: block;
 }
 
 /* Scrollbar styles */
-[data-v-be741cc6]::-webkit-scrollbar {
+[data-v-948b3b5a]::-webkit-scrollbar {
   width: 6px;
 }
-[data-v-be741cc6]::-webkit-scrollbar-track {
+[data-v-948b3b5a]::-webkit-scrollbar-track {
   background: transparent;
 }
-[data-v-be741cc6]::-webkit-scrollbar-thumb {
+[data-v-948b3b5a]::-webkit-scrollbar-thumb {
   background-color: var(--grey-micro);
   border-radius: 3px;
 }
-[data-v-be741cc6]::-webkit-scrollbar-thumb:hover {
+[data-v-948b3b5a]::-webkit-scrollbar-thumb:hover {
   background-color: var(--grey-small);
 }
 
@@ -1603,7 +1595,7 @@ div.vue-tags-input.disabled * {
   width: 100%;
 }
 
-.subspotsartment[data-v-6f954e4d] {
+.subspotsartment[data-v-be40b3c0] {
   border: 1px solid rgba(0, 0, 0, 0.1);
   margin-top: 1rem;
 }
@@ -2481,7 +2473,7 @@ to {
 }
 
 /* Добавляем стиль для текста "просрочено" */
-.t-red[data-v-c36567a0] {
+.t-red[data-v-f18ee795] {
   color: red;
 }
 .round-wrapper {
@@ -2508,10 +2500,10 @@ to {
 }
 .vue-select-header {
   height: 3rem;
-}.blink[data-v-eeb4cbf7] {
-  animation: blink-animation-eeb4cbf7 1s ease infinite;
+}.blink[data-v-c30b339c] {
+  animation: blink-animation-c30b339c 1s ease infinite;
 }
-@keyframes blink-animation-eeb4cbf7 {
+@keyframes blink-animation-c30b339c {
 0%, 100% {
     opacity: 1;
 }

package/dist/wallet.server.js

@@ -9,7 +9,7 @@ const tickets_controller = require("./tickets.controller-CcxkRHlX.js");
 const require$$0 = require("stripe");
 const require$$0$1 = require("mongoose");
 const require$$1 = require("bignumber.js");
-const queryProcessor = require("./queryProcessor-CwQakZkT.js");
+const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
 var wallet_model;
 var hasRequiredWallet_model;
 function requireWallet_model() {

package/dist/wallet.server.mjs

@@ -8,7 +8,7 @@ import { r as requireTickets_controller } from "./tickets.controller-Bbxe7kaF.mj
 import require$$0 from "stripe";
 import require$$0$1 from "mongoose";
 import require$$1 from "bignumber.js";
-import { r as requireQueryProcessor } from "./queryProcessor-CCmHM0yi.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
 var wallet_model;
 var hasRequiredWallet_model;
 function requireWallet_model() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.428",
+  "version": "0.2.430",
   "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/chats/components/pages/ChatPage.vue

@@ -1,19 +1,11 @@
 <template>
-  <!-- <div class="chat-page h-max-20r"> -->
-    <!-- <aside class="chat-list"> -->
-      <!-- Примерный список чатов. Должен быть дополнен реальной логикой -->
-      <!-- <div v-for="chat in chats" :key="chat.id" @click="selectChat(chat.id)">
-        Чат {{ chat.name }}
-      </div> -->
-    <!-- </aside> -->
-    <!-- <main class="chat-main"> -->
-      <ChatWindow />
-    <!-- </main> -->
-  <!-- </div> -->
+  <main class="chat-main">
+    <ChatWindow />
+  </main>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, onUnmounted } from 'vue';
 import ChatWindow from '../sections/ChatWindow.vue';
 import chatStore from '../../store/chat.store.js';
 
@@ -22,29 +14,32 @@ const props = defineProps({
     type: String,
     required: true
   },
+  user: {
+    type: String,
+    required: true
+  },
   chatID: {
     type: String,
     required: true
   },
-})
-
-// const chats = ref([
-//   // Примерный список. В реальном приложении, список чатов должен загружаться с сервера.
-//   { id: 'chat1', name: 'Чат 1' },
-//   { id: 'chat2', name: 'Чат 2' }
-// ]);
+});
 
 const selectChat = (chatId) => {
   chatStore.methods.setCurrentChat(chatId);
 };
 
-onMounted(async() => {
+onMounted(async () => {
   chatStore.methods.setUsername(props.username || 'user'); // Установка имени пользователя
-  await chatStore.methods.connectWebSocket(); // Подключение к WebSocket
-  chatStore.methods.setCurrentChat(props.chatID);
+  await chatStore.methods.connectWebSocket(props.user); // Подключение к WebSocket
+  await chatStore.methods.setCurrentChat(props.chatID);
+});
+
+onUnmounted(() => {
+  // Clean up when the component is unmounted (e.g., navigating away)
+  chatStore.methods.disconnectChat();
 });
 </script>
 
 <style>
 /* Стили остаются без изменений */
-</style>
+</style>

package/src/modules/chats/components/sections/ChatWindow.vue

@@ -1,40 +1,34 @@
 <template>
   <div class="bg-white radius-semi bg-white o-hidden pos-relative">
-    
-      <div ref="allMessages"  class="chat-messages o-scroll h-max-20r">
-        <div  class="pos-relative h-min-20r flex-justify-end flex flex-column br-b br-solid br-black-transp-10">
-          <transition  name="scaleIn" mode="out-in">
-            <div v-if="messages.length < 1"  class="flex-center pd-small t-center w-100 h-100 flex-column flex pos-absolute">
-              <PlaceholderChat class="radius-100 mn-b-thin"/>
-              <h4 class='mn-b-thin'>Here you can view your chat history</h4>
-              <p>Feel free to ask if you have any questions.</p>
-            </div>
+    <div ref="allMessages" class="chat-messages o-scroll h-max-20r">
+      <div class="pos-relative h-min-20r flex-justify-end flex flex-column br-b br-solid br-black-transp-10">
+        <transition name="scaleIn" mode="out-in">
+          <div v-if="messages.length < 1" class="flex-center pd-small t-center w-100 h-100 flex-column flex pos-absolute">
+            <PlaceholderChat class="radius-100 mn-b-thin"/>
+            <h4 class='mn-b-thin'>Here you can view your chat history</h4>
+            <p>Feel free to ask if you have any questions.</p>
+          </div>
 
-            <TransitionGroup v-else  name="list" tag="ul" class="w-100 o-hidden">
-              <ChatMessage
-                v-for="message in messages"
-                :key="message._id"
-                :message="message"
-              />
-
-            </TransitionGroup>
-           </transition>
-          
-        </div>
+          <TransitionGroup v-else name="list" tag="ul" class="w-100 o-hidden" @after-enter="scrollToBottom">
+            <ChatMessage
+              v-for="message in messages"
+              :key="message._id"
+              :message="message"
+            />
+          </TransitionGroup>
+        </transition>
       </div>
+    </div>
 
-      
-      <div class="flex-nowrap flex-v-center flex bg-white w-100 radius-big pd-small">
-        <IconAdd
-          class="mn-r-thin t-transp i-regular"
-        />
-        <input class="" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
-      </div>
+    <div class="flex-nowrap flex-v-center flex bg-white w-100 radius-big pd-small">
+      <IconAdd class="mn-r-thin t-transp i-regular" />
+      <input class="" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
+    </div>
   </div>
 </template>
 
 <script setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, onMounted, nextTick } from 'vue';
 
 import IconAdd from '@martyrs/src/modules/icons/navigation/IconAdd.vue'
 import PlaceholderChat from '@martyrs/src/modules/icons/placeholders/PlaceholderChat.vue'
@@ -43,13 +37,20 @@ import ChatMessage from '../blocks/ChatMessage.vue';
 import chatStore from '../../store/chat.store.js';
 
 const newMessage = ref('');
-const allMessages = ref(null)
+const allMessages = ref(null);
 
 // Вычисляемые свойства
 const messages = computed(() => chatStore.state.messages);
 
+// Функция прокрутки вниз
+const scrollToBottom = () => {
+  if (allMessages.value) {
+    allMessages.value.scrollTop = allMessages.value.scrollHeight;
+  }
+};
+
 // Функция для отправки сообщения
-const sendMessage = () => {
+const sendMessage = async () => {
   if (newMessage.value) {
     const message = {
       text: newMessage.value,
@@ -58,18 +59,34 @@ const sendMessage = () => {
     };
 
     chatStore.methods.addMessage(message);
-    console.log(allMessages.value.lastElementChild.offsetHeight)
-    allMessages.value.scrollTop = allMessages.value.lastElementChild.offsetHeight
-    
     newMessage.value = '';
+
+    // Ждем, пока все анимации и рендеринг завершатся
+    await nextTick();
+    await new Promise(resolve => setTimeout(resolve, 100)); // Небольшая задержка для анимаций
+    scrollToBottom();
   }
 };
 
-// // При добавлении нового сообщения автоматически прокручиваем вниз
-watch(chatStore.state.messages, () => {
-  allMessages.value.scrollTop = allMessages.value.lastElementChild.offsetHeight
-}, {deep: true});
+// Прокрутка вниз при монтировании
+onMounted(() => {
+  nextTick(() => {
+    if (allMessages.value) {
+      allMessages.value.scrollTop = allMessages.value.scrollHeight;
+    }
+  });
+});
+
+// Прокрутка вниз при изменении сообщений
+watch(messages, () => {
+  nextTick(() => {
+    if (allMessages.value) {
+      allMessages.value.scrollTop = allMessages.value.scrollHeight;
+    }
+  });
+}, { deep: true });
 
+// Обработчик после завершения анимации входа нового элемента
 </script>
 
 <style>
@@ -82,4 +99,4 @@ watch(chatStore.state.messages, () => {
   opacity: 0;
   transform: translateX(30px);
 }
-</style>
+</style>

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

@@ -8,41 +8,38 @@ const state = reactive({
 });
 
 const methods = {
-  async connectWebSocket() {
-    console.log('process env')
-    console.log(process.env.WSS_URL)
-
+  async connectWebSocket(user) {
     // Use the global WebSocket instance
     try {
-      // Get userId from auth store or another source if available
-      const userId = window.__user_id || null;
-      
-      // Connect to the global WebSocket
-      await globalWebSocket.connect(userId);
-      
+      console.log('connect', user);
+      await globalWebSocket.connect(user);
+
+      // Remove any existing 'message' listeners for the 'chat' module to avoid duplicates
+      globalWebSocket.removeModuleListeners('chat');
+
       // Register chat message event listener
-      globalWebSocket.addEventListener('message', (data) => {
+      const listenerId = globalWebSocket.addEventListener('message', (data) => {
         if (data.chatId === state.currentChatId) {
           state.messages.push(data);
         }
       }, { module: 'chat' });
-      
+
       return globalWebSocket;
     } catch (error) {
       console.error('Failed to connect to WebSocket:', error);
       throw error;
     }
   },
-  
+
   setMessages(messages) {
-    console.log(process.env.API_URL)
+    console.log(process.env.API_URL);
     state.messages = messages;
   },
-  
-  addMessage(message) {
-    globalWebSocket.send(message);
+
+  async addMessage(message) {
+    await globalWebSocket.send(message);
   },
-  
+
   async setCurrentChat(chatId) {
     state.currentChatId = chatId;
     state.messages = []; // Clear current messages when changing chat
@@ -56,14 +53,16 @@ const methods = {
 
     methods.setMessages(messages);
   },
-  
+
   setUsername(username) {
     state.username = username;
   },
-  
+
   disconnectChat() {
-    // Remove chat-specific listeners when leaving chat page
+    // Remove all chat-specific listeners when leaving chat page
     globalWebSocket.removeModuleListeners('chat');
+    // Optionally disconnect the WebSocket if no longer needed
+    // globalWebSocket.disconnect(); // Uncomment if you want to fully disconnect
   }
 };
 

package/src/modules/globals/controllers/utils/queryProcessor.js

@@ -2,7 +2,7 @@ const ObjectId = require('mongoose').Types.ObjectId;
 
 function getBasicOptions(query) {
   console.log(query);
-  const { _id, url, status, notstatus, type, owner, customer, creator } = query;
+  const { _id, url, status, notstatus, type, organization, owner, customer, creator } = query;
   const stages = [];
   const conditions = [];
 
@@ -33,6 +33,7 @@ function getBasicOptions(query) {
   
   if (type) { conditions.push({ type: type }); }
   if (owner) { conditions.push({ "owner.target": new ObjectId(owner) }); }
+  if (organization) { conditions.push({ "organization": new ObjectId(organization) }); }
   if (customer) { conditions.push({ "customer.target": new ObjectId(customer) }); }
   if (creator) { conditions.push({ "creator.target": new ObjectId(creator) }); }