@ozdao/martyrs 0.2.427 → 0.2.429

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/views/classes/globals.websocket.js

@@ -54,25 +54,24 @@ class GlobalWebSocket {
       return Promise.resolve(false);
     }
 
-    // If already connected with the same user, just return the existing connection
-    if (this.isConnected && this.userId === userId && this.socket) {
-      return Promise.resolve(this.socket);
-    }
-
+    // Always update userId before any connection logic
     this.userId = userId;
 
-    // If there's already a connection attempt in progress, return that promise
-    if (this.connectPromise) {
-      return this.connectPromise;
+    // If already connected with the same user and socket is valid, return the existing connection
+    if (this.isConnected && this.socket && this.socket.readyState === WebSocket.OPEN) {
+      return Promise.resolve(this.socket);
     }
 
+    // Clear any existing connection promise to avoid conflicts
+    this.connectPromise = null;
+
     // Create new connection promise
     this.connectPromise = new Promise((resolve, reject) => {
       // Close existing connection if any
       this.disconnect();
 
       // Create new WebSocket connection with user ID
-      const wsUrl = userId ? `${this.baseUrl}?userId=${userId}` : this.baseUrl;
+      const wsUrl = userId ? `${this.baseUrl}?userId=${encodeURIComponent(userId)}` : this.baseUrl;
       this.socket = new WebSocket(wsUrl);
 
       // Setup event handlers
@@ -142,7 +141,7 @@ class GlobalWebSocket {
    * @param {Object|String} data - Data to send
    * @returns {Boolean} Success status
    */
-  send(data) {
+  async send(data) {
     if (!this.socket || this.socket.readyState !== WebSocket.OPEN) {
       console.error('Cannot send message: WebSocket is not connected');
       return false;
@@ -150,7 +149,7 @@ class GlobalWebSocket {
 
     try {
       const message = typeof data === 'string' ? data : JSON.stringify(data);
-      this.socket.send(message);
+      await this.socket.send(message);
       return true;
     } catch (error) {
       console.error('Error sending WebSocket message:', error);

package/src/modules/landing/components/sections/Examples.vue

@@ -4,7 +4,7 @@
 			<h2 class="mn-center text-fade-in"><span class="text-splitted">Example of the Strains</span></h2> 
 		</header>
 		<div class="cols-4 w-100 o-scroll pos-relative gap-medium">
-      <img loading="lazy"  v-for="(signal,index)  in signals"   class="radius-big h-max-30r signal" :src="'/images/examples/' + signal">
+      <img loading="lazy"  v-for="(signal,index)  in signals"   class="radius-medium h-max-30r signal" :src="'/images/examples/' + signal">
 		</div>
 	</section>
 </template>

package/src/modules/landing/components/sections/HowToBuyWDR.vue

@@ -1,6 +1,6 @@
 <template>
   <section id="howtoget" class="cols-2 gap-thin">
-    <div class="pd-big bg-main radius-big">
+    <div class="pd-big bg-main radius-medium">
       <h2 class="mn-b-small">{{ t('buyTokenTitle') }}</h2>
       <p class="mn-b-semi p-big t-transp">{{ t('description') }}</p>
       <h3 class="mn-b-small">{{ t('purchaseDetailsTitle') }}</h3>
@@ -19,14 +19,14 @@
         {{ t('privateRoundText2') }}
     </div>
 
-    <div class="flex-column pd-big flex-nowrap flex h-100 bg-light radius-big o-hidden coming-soon">
+    <div class="flex-column pd-big flex-nowrap flex h-100 bg-light radius-medium o-hidden coming-soon">
       <div class="
         w-100 h-100
         rainbow
         flex-v-center flex-h-center
         flex-column flex 
         pd-big mn-b-medium
-        radius-big o-hidden"
+        radius-medium o-hidden"
       >
         <img loading="lazy" class="mn-b-small" src="/logo/logo-disabled.png">
         <p class="t-semi uppercase">{{ t('comingSoon') }}</p>

package/src/modules/landing/components/sections/SectionEarn.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="cols-2 gap-thin">
     <div class="pos-relative flex flex-column flex-center h-100">
-      <div class="mn-b-thin pd-big radius-big">
+      <div class="mn-b-thin pd-big radius-medium">
         <img v-if="te('logo')" loading="lazy" class="mn-b-semi h-4r" :src="t('logo')">
 
         <h2 v-if="te('title')" class="mn-b-medium" v-html="t('title')"/>
@@ -9,12 +9,12 @@
         <p v-if="te('subdescription')" class="mn-b-semi p-medium t-transp">{{ t('subdescription')}}</p>
 
       <div class="gap-thin cols-2">
-        <router-link :to="t('action_link')" class="flex t-center bg-white flex-center flex-column t-black pd-big radius-big">
+        <router-link :to="t('action_link')" class="flex t-center bg-white flex-center flex-column t-black pd-big radius-medium">
           <IconInfo class="mn-b-small i-extra" fill="rgb(var(--black)"/>
           <p class="uppercase t-semi">{{t('action')}}</p>
         </router-link>
 
-        <router-link :to="t('action_sublink') " class="flex t-center flex-center flex-column bg-main t-black pd-big radius-big">
+        <router-link :to="t('action_sublink') " class="flex t-center flex-center flex-column bg-main t-black pd-big radius-medium">
           <IconEarn class="mn-b-small i-extra" fill="rgb(var(--black)"/>
           <p class="uppercase t-semi">{{t('subaction')}}</p>
         </router-link>
@@ -24,7 +24,7 @@
 
     </div>
 
-    <div class="pos-relative pd-medium flex-column flex-center flex h-100 bg-main radius-big o-hidden">
+    <div class="pos-relative pd-medium flex-column flex-center flex h-100 bg-main radius-medium o-hidden">
       <img v-if="te('image')" loading="lazy" :src="t('image')" class="mn-t-auto z-index-1 w-75 mn-b-auto">
       <ConnectMetamask
         :tokenAddress="options.tokenAddress"

package/src/modules/landing/components/sections/SectionFeature.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="o-hidden bg-light pos-relative radius-big cols-2">
+	<div class="o-hidden bg-light pos-relative radius-medium cols-2">
 		<div style="min-height: 20rem;" :class="{'order-2':order}" class="pos-relative w-100 h-100 bg-light">
 			<img loading="lazy" class="w-100 h-100 object-fit-cover pos-absolute" :src="image">
 		</div>   

package/src/modules/landing/components/sections/SectionFeatures.vue

@@ -6,7 +6,7 @@
       <div 
         v-for="feature in tm('features')" 
         :key="feature.title" 
-        class="pd-medium  radius-big"
+        class="pd-medium  radius-medium"
       >
         <p class="h2 i-extra radius-extra bg-main flex-center d-inline-flex mn-b-medium">
           {{ feature.icon }}

package/src/modules/landing/components/sections/SectionFeaturesImages.vue

@@ -13,7 +13,7 @@
       <div 
         v-for="feature in tm('features')" 
         :key="feature.title" 
-        class="w-100 pd-medium bg-light radius-big"
+        class="w-100 pd-medium bg-light radius-medium"
       >
         <img loading="lazy" 
           class="radius-medium bg-light h-max-20r object-fit-cover w-100 mn-b-medium" 

package/src/modules/landing/components/sections/SectionFocus.vue

@@ -1,5 +1,5 @@
 <template>
-	<section id="our-focus" class="bg-light radius-big pd-big cols-2 flex">
+	<section id="our-focus" class="bg-light radius-medium pd-big cols-2 flex">
 		
 		<div class="col">
 			

package/src/modules/landing/components/sections/SectionHeroVideo.vue

@@ -6,7 +6,7 @@
       <div class="col-1 flex-justify flex-column flex o-hidden" itemprop="description">
         
 
-        <div class="pd-big bg-main mn-b-thin  radius-big">
+        <div class="pd-big bg-main mn-b-thin  radius-medium">
 	        <h1 class="mn-b-small">
 	        	<span class="text-fade-in">
 							<span class="text-splitted" v-html="t('viewpoint.title')"/>
@@ -16,7 +16,7 @@
 	        <p class="p-big t-transp">{{ t('viewpoint.description') }}</p>
 	      </div>
 
-        <div class="pd-big bg-black t-white radius-big">
+        <div class="pd-big bg-black t-white radius-medium">
           <p class="p-big mn-b-small" itemprop="name">{{ t('contacts.name') }}</p>
           
           <address class="d-block mn-b-small" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
@@ -44,7 +44,7 @@
 			</div>
       <!-- Right col -->
       <div class="col-2 w-100 flex">
-      	<div class="pos-relative radius-big video-wrapper w-100 h-100 o-hidden">
+      	<div class="pos-relative radius-medium video-wrapper w-100 h-100 o-hidden">
       		<div class="video-gradient"></div>
     			<video ref="videoElement" style="object-fit: cover; position: absolute;" class="video-height" preload autoplay muted loop playsinlineclass playsinline src="/videos/farming.mp4" itemprop="video" type="video/mp4" ></video>
       	</div>

package/src/modules/landing/components/sections/SectionMobileApp.vue

@@ -3,7 +3,7 @@
     <div class="z-index-1 h-100">
       <img loading="lazy" 
         :src="(FILE_SERVER_URL || '') + t('image')" 
-        class="radius-big h-100 w-100 object-fit-cover"
+        class="radius-medium h-100 w-100 object-fit-cover"
       >
     </div>
 
@@ -27,7 +27,7 @@
         > 
           <span 
             v-if="te('label')"
-            class="z-index-2 radius-big bg-main t-semi uppercase pd-l-thin pd-r-thin pos-absolute pos-r-10-negative pos-t-10-negative"
+            class="z-index-2 radius-medium bg-main t-semi uppercase pd-l-thin pd-r-thin pos-absolute pos-r-10-negative pos-t-10-negative"
           >
             {{ t('label') }}
           </span>
@@ -42,7 +42,7 @@
         > 
           <span 
             v-if="te('label')"
-            class="z-index-2 pd-l-thin pd-r-thin radius-big bg-main t-semi uppercase pos-absolute pos-r-10-negative pos-t-10-negative"
+            class="z-index-2 pd-l-thin pd-r-thin radius-medium bg-main t-semi uppercase pos-absolute pos-r-10-negative pos-t-10-negative"
           >
             {{ t('label') }}
           </span>

package/src/modules/landing/components/sections/SectionOverview.vue

@@ -9,7 +9,7 @@
         v-for="section in tm('sections')" 
         :key="section.route"
         :to="section.route" 
-        class="cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big"
+        class="cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-medium"
       >
         <img 
           loading="lazy" 

package/src/modules/landing/components/sections/SectionRoadmap.vue

@@ -41,7 +41,7 @@ const { t,tm } = useI18n(props.textData);
 </script>
 
 <template>
-  <div class="o-hidden bg-black t-white t-left pd-big radius-big">
+  <div class="o-hidden bg-black t-white t-left pd-big radius-medium">
     <h2 class="mn-b-big t-center w-100">{{ t('title') }}</h2>
     
     <div class="gap-thin flex-nowrap flex o-scrolled timeline custom-scroll">

package/src/modules/landing/components/sections/WhatIsWDRSection.vue

@@ -10,19 +10,19 @@
 
     <div class="cols-3 gap-thin">
 
-      <div class="w-100 pd-medium bg-light radius-big">
+      <div class="w-100 pd-medium bg-light radius-medium">
         <img loading="lazy" class="radius-medium bg-light h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step1.png"> 
         <h3 class="mn-b-medium">{{t('steps.step1.headline')}}</h3>
         <p class="t-transp">{{t('steps.step1.text')}}</p>
       </div>
 
-      <div class="w-100 pd-medium bg-light radius-big">
+      <div class="w-100 pd-medium bg-light radius-medium">
         <img loading="lazy" class="radius-medium bg-light  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step2.png"> 
         <h3 class="mn-b-medium">{{t('steps.step2.headline')}}</h3>
         <p class="t-transp">{{t('steps.step2.text')}}</p>
       </div>
 
-      <div class="w-100 pd-medium bg-light radius-big">
+      <div class="w-100 pd-medium bg-light radius-medium">
         <img loading="lazy" class="radius-medium bg-light  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step3.png">
         <h3 class="mn-b-medium">{{t('steps.step3.headline')}}</h3>
         <p class="t-transp">{{t('steps.step3.text')}}</p>

package/src/modules/marketplace/views/components/sections/SectionMenu.vue

@@ -1,11 +1,11 @@
 <template>
-	<section id="main-menu" class="pd-thin pos-relative">
+	<section id="main-menu" class="pos-relative">
 		<h2 class="w-m-60r mn-auto pd-t-big pd-b-big t-center">
 			Weed and Accessories to <br><b>Enhance Your Smoking Experience</b> 
 		</h2>
 
 		<transition name="fade" mode="out-in"  appear>
-			<div v-if="!menu"  class="w-100 h-15r radius-big flex-center bg-light">
+			<div v-if="!menu"  class="w-100 h-15r radius-medium flex-center bg-light">
 				<Loader class="pos-relative"/>
 			</div>
 
@@ -13,7 +13,7 @@
 				<router-link :to="getMarketplaceLink([category.url])"
 					v-for="(category,index) in categoriesRoot.slice(0,5)" 
 					:key="category" 
-					class="cursor-pointer hover-scale-0 flex-v-center flex-h-center flex-nowrap flex-row flex bg-light radius-big pd-medium grid-item"
+					class="cursor-pointer hover-scale-0 flex-v-center flex-h-center flex-nowrap flex-row flex bg-light radius-medium pd-medium grid-item"
 				>
 
 					<video 

package/src/modules/notifications/components/elements/NotificationBadge.vue

@@ -117,6 +117,13 @@ const handleClickOutside = (event) => {
 // Lifecycle hooks
 onMounted(() => {
   document.addEventListener('click', handleClickOutside);
+
+  if (isOpen.value) {
+    const userId = auth.state.user._id;
+    if (userId) {
+      getNotifications(userId);
+    }
+  }
 });
 
 onUnmounted(() => {

package/src/modules/orders/components/blocks/CardOrderItem.vue

@@ -23,7 +23,7 @@
         <div>
           <p>
             <span class="t-second mn-r-micro d-inline-block t-demi">
-              {{ product.price_currency || returnCurrency() }}{{ (product.listing === 'rent' ? (rentalDays || product.quantity || 1) : (product.quantity || 1)) * product.price }}
+              {{ product.price_currency || returnCurrency() }}{{ (product.listing === 'rent' ? (rentalDays || product.quantity || 0) : (product.quantity || 0)) * product.price }}
             </span>
 
             <span class="p-small t-transp">
@@ -34,7 +34,7 @@
               </template>
               
               <template v-else>
-                {{ product.quantity || 1 }} {{ product.unit || 'pcs' }}
+                {{ product.quantity || 0 }} {{ product.unit || 'pcs' }}
               </template>
             </span>
           </p>