@ozdao/martyrs 0.2.485 → 0.2.487

package/src/components/Status/Snack.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="snack-wrapper" v-if="show">
+    <div 
+      class="flex-nowrap flex-v-center flex radius-small pd-small t-white"
+      :class="snackClass"
+    >
+      <component 
+        :is="iconComponent" 
+        fill="rgb(var(--white))" 
+        class="t-transp i-medium mn-r-thin z-index-5"
+      />
+      <p class="w-100">
+        {{ te(`globals.snacks.${message}`) ? t(`globals.snacks.${message}`) : message }}
+      </p>
+      <IconCross 
+        @click="$emit('close')" 
+        class="cursor-pointer hover-scale-1 i-regular z-index-5"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+import IconInfo from '@martyrs/src/modules/icons/navigation/IconInfo.vue'
+import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue'
+import IconSuccess from '@martyrs/src/modules/icons/navigation/IconSuccess.vue'
+import IconAlert from '@martyrs/src/modules/icons/navigation/IconAlert.vue'
+
+const { t, te } = useI18n({ useScope: 'global' })
+
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'notification',
+    validator: (v) => ['error', 'success', 'alert', 'notification'].includes(v)
+  },
+  message: String,
+  show: Boolean
+})
+
+defineEmits(['close'])
+
+const snackClass = computed(() => ({
+  'bg-error': props.type === 'error',
+  'bg-success': props.type === 'success', 
+  'bg-warning': props.type === 'alert',
+  'bg-primary': props.type === 'notification'
+}))
+
+const iconComponent = computed(() => {
+  const icons = {
+    error: IconCross,
+    success: IconSuccess,
+    alert: IconAlert,
+    notification: IconInfo
+  }
+  return icons[props.type] || IconInfo
+})
+</script>
+
+<style lang="scss">
+.snack-wrapper {
+  position: fixed;
+  bottom: var(--gap);
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 1000;
+  animation: slideUp 0.3s ease-out;
+}
+
+@keyframes slideUp {
+  from {
+    transform: translateX(-50%) translateY(100%);
+    opacity: 0;
+  }
+  to {
+    transform: translateX(-50%) translateY(0);
+    opacity: 1;
+  }
+}
+</style>

package/src/components/index.js

@@ -1,6 +1,7 @@
 export { default as Address } from './Address/Address.vue';
 export { default as Button } from './Button/Button.vue';
 export { default as Checkbox } from './Checkbox/Checkbox.vue';
+export { default as Calendar } from './Calendar/Calendar.vue';
 export { default as Dropdown } from './Dropdown/Dropdown.vue';
 export { default as Error } from './Error/Error.vue';
 export { default as Field } from './Field/Field.vue';
@@ -28,6 +29,7 @@ export { default as Countdown } from './Countdown/Countdown.vue';
 export { default as DatePicker } from './DatePicker/DatePicker.vue';
 export { default as EmptyState } from './EmptyState/EmptyState.vue';
 export { default as Feed } from './Feed/Feed.vue';
+export { default as Carousel } from './Feed/Carousel.vue';
 export { default as FieldBig } from './FieldBig/FieldBig.vue';
 export { default as FieldTags } from './FieldTags/FieldTags.vue';
 // export { default as Footer } from './Footer/Footer.vue';

package/src/main.js

@@ -7,11 +7,13 @@ import {
   Checkbox,
   Chips,
   Countdown,
+  Calendar,
   DatePicker,
   Dropdown,
   EmptyState,
   Error,
   Feed,
+  Carousel,
   Field,
   FieldBig,
   FieldPhone,
@@ -47,6 +49,7 @@ export default {
     app.component('Address', () => import('./components/Address/Address.vue'));
     app.component('Button', () => import('./components/Button/Button.vue'));
     app.component('Checkbox', () => import('./components/Checkbox/Checkbox.vue'));
+      app.component('Calendar', () => import('./components/Calendar/Calendar.vue'));
     app.component('Dropdown', () => import('./components/Dropdown/Dropdown.vue'));
     app.component('Error', () => import('./components/Error/Error.vue'));
     app.component('Field', () => import('./components/Field/Field.vue'));
@@ -72,6 +75,7 @@ export default {
     app.component('DatePicker', () => import('./components/DatePicker/DatePicker.vue'));
     app.component('EmptyState', () => import('./components/EmptyState/EmptyState.vue'));
     app.component('Feed', () => import('./components/Feed/Feed.vue'));
+    app.component('Carousel', () => import('./components/Feed/Carousel.vue'));
     app.component('FieldBig', () => import('./components/FieldBig/FieldBig.vue'));
     app.component('FieldTags', () => import('./components/FieldTags/FieldTags.vue'));
     // app.component('Footer',       () => import('./components/Footer/Footer.vue'));
@@ -91,6 +95,7 @@ export {
   Address,
   Breadcrumbs,
   Button,
+  Calendar,
   Checkbox,
   Chips,
   Countdown,
@@ -99,6 +104,7 @@ export {
   EmptyState,
   Error,
   Feed,
+  Carousel,
   Field,
   FieldBig,
   FieldPhone,

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

@@ -1,73 +1,126 @@
 import jwt from 'jsonwebtoken';
+
 const middlewareFactory = db => {
+  console.log('[Middleware Factory] Initializing middleware factory');
+  
   const User = db.user;
   const Role = db.role;
+  
   const verifyToken = (continueOnFail = false) => {
+    console.log('[Middleware Factory] Creating verifyToken middleware, continueOnFail:', continueOnFail);
+    
     return async (req, res, next) => {
+      console.log('[VerifyToken] Middleware called');
+      console.log('[VerifyToken] Headers:', req.headers);
+      console.log('[VerifyToken] Cookies:', req.cookies);
+      
       try {
         let token = req.headers['x-access-token'];
-        if (!token && req.cookies.user) {
+        console.log('[VerifyToken] Token from header:', token);
+        
+        if (!token && req.cookies && req.cookies.user) {
+          console.log('[VerifyToken] Trying to get token from cookies');
           let user = JSON.parse(req.cookies.user);
           token = user.accessToken;
+          console.log('[VerifyToken] Token from cookies:', token);
         }
+        
         if (req.headers['x-service-key']) {
+          console.log('[VerifyToken] Service key detected');
           const serviceKey = req.headers['x-service-key'];
-          const validServiceKey = process.env.SERVICE_KEY; // Укажи ключ для сервиса в env
+          const validServiceKey = process.env.SERVICE_KEY;
+          
           if (serviceKey !== validServiceKey) {
+            console.log('[VerifyToken] Invalid service key');
             return res.status(403).send({ message: 'Unauthorized: Invalid service key' });
           }
-          // Если это запрос от микросервиса, пропускаем аутентификацию пользователя
-          req.isServiceRequest = true; // Помечаем, что это запрос от другого сервиса
+          
+          req.isServiceRequest = true;
+          console.log('[VerifyToken] Service request validated');
           return next();
         }
+        
         if (!token) {
+          console.log('[VerifyToken] No token found');
           req.userId = null;
+          
           if (continueOnFail) {
+            console.log('[VerifyToken] Continue on fail enabled, proceeding');
             return next();
           } else {
+            console.log('[VerifyToken] Returning 401 - No token');
             return res.status(401).send({ message: 'Unauthorized: No token provided' });
           }
         }
+        
+        console.log('[VerifyToken] Verifying token with secret');
         const decoded = jwt.verify(token, process.env.SECRET_KEY);
+        console.log('[VerifyToken] Token decoded:', decoded);
+        
         req.userId = decoded._id;
         req.user = {
           _id: decoded._id,
         };
+        
+        console.log('[VerifyToken] userId set to:', req.userId);
         next();
       } catch (err) {
+        console.log('[VerifyToken] Error:', err.message);
         req.userId = null;
+        
         if (continueOnFail) {
+          console.log('[VerifyToken] Error but continue on fail enabled');
           next();
         } else {
+          console.log('[VerifyToken] Returning 401 - Invalid token');
           res.status(401).send({ message: 'Unauthorized: Invalid token' });
         }
       }
     };
   };
+  
   const checkRole = roleToCheck => async (req, res, next) => {
+    console.log('[CheckRole] Checking role:', roleToCheck);
+    console.log('[CheckRole] userId:', req.userId);
+    
     try {
       const user = await User.findById(req.userId).exec();
       if (!user) {
+        console.log('[CheckRole] User not found');
         return res.status(404).send({ message: 'User Not found.' });
       }
+      
       const roles = await Role.find({ _id: { $in: user.roles } }).exec();
+      console.log('[CheckRole] User roles:', roles.map(r => r.name));
+      
       for (let role of roles) {
         if (role.name === roleToCheck) {
+          console.log('[CheckRole] Role found, proceeding');
           next();
           return;
         }
       }
+      
+      console.log('[CheckRole] Role not found');
       res.status(403).send({ message: `Require ${roleToCheck} Role!` });
     } catch (err) {
+      console.log('[CheckRole] Error:', err.message);
       res.status(500).send({ message: err.message });
     }
   };
+  
   const isAdmin = checkRole('admin');
   const isModerator = checkRole('moderator');
-  return {
+  
+  const authJwt = {
     verifyToken,
     isAdmin,
     isModerator,
   };
+  
+  console.log('[Middleware Factory] Returning authJwt object:', Object.keys(authJwt));
+  
+  return authJwt;
 };
-export default middlewareFactory;
+
+export default middlewareFactory;

package/src/modules/events/components/pages/EditEvent.vue

@@ -174,7 +174,7 @@ import '@vuepic/vue-datepicker/dist/main.css'
 
 
 
-import Calendar from '@martyrs/src/components/DatePicker/Calendar.vue'
+import Calendar from '@martyrs/src/components/Calendar/Calendar.vue'
 
 import Block from '@martyrs/src/components/Block/Block.vue';
 import Popup from '@martyrs/src/components/Popup/Popup.vue';

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

@@ -1,6 +1,7 @@
 import { reactive } from 'vue';
 // Globals
 import { setError } from '@martyrs/src/modules/globals/views/store/globals.js';
+import { buildURL } from '../utils/query-serializer.js';
 
 class Store {
   constructor(apiUrl) {
@@ -14,77 +15,39 @@ class Store {
 
   // 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' });
+    // собираем URL
+    let url = endpoint.startsWith('http')
+      ? endpoint
+      : `${this.apiUrl}${endpoint}`;
+
+    // если есть params — используем axios-like сериализацию
+    if (options.params) {
+      url = buildURL(url, options.params);
+      delete options.params;
+    }
 
-    const defaultOptions = {
-      credentials: 'include', // Assumes credentials needed for each request
-      headers: {},
-    };
+    // по умолчанию GET, include credentials
     const finalOptions = {
-      ...defaultOptions,
+      credentials: 'include',
+      headers: {},
       ...options,
     };
 
-    // Set default headers if content type is not explicitly set
-    if (!finalOptions.headers['Content-Type'] && options.body) {
+    // если есть body — JSONify
+    if (finalOptions.body && !finalOptions.headers['Content-Type']) {
       finalOptions.headers['Content-Type'] = 'application/json';
-      finalOptions.body = JSON.stringify(options.body);
+      finalOptions.body = JSON.stringify(finalOptions.body);
     }
 
-    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) {
-        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;
-      }
-
-      const data = await response.json();
-      console.log('Response data received successfully');
-      return data;
-    } catch (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;
+    console.log(`→ ${finalOptions.method || 'GET'} ${url}`);
+    const res = await fetch(url, finalOptions);
+    if (!res.ok) {
+      const err = new Error(`Status ${res.status}`);
+      err.status = res.status;
+      try { err.info = await res.json(); } catch {}
+      throw err;
     }
+    return res.json();
   }
 
   async create(item) {
@@ -110,11 +73,12 @@ class Store {
     }
   }
 
-  async read(options = {}) {
-    console.log('Reading items with options:', options);
+  // вместо текущего read()
+  async read(params = {}) {
+    console.log('Reading items with params:', params);
     try {
-      const queryParams = new URLSearchParams(options).toString();
-      const result = await this.request(`/read?${queryParams}`);
+      // передаём все параметры в this.request через params
+      const result = await this.request('/read', { params });
       console.log(`Read operation returned ${result.length || 0} items`);
       return result;
     } catch (error) {
@@ -124,6 +88,7 @@ class Store {
     }
   }
 
+
   async update(item) {
     console.log('Updating item:', item);
     try {

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

@@ -53,7 +53,7 @@ import { ref, computed, watch, onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import Popup from '@martyrs/src/components/Popup/Popup.vue'
 import Loader from '@martyrs/src/components/Loader/Loader.vue'
-import Calendar from '@martyrs/src/components/DatePicker/Calendar.vue'
+import Calendar from '@martyrs/src/components/Calendar/Calendar.vue'
 import Button from '@martyrs/src/components/Button/Button.vue'
 import IconShopcartAdd from '@martyrs/src/modules/icons/actions/IconShopcartAdd.vue'
 import PriceTotal from '@martyrs/src/modules/orders/components/elements/PriceTotal.vue'