@ozdao/martyrs 0.2.471 → 0.2.473

package/dist/style.css

@@ -441,7 +441,7 @@ ul li[data-v-bf25c24d] {
   flex-basis: 0;
   min-width: 0;
 }
-.skeleton-wrapper[data-v-1c010433] {
+.skeleton-wrapper[data-v-70b3339a] {
   width: 100%;
   position: relative;
   background-color: var(--skeleton-card-color);
@@ -449,37 +449,36 @@ ul li[data-v-bf25c24d] {
 }
 
 /* Стили для режима загрузки */
-.skeleton-wrapper--loading[data-v-1c010433] * {
+.skeleton-wrapper--loading[data-v-70b3339a] * {
   color: transparent !important;
   border-color: transparent !important;
   position: relative;
 }
-.skeleton-wrapper--loading[data-v-1c010433] img,
-.skeleton-wrapper--loading[data-v-1c010433] svg,
-.skeleton-wrapper--loading[data-v-1c010433] button,
-.skeleton-wrapper--loading[data-v-1c010433] a {
+.skeleton-wrapper--loading[data-v-70b3339a] img,
+.skeleton-wrapper--loading[data-v-70b3339a] svg,
+.skeleton-wrapper--loading[data-v-70b3339a] button,
+.skeleton-wrapper--loading[data-v-70b3339a] a {
   opacity: 0;
 }
-.skeleton-wrapper--loading[data-v-1c010433] *::before,
-.skeleton-wrapper--loading[data-v-1c010433] *::after {
+.skeleton-wrapper--loading[data-v-70b3339a] *::before,
+.skeleton-wrapper--loading[data-v-70b3339a] *::after {
   display: none !important;
 }
-.skeleton-wrapper--loading[data-v-1c010433] * {
+.skeleton-wrapper--loading[data-v-70b3339a] * {
   position: relative;
   background-color: var(--skeleton-block-color) !important;
   border-radius: var(--skeleton-border-radius);
   overflow: hidden;
 }
-.skeleton-wrapper--loading[data-v-1c010433] *::before {
+.skeleton-wrapper--loading[data-v-70b3339a] *::before {
   content: '';
   position: absolute;
   top: 0;
   left: -100%;
   width: 100%;
   height: 100%;
-  z-index: 10;
   display: block !important;
-  animation: shimmer-1c010433 var(--skeleton-animation-duration) infinite;
+  animation: shimmer-70b3339a var(--skeleton-animation-duration) infinite;
   background: linear-gradient(
     90deg,
     transparent 0%,
@@ -489,7 +488,7 @@ ul li[data-v-bf25c24d] {
 }
 
 /* Стили для структурного скелетона */
-.skeleton-structure[data-v-1c010433] {
+.skeleton-structure[data-v-70b3339a] {
   display: flex;
   flex-direction: column;
   gap: 0.75rem;
@@ -497,25 +496,25 @@ ul li[data-v-bf25c24d] {
 }
 
 /* Горизонтальный скелетон для карточек пользователей */
-.skeleton-structure--horizontal[data-v-1c010433] {
+.skeleton-structure--horizontal[data-v-70b3339a] {
   flex-direction: row;
   align-items: center;
   flex-wrap: nowrap;
 }
-.skeleton-item[data-v-1c010433] {
+.skeleton-item[data-v-70b3339a] {
   background-color: var(--skeleton-block-color);
   border-radius: var(--skeleton-border-radius);
   position: relative;
   overflow: hidden;
 }
-.skeleton-item[data-v-1c010433]::after {
+.skeleton-item[data-v-70b3339a]::after {
   content: '';
   position: absolute;
   top: 0;
   left: -100%;
   width: 100%;
   height: 100%;
-  animation: shimmer-1c010433 var(--skeleton-animation-duration) infinite;
+  animation: shimmer-70b3339a var(--skeleton-animation-duration) infinite;
   background: linear-gradient(
     90deg,
     transparent 0%,
@@ -525,64 +524,64 @@ ul li[data-v-bf25c24d] {
 }
 
 /* Типы блоков */
-.skeleton-item--text[data-v-1c010433] {
+.skeleton-item--text[data-v-70b3339a] {
   height: 1rem;
   width: 100%;
 }
-.skeleton-item--text-group[data-v-1c010433] {
+.skeleton-item--text-group[data-v-70b3339a] {
   display: flex;
   flex-direction: column;
   gap: 0.5rem;
   flex: 1;
 }
-.skeleton-item--image[data-v-1c010433] {
+.skeleton-item--image[data-v-70b3339a] {
   width: 100%;
   aspect-ratio: 16 / 9;
 }
-.skeleton-item--avatar[data-v-1c010433] {
+.skeleton-item--avatar[data-v-70b3339a] {
   width: 4rem;
   height: 4rem;
   border-radius: 50%;
   flex-shrink: 0;
 }
-.skeleton-item--button[data-v-1c010433] {
+.skeleton-item--button[data-v-70b3339a] {
   height: 3rem;
   width: 8rem;
 }
-.skeleton-item--circle[data-v-1c010433] {
+.skeleton-item--circle[data-v-70b3339a] {
   border-radius: 50%;
 }
-.skeleton-item--action[data-v-1c010433] {
+.skeleton-item--action[data-v-70b3339a] {
   width: 2rem;
   height: 2rem;
   border-radius: 50%;
   flex-shrink: 0;
 }
-.skeleton-item--actions-group[data-v-1c010433] {
+.skeleton-item--actions-group[data-v-70b3339a] {
   display: flex;
   gap: 0.5rem;
   margin-left: auto;
 }
-.skeleton-item--square[data-v-1c010433] {
+.skeleton-item--square[data-v-70b3339a] {
   aspect-ratio: 1 / 1;
 }
 
 /* Размеры */
-.skeleton-item--small[data-v-1c010433] {
+.skeleton-item--small[data-v-70b3339a] {
   width: 30%;
 }
-.skeleton-item--medium[data-v-1c010433] {
+.skeleton-item--medium[data-v-70b3339a] {
   width: 60%;
 }
-.skeleton-item--large[data-v-1c010433] {
+.skeleton-item--large[data-v-70b3339a] {
   width: 100%;
 }
-.skeleton-item--rounded[data-v-1c010433] {
+.skeleton-item--rounded[data-v-70b3339a] {
   border-radius: 50%;
 }
 
 /* Дефолтный скелетон */
-.skeleton-default[data-v-1c010433] {
+.skeleton-default[data-v-70b3339a] {
   display: flex;
   flex-direction: column;
   gap: 0.75rem;
@@ -590,7 +589,7 @@ ul li[data-v-bf25c24d] {
 }
 
 /* Анимация движения полосы */
-@keyframes shimmer-1c010433 {
+@keyframes shimmer-70b3339a {
 0% {
     left: -100%;
 }
@@ -1424,28 +1423,28 @@ div.vue-tags-input.disabled * {
   transform: translateX(0%);
   opacity: 1;
 }
-.rotate-180[data-v-3ff9e945] {
+.rotate-180[data-v-f45211ee] {
   transform: rotate(180deg);
 }
-.hidden[data-v-3ff9e945] {
+.hidden[data-v-f45211ee] {
 /*  opacity: 0;*/
   width: 0;
   display: none;
 }
-.visible[data-v-3ff9e945] {
+.visible[data-v-f45211ee] {
 /*  opacity: 1;*/
   display: block;
 }
 
 /* Dropdown animations */
-.dropdown-enter[data-v-3ff9e945], .dropdown-leave[data-v-3ff9e945] {
+.dropdown-enter[data-v-f45211ee], .dropdown-leave[data-v-f45211ee] {
   transition: all 0.3s ease-in-out;
 }
-.dropdown-enter-from[data-v-3ff9e945], .dropdown-leave-to[data-v-3ff9e945] {
+.dropdown-enter-from[data-v-f45211ee], .dropdown-leave-to[data-v-f45211ee] {
   opacity: 0;
   transform: translateY(-0.5rem);
 }
-.dropdown-enter-to[data-v-3ff9e945], .dropdown-leave-from[data-v-3ff9e945] {
+.dropdown-enter-to[data-v-f45211ee], .dropdown-leave-from[data-v-f45211ee] {
   opacity: 1;
   transform: translateY(0);
 }

package/dist/wallet.server.js

@@ -1,6 +1,6 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
-const index = require("./index-DxIIUtHr.js");
+const index = require("./index-CVXl1rB5.js");
 require("axios");
 require("bcryptjs");
 require("crypto");

package/dist/wallet.server.mjs

@@ -1,5 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
-import { r as requireMiddlewares } from "./index-CgMJYdNI.mjs";
+import { r as requireMiddlewares } from "./index-Df8vtZx7.mjs";
 import "axios";
 import "bcryptjs";
 import "crypto";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.471",
+  "version": "0.2.473",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -51,6 +51,7 @@
     }
   },
   "scripts": {
+    "preinstall": "npx only-allow pnpm",
     "clean": "rimraf dist",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",

package/src/components/Feed/Feed.vue

@@ -90,7 +90,7 @@
       v-for="i in currentLimit" 
       :structure="skeleton.structure"
       :horizontal="skeleton.horizontal"
-      :loading="isLoading"
+      :loading="skeleton.apply_to_slot"
       :key="'skeleton-' + i"
       class="radius-medium o-hidden d-block"
     />
@@ -247,9 +247,6 @@ let sentinel = ref(null)
 let currentSkip = ref(props.options.skip ? props.options.skip : 0);
 let currentLimit = ref(props.options.limit ? props.options.limit : 10);
 
-// let sortParam = ref(sort.value?.param || 'createdAt');
-// let sortOrder = ref(sort.value?.order || 'asc');
-
 let currentSearch = ref('');
 
 function debounce(fn, delay) {
@@ -329,9 +326,8 @@ const fetchItems = async () => {
   if (items.value) items.value = itemsList.value;
   isLoading.value = false;
 };
-
 watch(
-  () => [props.external, date.value, sort.value, props.options],
+  [() => props.external, () => date.value, () => ({...sort.value}), () => ({...props.options})],
   ([newExternal, newDate, newSort, newOptions], [oldExternal, oldDate, oldSort, oldOptions]) => {
     if (
       newExternal !== oldExternal ||
@@ -346,7 +342,6 @@ watch(
   },
   { deep: true }
 );
-
 let observer = null
 
 onMounted(async () => {

package/src/components/Skeleton/Skeleton.vue

@@ -36,7 +36,7 @@ const props = defineProps({
   // Флаг загрузки, определяет, нужно ли показывать скелетон
   loading: {
     type: Boolean,
-    default: true
+    default: false
   },
   // Структура скелетона, если не используется слот
   structure: {
@@ -56,12 +56,12 @@ const props = defineProps({
   // Цвет блоков скелетона (серый)
   blockColor: {
     type: String,
-    default: 'rgb(var(--light))'
+    default: 'rgba(var(--white),0.25)'
   },
   // Цвет анимированной полосы (белый с прозрачностью)
   highlightColor: {
     type: String,
-    default: 'rgba(255, 255, 255, 0.9)'
+    default: 'rgba(var(--white), 0.9)'
   },
   // Скорость анимации в секундах
   animationDuration: {
@@ -71,7 +71,7 @@ const props = defineProps({
   // Радиус закругления
   borderRadius: {
     type: String,
-    default: '4px'
+    default: '0.5rem'
   }
 });
 
@@ -130,7 +130,6 @@ onMounted(() => {
   left: -100%;
   width: 100%;
   height: 100%;
-  z-index: 10;
   display: block !important;
   animation: shimmer var(--skeleton-animation-duration) infinite;
   background: linear-gradient(

package/src/components/Tree/Tree.vue

@@ -13,7 +13,7 @@
       </slot>
       <Tree 
         :items="item.children"
-        :state="items"
+        :state="state"
         @update="emitChange"
         class="pd-l-medium"
         v-slot="{ item }"
@@ -77,6 +77,8 @@ function updateOrders(items, startOrder = 0) {
 }
 
 function handleChange(event) {
+
+    console.log('event order is', event)
   if (!event.added && !event.moved) return;
   
   const targetId = event.added ? 
@@ -84,11 +86,12 @@ function handleChange(event) {
     props.items[event.moved.newIndex]._id;
     
   const updatedCategory = findCategoryAndUpdateParent(props.state, targetId);
+
   if (!updatedCategory) return;
   
   // Обновляем order для всего дерева категорий
   updateOrders(props.state);
-  
+  console.log('hi')
   // Отправляем обновленную категорию
   emits('update', updatedCategory);
 }

package/src/modules/auth/controllers/middlewares/authJwt.js

@@ -6,8 +6,6 @@ const middlewareFactory = (db) => {
 
   const verifyToken = (continueOnFail = false) => {
     return async (req, res, next) => {
-      console.log(req.cookies)
-      console.log(req)
       try {
         let token = req.headers["x-access-token"];
 
@@ -44,11 +42,9 @@ const middlewareFactory = (db) => {
           _id: decoded._id
         }
 
-        console.log('userid', req.userId)
 
         next();
       } catch (err) {
-        console.log(err);
         req.userId = null;
         if (continueOnFail) {
           next();

package/src/modules/auth/views/store/auth.js

@@ -293,5 +293,6 @@ watch(state, (newState, oldState) => {
 // Module Export
 export {
   state,
-  actions
+  actions,
+  removeCookie
 };

package/src/modules/globals/globals.client.js

@@ -23,6 +23,8 @@ import alertPlugin from './views/plugins/alert.plugin.js'
 
 import store from './views/classes/store.js';
 
+import websockets from './views/classes/globals.websocket.js'
+
 // Пример функции инициализации для модуля заказов
 function initializeGlobals(app, store, router, config, options = {}) {
   const route = options.route || 'Home';
@@ -105,6 +107,7 @@ export {
   // Client,
   mixins,
   store,
+  websockets,
   scrollBehavior,
   getBrowserLocale,
   appRenderer,

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

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, watch, computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 
 import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
 
@@ -8,6 +8,7 @@ import * as globals from '@martyrs/src/modules/globals/views/store/globals'
 import * as auth from '@martyrs/src/modules/auth/views/store/auth'
 
 const router = useRouter()
+const route = useRoute()
 
 import Dropdown from '@martyrs/src/components/Dropdown/Dropdown.vue'
 import Spoiler from '@martyrs/src/components/Spoiler/Spoiler.vue'
@@ -60,11 +61,11 @@ const isSectionExpanded = (title) => {
   return expandedSections.value.includes(title)
 }
 
-watch(() => props.stateSidebar, (newValue) => {
-  if (!newValue) {
-    expandedSections.value = []
-  }
-})
+// watch(() => props.stateSidebar, (newValue) => {
+//   if (!newValue) {
+//     expandedSections.value = []
+//   }
+// })
 
 // Process route functions with globals and auth data
 const processRoute = (route) => {
@@ -119,10 +120,10 @@ const processRoute = (route) => {
         >
         <button
           class="transition-quint-out w-100 flex radius-small flex-nowrap cursor-pointer flex-v-center"
-          @click="item.route ? (isPhone ? (stateSidebar = false) : null, $route.path !== processRoute(item.route) ? router.push(processRoute(item.route)) : null) : null"
+          @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 === processRoute(item.route) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
               theme === 'light' ? 'hover-bg-light' : 'hover-bg-dark'
             ]"
         >
@@ -172,11 +173,11 @@ const processRoute = (route) => {
             <li v-for="subItem in item.subItems" :key="subItem.title">
               
               <a 
-               @click="subItem.route ? (isPhone ? (stateSidebar = false) : null, $route.path !== processRoute(subItem.route) ? router.push(processRoute(subItem.route)) : null) : null"
+               @click="subItem.route ? (isPhone ? (stateSidebar = false) : null, route.path !== processRoute(subItem.route) ? router.push(processRoute(subItem.route)) : null) : null"
                 href="#" 
                 class="transition-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 === processRoute(subItem.route) ? theme === 'light' ? 'bg-light' : 'bg-dark' : '',
                     theme === 'light' ? 'hover-bg-light' : 'hover-bg-dark'
                     ]"
               >

package/src/modules/globals/views/utils/vue-app-renderer.js

@@ -25,11 +25,15 @@ export function renderAndMountApp({ createApp }) {
       store.setInitialState(initialState);
     }
 
-    if (initialState && initialState.auth && initialState.auth.user) {
-      setAuthToken(initialState.auth.user.accessToken);
+    console.log('auth', initialState.auth)
+    if (initialState?.auth?.access?.token) {
+      setAuthToken(initialState.auth.access.token);
     } else {
+      store.auth.actions.resetState();
+      // await store.auth.removeCookie('user');
       await store.auth.actions.logout()
     }
+
    // app.config.globalProperties.$i18n.locale = router.currentRoute.value.params.locale
    // app.config.globalProperties.$i18n.locale = router.currentRoute.value.params.locale
     // If user browser locae supported then change locale
@@ -69,24 +73,11 @@ export async function render({ url, cookies, createApp }) {
   if (cookies.user) {  
     user = JSON.parse(cookies.user)
   }
-  
-  let auth = null
 
   if (user) {
     await store.auth.actions.initialize(user)
   } else {
-    // сделать вызов initial state и reset state
-    store.auth.state.user = {
-      _id: undefined,
-      username: '',
-      email: '',
-      phone: '',
-      password: '1',
-      passwordRepeat: ''
-    }
-
-    store.auth.state.access = { roles: null, token: null, status: false }
-    store.auth.state.accesses = []
+    store.auth.actions.resetState();
   }
 
   const html = await renderToString(app, sharedContext);

package/src/modules/notifications/controllers/notifications.controller.js

@@ -58,6 +58,48 @@ const NotificationsController = (db, wss) => {
     }
   };
 
+  // controllers/notifications.controller.js (добавить к существующему контроллеру)
+
+  // Mark all notifications as read for a user
+  const markAllAsRead = async (req, res) => {
+    try {
+      const userId = req.params.userId;
+      
+      // Update all unread notifications for this user
+      const result = await db.notification.updateMany(
+        { userId: userId, status: 'unread' },
+        { status: 'read', updatedAt: Date.now() }
+      );
+      
+      // Get all updated notifications for logging
+      const updatedNotifications = await db.notification.find({
+        userId: userId,
+        status: 'read',
+        updatedAt: { $gte: new Date(Date.now() - 10000) } // Get notifications updated in the last 10 seconds
+      });
+      
+      // Log the read status for each notification
+      const logPromises = updatedNotifications.map(notification => {
+        return db.notificationLog.create({
+          notificationId: notification._id,
+          userId: userId,
+          channelType: 'web', // Assuming web as default
+          status: 'read',
+          readAt: Date.now()
+        });
+      });
+      
+      await Promise.all(logPromises);
+      
+      return res.json({ 
+        message: 'All notifications marked as read',
+        count: result.modifiedCount
+      });
+    } catch (err) {
+      return res.status(500).json({ message: err.message });
+    }
+  };
+
   // Register device for push notifications
   const registerDevice = async (req, res) => {
     try {
@@ -132,7 +174,8 @@ const NotificationsController = (db, wss) => {
     markAsRead,
     registerDevice,
     updatePreferences,
-    getUserPreferences
+    getUserPreferences,
+    markAllAsRead
   };
 };
 

package/src/modules/notifications/notifications.server.js

@@ -20,7 +20,6 @@ const NotificationService = require('./services/notification.service.js');
 const { getInstance } = require('@martyrs/src/modules/globals/controllers/classes/globals.abac.js');
 
 function initializeNotifications(app, db, wss, origins, publicPath) {
-  console.log('wss init is', wss)
   // Set up models in the database object
   db.notification = NotificationModel(db);
   db.userDevice = UserDeviceModel(db);

package/src/modules/notifications/routes/notifications.routes.js

@@ -10,6 +10,9 @@ const notificationsRoutes = (app, db, wss, origins, publicPath) => {
   
   // Mark notification as read
   app.put('/api/notifications/:id/read', controller.markAsRead);
+
+    // Mark all notifications as read for a user
+  app.put('/api/notifications/user/:userId/read-all', controller.markAllAsRead);
   
   // Register a device for push notifications
   app.post('/api/notifications/devices/register', controller.registerDevice);

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

@@ -4,8 +4,6 @@
 
 	<!-- Ask to login  -->
 	<AskToLogin class="mn-b-thin" v-if="auth.state.access.status === false" /> 
-	{{shopcart.state.organization}}
-	{{orderOrganization.value?._id}}
 	<!-- Order form -->
 	<div class="gap-small mn-b-thin cols-2">
 		<!-- Empty State   -->

package/src/modules/products/components/blocks/CardCategory.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="flex-v-center bg-light pd-small radius-small flex-column flex">
-    <div class="w-100 flex-nowrap gap-thin flex">
-      <h4 class="my-handle mn-r-auto">{{category.name}}</h4>
+    <div class="w-100 flex-v-center flex-nowrap gap-thin flex">
+      <img v-if="category.photo" class="i-big radius-small object-fit-contain bg-white" :src="(FILE_SERVER_URL || '') + category.photo"/>
+      <h4 class="my-handle word-break t-truncate w-100 w-max-100 mn-r-auto">{{category.name}}</h4>
 
       <router-link
        :to="{
@@ -13,10 +14,10 @@
         }"
         class="
           i-semi
-          z-index-2
           cursor-pointer 
           card-page-actions
           radius-extra pd-micro bg-second
+          flex-child-default
         "
       >
         <IconEdit
@@ -29,10 +30,10 @@
         @click="deleteCategory(category)"
         class="
           i-semi
-          z-index-2
           cursor-pointer 
           card-page-actions
           radius-extra pd-micro bg-second
+          flex-child-default
         "
       >
         <IconDelete