@ozdao/martyrs 0.2.470 → 0.2.472

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-DQqZReAr.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-DICZTQ-1.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.470",
+  "version": "0.2.472",
   "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

@@ -42,9 +42,9 @@ const middlewareFactory = (db) => {
           _id: decoded._id
         }
 
+
         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/controllers/classes/globals.crud.js

@@ -4,7 +4,7 @@ const Cache = require('@martyrs/src/modules/globals/controllers/classes/globals.
 const Logger = require('@martyrs/src/modules/globals/controllers/classes/globals.logger');
 
 class CRUD {
-  constructor(basePath, app, db, model) {
+  constructor(basePath, app, db, model, options) {
     this.model = model;
     this.cache = new Cache();
     this.logger = new Logger(db);
@@ -12,7 +12,7 @@ class CRUD {
     this.app = app;
     this.basePath = basePath;
 
-    this.registerRoutes();
+    if (!options || options && !options.disableDefaultRoutes) this.registerRoutes();
   }
 
   registerRoutes() {

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

@@ -1,7 +1,6 @@
 import { reactive } from 'vue';
-
 // Globals 
-import { setError }   from '@martyrs/src/modules/globals/views/store/globals'
+import { setError } from '@martyrs/src/modules/globals/views/store/globals';
 
 class Store {
   constructor(apiUrl) {
@@ -10,12 +9,14 @@ class Store {
       current: {}
     });
     this.apiUrl = apiUrl;
+    console.log(`Store initialized with API URL: ${apiUrl}`);
   }
 
-  // Simplified request method to avoid repetition and enhance maintainability
+  // Simplified request method with enhanced debugging
   async request(endpoint, options = {}) {
     const url = endpoint.startsWith('http') ? endpoint : `${this.apiUrl}${endpoint}`;
-
+    console.log(`Making request to: ${url}`, { method: options.method || 'GET' });
+    
     const defaultOptions = {
       credentials: 'include', // Assumes credentials needed for each request
       headers: {}
@@ -32,56 +33,135 @@ class Store {
     }
 
     try {
+      console.log('Request options:', JSON.stringify({
+        method: finalOptions.method,
+        headers: finalOptions.headers,
+        bodyLength: finalOptions.body ? JSON.stringify(finalOptions.body).length : 0
+      }));
+      
       const response = await fetch(url, finalOptions);
+      console.log(`Response status: ${response.status}`);
+      
+      // Log response headers for debugging
+      const responseHeaders = {};
+      response.headers.forEach((value, key) => {
+        responseHeaders[key] = value;
+      });
+      console.log('Response headers:', responseHeaders);
 
       if (!response.ok) {
-        const errorData = await response.json();
-        const error = new Error(errorData.message || 'Unknown error');
+        let errorData;
+        try {
+          errorData = await response.json();
+        } catch (jsonError) {
+          console.error('Failed to parse error response as JSON:', jsonError);
+          errorData = { message: 'Failed to parse server response' };
+        }
+        
+        console.error('Server returned error:', errorData);
+        const error = new Error(errorData.message || `Server returned ${response.status}`);
+        error.status = response.status;
         error.errorCode = errorData.errorCode || 'UNKNOWN_ERROR';
+        error.responseText = await response.text().catch(() => 'Unable to get response text');
         throw error;
       }
 
-      return await response.json();
-
+      const data = await response.json();
+      console.log('Response data received successfully');
+      return data;
     } catch (error) {
-      console.error(error);
+      console.error('Request failed:', error);
+      if (error.name === 'TypeError' && error.message.includes('Failed to fetch')) {
+        console.error('Network error detected. This might indicate a CORS issue, network connectivity problem, or the server is down.');
+        const enhancedError = new Error('Network error: Unable to connect to the server');
+        enhancedError.originalError = error;
+        setError(enhancedError);
+        throw enhancedError;
+      }
+      
       setError(error);
       throw error;
     }
   }
 
   async create(item) {
-    return await this.request('/create', {
-      method: 'POST',
-      body: item
-    });
+    console.log('Creating item:', item);
+    try {
+      const result = await this.request('/create', {
+        method: 'POST',
+        body: item
+      });
+      console.log('Create operation succeeded:', result);
+      return result;
+    } catch (error) {
+      console.error('Create operation failed:', error);
+      // Log specific error details
+      if (error.status) {
+        console.error(`HTTP Status: ${error.status}`);
+      }
+      if (error.errorCode) {
+        console.error(`Error Code: ${error.errorCode}`);
+      }
+      setError(error);
+      throw error;
+    }
   }
 
   async read(options = {}) {
-    const queryParams = new URLSearchParams(options).toString();
-    
-    return await this.request(`/read?${queryParams}`);
+    console.log('Reading items with options:', options);
+    try {
+      const queryParams = new URLSearchParams(options).toString();
+      const result = await this.request(`/read?${queryParams}`);
+      console.log(`Read operation returned ${result.length || 0} items`);
+      return result;
+    } catch (error) {
+      console.error('Read operation failed:', error);
+      setError(error);
+      throw error;
+    }
   }
 
   async update(item) {
-    return await this.request('/update', {
-      method: 'PUT',
-      body: item
-    });
+    console.log('Updating item:', item);
+    try {
+      const result = await this.request('/update', {
+        method: 'PUT',
+        body: item
+      });
+      console.log('Update operation succeeded:', result);
+      return result;
+    } catch (error) {
+      console.error('Update operation failed:', error);
+      setError(error);
+      throw error;
+    }
   }
 
   async delete(item) {
-    return await this.request(`/delete`, {
-      method: 'DELETE',
-      body: item
-    });
+    console.log('Deleting item:', item);
+    try {
+      const result = await this.request(`/delete`, {
+        method: 'DELETE',
+        body: item
+      });
+      console.log('Delete operation succeeded');
+      return result;
+    } catch (error) {
+      console.error('Delete operation failed:', error);
+      setError(error);
+      throw error;
+    }
   }
 
   // Enhanced Mutations utilizing Vue reactivity system efficiently 
   setItems(items, state) {
+    console.log(`Setting ${items.length} items in state`);
     const targetState = state || this.state.items;
-
-    state.splice(0, state.length, ...items);
+    if (Array.isArray(targetState)) {
+      targetState.splice(0, targetState.length, ...items);
+    } else {
+      console.error('Target state is not an array in setItems');
+    }
   }
 
   addItem(item, state, property = '_id') {
@@ -89,26 +169,34 @@ class Store {
     const existingItemIndex = targetState.findIndex(i => i[property] === item[property]);
     
     if (existingItemIndex === -1) {
+      console.log('Adding new item to state');
       targetState.splice(0, 0, item);
     } else {
+      console.log('Updating existing item in state');
       Object.assign(targetState[existingItemIndex], item);
     }
   }
 
   updateItem(item, state, property = '_id') {
-      const targetState = state || this.state.items;
-      const index = targetState.findIndex(i => i[property] === item[property]);
-      if (index !== -1) {
-        targetState.splice(index, 1, item);
-      }
+    const targetState = state || this.state.items;
+    const index = targetState.findIndex(i => i[property] === item[property]);
+    if (index !== -1) {
+      console.log('Replacing item in state');
+      targetState.splice(index, 1, item);
+    } else {
+      console.log('Item not found for update in state');
     }
+  }
 
   removeItem(item, state, property = '_id') {
     const targetState = state || this.state.items;
     // Поиск и удаление элемента по указанному ключу
     const index = targetState.findIndex(i => i[property] === item[property]);
     if (index !== -1) {
+      console.log('Removing item from state');
       targetState.splice(index, 1);
+    } else {
+      console.log('Item not found for removal from state');
     }
   }
 }