@ozdao/martyrs 0.2.475 → 0.2.476

package/src/modules/globals/views/classes/globals.websocket.js

@@ -11,7 +11,12 @@ class GlobalWebSocket {
     this.listeners = {};
     this.userId = null;
     this.connectPromise = null;
-    this.subscribedModules = new Set(); // <--- ключевое изменение
+    this.subscribedModules = new Set();
+    
+    // RPC-специфичные свойства
+    this.rpcCallbacks = new Map();
+    this.rpcTimeout = 30000; // 30 секунд таймаут по умолчанию
+    this.rpcIdCounter = 0;
   }
 
   initialize(options = {}) {
@@ -19,6 +24,7 @@ class GlobalWebSocket {
     this.reconnectDelay = options.reconnectDelay || this.reconnectDelay;
     this.baseUrl = options.wsUrl || this._getDefaultWsUrl();
     this.pingIntervalTime = options.pingInterval || this.pingIntervalTime;
+    this.rpcTimeout = options.rpcTimeout || this.rpcTimeout;
   }
 
   _getDefaultWsUrl() {
@@ -32,15 +38,21 @@ class GlobalWebSocket {
     if (typeof window === 'undefined') return Promise.resolve(false);
     this.userId = userId;
 
+    // Проверяем существующее соединение
     if (this.isConnected && this.socket?.readyState === WebSocket.OPEN) {
       return Promise.resolve(this.socket);
     }
+    
+    // Предотвращаем создание множества промисов при параллельных вызовах
+    if (this.connectPromise) {
+      return this.connectPromise;
+    }
 
     this.connectPromise = new Promise((resolve, reject) => {
       this.disconnect();
 
-      const wsUrl = userId ? `${this.baseUrl}?userId=${encodeURIComponent(userId)}` : this.baseUrl;
-      this.socket = new WebSocket(wsUrl);
+      // Используем baseUrl без параметров, так как аутентификация через cookie
+      this.socket = new WebSocket(this.baseUrl);
 
       this.socket.onopen = () => {
         this._handleOpen();
@@ -85,8 +97,15 @@ class GlobalWebSocket {
       this.pingInterval = null;
     }
 
+    // Отменяем все ожидающие RPC вызовы
+    for (const [id, { reject }] of this.rpcCallbacks.entries()) {
+      reject(new Error('WebSocket disconnected'));
+      this.rpcCallbacks.delete(id);
+    }
+
     this.isConnected = false;
     this.userId = null;
+    this.subscribedModules.clear(); // Очищаем подписки при отключении
   }
 
   async send(data) {
@@ -105,6 +124,58 @@ class GlobalWebSocket {
     }
   }
 
+  /**
+   * Выполняет RPC вызов на сервере
+   * @param {string} module - Имя модуля
+   * @param {string} method - Имя метода
+   * @param {object} params - Параметры метода
+   * @param {object} [options] - Опции вызова
+   * @param {number} [options.timeout] - Таймаут в миллисекундах
+   * @returns {Promise<any>} - Результат вызова
+   */
+  rpc(module, method, params = {}, options = {}) {
+    if (!this.isConnected || this.socket?.readyState !== WebSocket.OPEN) {
+      return Promise.reject(new Error('WebSocket is not connected'));
+    }
+    
+    if (!module || !method) {
+      return Promise.reject(new Error('Module and method are required'));
+    }
+    
+    // Генерируем уникальный ID для вызова
+    const id = `${++this.rpcIdCounter}`;
+    const timeout = options.timeout || this.rpcTimeout;
+    
+    return new Promise((resolve, reject) => {
+      // Записываем информацию о вызове для последующей обработки ответа
+      this.rpcCallbacks.set(id, {
+        resolve,
+        reject,
+        timeoutId: setTimeout(() => {
+          if (this.rpcCallbacks.has(id)) {
+            this.rpcCallbacks.delete(id);
+            reject(new Error(`RPC call to ${module}.${method} timed out after ${timeout}ms`));
+          }
+        }, timeout)
+      });
+      
+      // Отправляем RPC запрос
+      this.send({
+        type: 'rpc',
+        module,
+        method,
+        params,
+        id
+      }).catch(err => {
+        if (this.rpcCallbacks.has(id)) {
+          clearTimeout(this.rpcCallbacks.get(id).timeoutId);
+          this.rpcCallbacks.delete(id);
+          reject(err);
+        }
+      });
+    });
+  }
+
   addEventListener(eventType, callback, options = {}) {
     const listenerId = `${options.module || 'global'}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
     if (!this.listeners[eventType]) this.listeners[eventType] = {};
@@ -136,6 +207,14 @@ class GlobalWebSocket {
     }
   }
 
+  async unsubscribeModule(moduleName) {
+    if (!moduleName || !this.subscribedModules.has(moduleName)) return;
+    const success = await this.send({ type: 'unsubscribe', module: moduleName });
+    if (success) {
+      this.subscribedModules.delete(moduleName);
+    }
+  }
+
   _resubscribeAllModules() {
     for (const moduleName of this.subscribedModules) {
       this.send({ type: 'subscribe', module: moduleName });
@@ -152,13 +231,36 @@ class GlobalWebSocket {
       }
     }, this.pingIntervalTime);
 
-    this._resubscribeAllModules(); // <--- ВАЖНО
+    this._resubscribeAllModules();
     this._notifyListeners('open', { isConnected: true });
   }
 
   _handleMessage(event) {
+    // Проверка на типы сообщений - пропускаем бинарные сообщения
+    if (typeof event.data !== 'string') {
+      console.warn('Received binary message, but only JSON is supported');
+      return;
+    }
+    
     try {
       const data = JSON.parse(event.data);
+      
+      // Обрабатываем ответы на RPC вызовы
+      if (data.type === 'rpc_response' && data.id && this.rpcCallbacks.has(data.id)) {
+        const { resolve, reject, timeoutId } = this.rpcCallbacks.get(data.id);
+        clearTimeout(timeoutId);
+        this.rpcCallbacks.delete(data.id);
+        
+        if (data.error) {
+          reject(Object.assign(new Error(data.error.message), data.error));
+        } else {
+          resolve(data.result);
+        }
+        
+        return;
+      }
+      
+      // Обрабатываем обычные сообщения
       this._notifyListeners('message', data);
       if (data.type) {
         this._notifyListeners(data.type, data);
@@ -171,6 +273,13 @@ class GlobalWebSocket {
   _handleError(error) {
     console.error('WebSocket error:', error);
     this._notifyListeners('error', { error });
+    
+    // Отменяем все RPC вызовы с ошибкой соединения
+    for (const [id, { reject, timeoutId }] of this.rpcCallbacks.entries()) {
+      clearTimeout(timeoutId);
+      reject(new Error('WebSocket connection error'));
+      this.rpcCallbacks.delete(id);
+    }
   }
 
   _handleClose(event) {
@@ -180,6 +289,13 @@ class GlobalWebSocket {
       this.pingInterval = null;
     }
 
+    // Отменяем все RPC вызовы при закрытии соединения
+    for (const [id, { reject, timeoutId }] of this.rpcCallbacks.entries()) {
+      clearTimeout(timeoutId);
+      reject(new Error('WebSocket connection closed'));
+      this.rpcCallbacks.delete(id);
+    }
+
     this._notifyListeners('close', { code: event.code, reason: event.reason });
 
     if (event.code !== 1000 && this.userId && this.reconnectAttempts < this.maxReconnectAttempts) {
@@ -209,4 +325,4 @@ class GlobalWebSocket {
 }
 
 const globalWebSocket = new GlobalWebSocket();
-export default globalWebSocket;
+export default globalWebSocket;

package/src/modules/globals/views/classes/globals.websocket.ws.js

@@ -0,0 +1,212 @@
+class GlobalWebSocket {
+  constructor() {
+    this.socket = null;
+    this.isConnected = false;
+    this.reconnectAttempts = 0;
+    this.maxReconnectAttempts = 5;
+    this.reconnectDelay = 3000;
+    this.baseUrl = null;
+    this.pingInterval = null;
+    this.pingIntervalTime = 30000;
+    this.listeners = {};
+    this.userId = null;
+    this.connectPromise = null;
+    this.subscribedModules = new Set(); // <--- ключевое изменение
+  }
+
+  initialize(options = {}) {
+    this.maxReconnectAttempts = options.maxReconnectAttempts || this.maxReconnectAttempts;
+    this.reconnectDelay = options.reconnectDelay || this.reconnectDelay;
+    this.baseUrl = options.wsUrl || this._getDefaultWsUrl();
+    this.pingIntervalTime = options.pingInterval || this.pingIntervalTime;
+  }
+
+  _getDefaultWsUrl() {
+    if (typeof window === 'undefined') return '/api/ws';
+    const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+    const host = window.location.host;
+    return `${protocol}//${host}/api/ws`;
+  }
+
+  connect(userId) {
+    if (typeof window === 'undefined') return Promise.resolve(false);
+    this.userId = userId;
+
+    if (this.isConnected && this.socket?.readyState === WebSocket.OPEN) {
+      return Promise.resolve(this.socket);
+    }
+
+    this.connectPromise = new Promise((resolve, reject) => {
+      this.disconnect();
+
+      const wsUrl = userId ? `${this.baseUrl}?userId=${encodeURIComponent(userId)}` : this.baseUrl;
+      this.socket = new WebSocket(wsUrl);
+
+      this.socket.onopen = () => {
+        this._handleOpen();
+        resolve(this.socket);
+      };
+
+      this.socket.onmessage = this._handleMessage.bind(this);
+      this.socket.onerror = (err) => {
+        this._handleError(err);
+        reject(err);
+      };
+      this.socket.onclose = this._handleClose.bind(this);
+
+      setTimeout(() => {
+        if (!this.isConnected) {
+          reject(new Error('WebSocket connection timeout'));
+        }
+      }, 10000);
+    }).finally(() => {
+      this.connectPromise = null;
+    });
+
+    return this.connectPromise;
+  }
+
+  disconnect() {
+    if (typeof window === 'undefined') return;
+
+    if (this.socket) {
+      this.socket.onopen = null;
+      this.socket.onmessage = null;
+      this.socket.onerror = null;
+      this.socket.onclose = null;
+      if (this.socket.readyState === WebSocket.OPEN || this.socket.readyState === WebSocket.CONNECTING) {
+        this.socket.close();
+      }
+      this.socket = null;
+    }
+
+    if (this.pingInterval) {
+      clearInterval(this.pingInterval);
+      this.pingInterval = null;
+    }
+
+    this.isConnected = false;
+    this.userId = null;
+  }
+
+  async send(data) {
+    if (!this.socket || this.socket.readyState !== WebSocket.OPEN) {
+      console.error('Cannot send message: WebSocket is not connected');
+      return false;
+    }
+
+    try {
+      const msg = typeof data === 'string' ? data : JSON.stringify(data);
+      this.socket.send(msg);
+      return true;
+    } catch (err) {
+      console.error('Error sending message:', err);
+      return false;
+    }
+  }
+
+  addEventListener(eventType, callback, options = {}) {
+    const listenerId = `${options.module || 'global'}_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+    if (!this.listeners[eventType]) this.listeners[eventType] = {};
+    this.listeners[eventType][listenerId] = callback;
+    return listenerId;
+  }
+
+  removeEventListener(eventType, listenerId) {
+    if (this.listeners[eventType]?.[listenerId]) {
+      delete this.listeners[eventType][listenerId];
+    }
+  }
+
+  removeModuleListeners(moduleName) {
+    Object.keys(this.listeners).forEach(eventType => {
+      Object.keys(this.listeners[eventType]).forEach(listenerId => {
+        if (listenerId.startsWith(`${moduleName}_`)) {
+          delete this.listeners[eventType][listenerId];
+        }
+      });
+    });
+  }
+
+  async subscribeModule(moduleName) {
+    if (!moduleName || this.subscribedModules.has(moduleName)) return;
+    const success = await this.send({ type: 'subscribe', module: moduleName });
+    if (success) {
+      this.subscribedModules.add(moduleName);
+    }
+  }
+
+  _resubscribeAllModules() {
+    for (const moduleName of this.subscribedModules) {
+      this.send({ type: 'subscribe', module: moduleName });
+    }
+  }
+
+  _handleOpen() {
+    this.isConnected = true;
+    this.reconnectAttempts = 0;
+
+    this.pingInterval = setInterval(() => {
+      if (this.socket?.readyState === WebSocket.OPEN) {
+        this.socket.send(JSON.stringify({ type: 'ping' }));
+      }
+    }, this.pingIntervalTime);
+
+    this._resubscribeAllModules(); // <--- ВАЖНО
+    this._notifyListeners('open', { isConnected: true });
+  }
+
+  _handleMessage(event) {
+    try {
+      const data = JSON.parse(event.data);
+      this._notifyListeners('message', data);
+      if (data.type) {
+        this._notifyListeners(data.type, data);
+      }
+    } catch (err) {
+      console.error('WebSocket message error:', err);
+    }
+  }
+
+  _handleError(error) {
+    console.error('WebSocket error:', error);
+    this._notifyListeners('error', { error });
+  }
+
+  _handleClose(event) {
+    this.isConnected = false;
+    if (this.pingInterval) {
+      clearInterval(this.pingInterval);
+      this.pingInterval = null;
+    }
+
+    this._notifyListeners('close', { code: event.code, reason: event.reason });
+
+    if (event.code !== 1000 && this.userId && this.reconnectAttempts < this.maxReconnectAttempts) {
+      this.reconnectAttempts++;
+      const delay = this.reconnectDelay * this.reconnectAttempts;
+      setTimeout(() => {
+        this.connect(this.userId).catch(err => {
+          console.error('Reconnection failed:', err);
+        });
+      }, delay);
+    }
+  }
+
+  _notifyListeners(eventType, data) {
+    Object.values(this.listeners[eventType] || {}).forEach(fn => {
+      try {
+        fn(data);
+      } catch (err) {
+        console.error(`Listener for ${eventType} failed:`, err);
+      }
+    });
+  }
+
+  isSocketConnected() {
+    return this.isConnected && this.socket?.readyState === WebSocket.OPEN;
+  }
+}
+
+const globalWebSocket = new GlobalWebSocket();
+export default globalWebSocket;

package/src/modules/globals/views/components/blocks/CardHeader.vue

@@ -13,7 +13,7 @@
 				<img loading="lazy" 
 					v-if="owner.target?.profile?.photo?.length > 0 && type !== 'short'" 
 					:src="(FILE_SERVER_URL || '') + owner.target.profile.photo" 
-					class="radius-medium object-fit-cover mn-r-thin i-thin" 
+					class="radius-medium flex-child-default object-fit-cover mn-r-thin i-thin" 
 
 					@click.stop="$router.push({
 						name: owner.type === 'user' ? 'User Profile' : 'Organization', 
@@ -26,7 +26,7 @@
 				<component
 					v-if="!owner.target?.profile?.photo && type !== 'short'"
 					:is="owner.type === 'user' ? PlaceholderUserpic : PlaceholderOrganizationPic"
-					class="radius-medium cursor-pointer mn-r-thin i-thin"
+					class="radius-medium flex-child-default cursor-pointer mn-r-thin i-thin"
 
 					@click.stop="$router.push({
 						name: owner.type === 'user' ? 'User Profile' : 'Organization', 

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

@@ -202,7 +202,7 @@
 			v-model:select="$i18n.locale"
 		  :options="$i18n.availableLocales"
 		  :property="'value'"
-      class="pos-relative uppercase pd-l-small pd-r-small pd-micro t-semi radius-thin"
+      class="pos-relative flex flex-column gap-small uppercase pd-thin t-semi radius-thin"
       :class="{
     		'bg-light t-black': theme === 'light',
     		'bg-dark t-white': theme === 'dark'  

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

@@ -136,7 +136,7 @@ const processRoute = (route) => {
             />
             <span 
               v-if="!item.iconComponent " 
-              class="i-medium sidebar-item-icon t-lh-1 flex-child-default"
+              class="p-medium"
             >
               {{ item.icon }}
             </span>

package/src/modules/icons/entities/IconFile.vue

@@ -0,0 +1,14 @@
+<template>
+	<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80" fill="none">
+		<path :fill="fill" :class="$attrs.class" d="M40.4192 33.6535H40.4231C44.2049 33.6535 47.2716 36.7242 47.2716 40.506C47.2716 44.2917 44.2049 47.3584 40.4192 47.3584C36.6374 47.3584 33.5667 44.2917 33.5667 40.506C33.5667 36.7362 36.6136 33.6774 40.3794 33.6575L40.3913 33.6535H40.3953L40.4192 33.6535ZM56.0983 44.5582H56.1063C57.0835 44.5582 58.0607 44.9316 58.8035 45.6784L68.8299 55.7049C69.4417 56.3166 69.4417 57.3057 68.8339 57.9215H68.8299C68.5241 58.2274 68.1228 58.3783 67.7217 58.3783C67.3244 58.3783 66.9312 58.2313 66.6253 57.9334H66.6174L66.6134 57.9215L56.5909 47.899V47.895C56.4559 47.76 56.2771 47.6925 56.0984 47.6925C55.9315 47.6925 55.7647 47.752 55.6336 47.8752L41.3171 62.1876C41.0112 62.4935 40.61 62.6484 40.2088 62.6484C39.8077 62.6484 39.4104 62.4935 39.1045 62.1916V62.1955L39.1006 62.1876C38.4888 61.5759 38.4888 60.5828 39.1006 59.971L40.9954 58.0761V57.9768L38.8582 55.8396C38.7232 55.7045 38.5484 55.633 38.3696 55.633C38.2028 55.633 38.0359 55.6926 37.9048 55.8158L37.9485 55.8277L37.9009 55.8158L29.3602 64.3564C29.0543 64.6623 28.6491 64.8173 28.2479 64.8173C27.8586 64.8173 27.4613 64.6663 27.1594 64.3763H27.1555L27.1396 64.3565C26.5278 63.7447 26.5278 62.7516 27.1396 62.1398L35.6644 53.619L35.6684 53.611H35.6723C36.3993 52.8881 37.3447 52.5186 38.2981 52.5028H38.314C38.3299 52.4988 38.3537 52.4988 38.3696 52.4988C39.3468 52.4988 40.328 52.8722 41.0748 53.6191L43.212 55.7563L43.3114 55.7602L53.3974 45.6742C54.1283 44.9473 55.0777 44.5739 56.0351 44.5619H56.051H56.047C56.0669 44.5579 56.0825 44.5582 56.0983 44.5582ZM52.6543 8.00019V8.00416H52.6384C52.2967 8.00416 51.9512 8.04786 51.6016 8.13922L7.01895 20.0842C7.00703 20.0882 6.99511 20.0921 6.98319 20.0961L6.97922 20.1001C4.83012 20.696 3.56291 22.9165 4.13891 25.0735L14.0818 62.1837C14.5704 64.0031 16.219 65.2028 18.0146 65.2028C18.1417 65.2028 18.2688 65.1988 18.3959 65.1869L18.4038 29.5066C18.4038 25.975 21.2203 23.099 24.732 23.0037L24.7399 23.0077C24.7955 23.0037 24.8511 22.9998 24.9067 22.9998V23.0037H59.8L56.5903 11.0191C56.1017 9.19968 54.4537 8.00019 52.6543 8.00019ZM24.9071 25.4356H24.8912H24.8713H24.8673C22.6348 25.4595 20.8354 27.2749 20.8354 29.5074V67.9243C20.8354 70.1727 22.6587 71.996 24.9071 72H71.067C73.3154 71.996 75.1348 70.1727 75.1388 67.9243V29.5074C75.1348 27.259 73.3154 25.4356 71.067 25.4356H24.9071Z"/>
+	</svg>
+</template>
+
+<script setup>
+	const props = defineProps({
+	  fill: {
+	    type: String,
+	    default: 'rgb(var(--black))'
+	  }
+	})
+</script>

package/src/modules/icons/navigation/IconAttach.vue

@@ -0,0 +1,14 @@
+<template>
+<svg width="52" height="52" viewBox="0 0 52 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M4 26H48M26 4V48" :stroke="fill" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
+</template>
+
+<script setup>
+const props = defineProps({
+  fill: {
+    type: String,
+    default: 'rgb(var(--black))'
+  }
+})
+</script>

package/src/modules/icons/navigation/IconDoubleCheck.vue

@@ -0,0 +1,31 @@
+<template>
+	<svg 
+    width="19" 
+    height="15" 
+    viewBox="0 0 19 15" 
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path 
+			:fill="fill"
+      d="M9.97505 0.3828C10.3344 0.5453 10.5657 0.90155 10.5657 1.2953V13.2953C10.5657 13.6891 10.3344 14.0453 9.97505 14.2078C9.61567 14.3703 9.1938 14.3047 8.90005 14.0422L4.68442 10.2953H2.56567C1.46255 10.2953 0.565674 9.39843 0.565674 8.2953V6.2953C0.565674 5.19218 1.46255 4.2953 2.56567 4.2953H4.68442L8.90005 0.548425C9.1938 0.285925 9.61567 0.223425 9.97505 0.3828Z"
+    />
+    <path 
+      :fill="fill"
+      d="M15.5657 6.23301L13.8469 4.51426C13.5563 4.22051 13.0813 4.22363 12.7876 4.51426C12.4938 4.80488 12.4938 5.27988 12.7876 5.57363L14.5063 7.29238L12.7876 9.01113C12.4938 9.30176 12.4969 9.77676 12.7876 10.0705C13.0782 10.3643 13.5532 10.3643 13.8469 10.0705L15.5657 8.35176L17.2844 10.0705C17.5751 10.3643 18.0501 10.3611 18.3438 10.0705C18.6376 9.77988 18.6376 9.30488 18.3438 9.01113L16.6251 7.29238L18.3438 5.57363C18.6376 5.28301 18.6344 4.80801 18.3438 4.51426C18.0532 4.22051 17.5782 4.22051 17.2844 4.51426L15.5657 6.23301Z"
+    />
+  </svg>
+</template>
+
+<script setup>
+	const props = defineProps({
+  fill: {
+    type: String,
+    default: {
+      position: 'rgb(var(--black))'
+    }
+  },
+})
+</script>
+
+

package/src/modules/icons/navigation/IconSend.vue

@@ -0,0 +1,17 @@
+<template>
+	<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" viewBox="0 0 80 80" fill="none">
+	  <path :fill="fill" d="M25.2765 9.37509L29.0265 5.93759C30.589 4.53134 32.9327 4.68759 34.339 6.25009L63.2453 37.8126C64.339 39.0626 64.339 40.9376 63.2453 42.1876L34.339 73.7501C32.9327 75.3126 30.589 75.4689 29.0265 74.0626L25.2765 70.6251C23.714 69.3751 23.5577 66.8751 24.964 65.4689L48.4015 40.0001L24.964 14.5313C23.5577 13.1251 23.714 10.6251 25.2765 9.37509Z"/>
+	</svg>
+</template>
+
+
+<script>
+	export default {
+	  props: {
+	    fill: {
+	      type: String,
+	      default: 'rgb(var(--black)'
+	    }
+	  }
+	}
+</script>

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

@@ -1,6 +1,6 @@
 <template>
   <section id="howtobuy">
-    <h2 class="w-100 mn-b-small"><span class="d-inline-block w-max-50r" v-html="t('title')"/></h2>
+    <h2 class="w-100 w-max-50r mn-b-small" v-html="t('title')"/>
    
     <div class="cols-3 mobile:cols-1 gap-thin">
       <div 

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

@@ -1,11 +1,9 @@
 <template>
   <section id="mobileApp" class="cols-2 o-hidden ">
-    <div class="z-index-1 h-100">
       <img loading="lazy" 
         :src="(FILE_SERVER_URL || '') + t('image')" 
-        class="radius-medium h-100 w-100 object-fit-cover"
+        class="radius-medium w-100 h-100 mobile:h-auto object-fit-cover"
       >
-    </div>
 
     <div class="pd-big flex flex-h-center flex-column z-index-1 w-1/2">
       <h2 class="mn-t-medium mn-b-semi w-m-40r">{{ t('title') }}</h2>
@@ -13,7 +11,7 @@
       
       <div class="mn-b-big gap-medium cols-2">
         <div v-for="feature in tm('features')"  class="feature">
-          <h4 class="mn-b-thin">{{ feature.title }}</h4>
+          <h4 class="mn-b-small">{{ feature.title }}</h4>
           <p class="t-transp p-medium">{{ feature.text }}</p>
         </div>
       </div>
@@ -27,7 +25,7 @@
         > 
           <span 
             v-if="te('label')"
-            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"
+            class="z-index-2 radius-medium bg-main t-semi uppercase pd-thin pos-absolute pos-r-10-negative pos-t-10-negative"
           >
             {{ t('label') }}
           </span>
@@ -42,7 +40,7 @@
         > 
           <span 
             v-if="te('label')"
-            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"
+            class="z-index-2 pd-thin radius-medium bg-main t-semi uppercase pos-absolute pos-r-10-negative pos-t-10-negative"
           >
             {{ t('label') }}
           </span>

package/src/modules/marketplace/views/components/layouts/Marketplace.vue

@@ -28,9 +28,7 @@
 		  				<template v-if="localPosition.country">{{localPosition.country}}</template>
 		    		</span>
 
-		    		<span v-else @click="a => { globals.state.isOpenLocationPopup = true }"  class="h2 pd-l-small pd-r-small pd-t-micro pd-b-micro d-inline-block t-semi radius-extra bg-main t-black cursor-pointer">
-								The World
-		    		</span>
+		    		<span v-else @click="a => { globals.state.isOpenLocationPopup = true }"  class="t-main t-semi cursor-pointer">The World</span>
 		    	</h2>
 				</header>
 

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

@@ -6,12 +6,12 @@
       :aria-label="unreadCount > 0 ? `${unreadCount} unread notifications` : 'No unread notifications'"
     >
       <IconBell class="notification-icon i-medium" :fill="fill"/>
-      <span 
+      <div  
         v-if="unreadCount > 0" 
-        class="button-counter"
+        class="button-counter flex-center"
       >
-        {{ unreadCount > 99 ? '99+' : unreadCount }}
-      </span>
+        <span>{{ unreadCount > 99 ? '99+' : unreadCount }}</span>
+      </div>
     </button>
     <div v-if="isOpen" class="notifications-dropdown">
       <div class="notifications-header">

package/src/modules/orders/components/pages/OrderCreate.vue

@@ -14,7 +14,7 @@
 		:order="order" 
 	/>
 	<!-- Уведомления о минимальной сумме заказа и времени работы -->
-	<div v-if="shopcart.state.positions.length > 0 && orders.state.current.status !== true" class="w-100 gap-thin cols-1 mn-b-thin">
+	<div v-if="shopcart.state.positions.length > 0" class="w-100 gap-thin cols-1 mn-b-thin">
 		<div v-if="!isOpen" class="bg-fifth-nano pd-small radius-medium t-center">
 			<p class="t-fourth">⚠️ This spot is currently closed. You can place an order, but it will be processed when the spot opens.</p>
 		</div>

package/src/modules/organizations/components/sections/Unit.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="bg-white o-hidden radius-small pd-medium">
     <div class="mn-b-small">
-      <h5 class="mn-b-thin">Название отдела:</h5>
+      <h5 class="mn-b-small">Название отдела:</h5>
       <input type="text" class="h3" v-model="unit.name" />
 
     </div>
     <hr class="mn-b-small">
     <div class="mn-b-small">
-      <h5 class="mn-b-thin">Команда: </h5>
+      <h5 class="mn-b-small">Команда: </h5>
 
       <ul class="mn-b-thin">
         <li v-if="unit.participants.length < 1">В отделе еще нет участников</li>
@@ -21,7 +21,7 @@
     </div>
 
      <hr class="mn-b-small">
-         <h5 class="mn-b-thin">Подотделы:</h5>
+         <h5 class="mn-b-small">Подотделы:</h5>
     <div class=" o-hidden mn-b-small radius-small subunit" v-for="(subunit, index) in unit.subunits" :key="index">
 
 

package/src/modules/spots/components/pages/SpotEdit.vue

@@ -129,7 +129,6 @@
             spots.state.spot.address = newAddress;
           }"
         />
-        {{spots.state.spot.worktime}}
         <WorktimeEdit 
           v-model:worktime="spots.state.spot.worktime"
           class="mn-b-small"