@ozdao/martyrs 0.2.487 → 0.2.488

package/src/modules/files/middlewares/server/middlewareBusboy.js

@@ -3,6 +3,7 @@ import * as fs from 'node:fs';
 import * as fsp from 'node:fs/promises';
 import * as path from 'node:path';
 import sharp from 'sharp';
+
 const convertToJpg = async filePath => {
   const metadata = await sharp(filePath).metadata();
   if (metadata.format === 'heic' || metadata.format === 'heif' || metadata.format === 'tiff' || metadata.format === 'bmp') {
@@ -13,6 +14,7 @@ const convertToJpg = async filePath => {
   }
   return filePath;
 };
+
 const createThumbnail = async originalPath => {
   const thumbnailPath = path.join(path.dirname(originalPath), 'thumbnail_' + path.basename(originalPath));
   try {
@@ -27,6 +29,7 @@ const createThumbnail = async originalPath => {
     throw error;
   }
 };
+
 const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'unsorted', maxSize = 10 * 1024 * 1024, allowedTypes = null }) => {
   let folderName = req.query.folderName || folderNameDefault;
   folderName = decodeURIComponent(folderName);
@@ -35,11 +38,13 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
   let files = [];
   let filesWrongSize = [];
   let filesWrongType = [];
-  let fileProcessingPromises = []; // Массив для отслеживания промисов обработки файлов
+  let fileProcessingPromises = [];
+
   const bb = busboy({
     headers: req.headers,
     limits: { fileSize: maxSize },
   });
+
   bb.on('file', (name, file, info) => {
     console.log(`Received file: ${info.filename}, Type: ${info.mimeType}`);
     const isValidType = !allowedTypes || allowedTypes.includes(info.mimeType);
@@ -49,20 +54,19 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
       file.resume();
       return;
     }
+
     const normalizeFileName = filename => {
       return (
         filename
-          // Заменяем пробелы на подчеркивания
           .replace(/\s/g, '_')
-          // Удаляем или заменяем небезопасные символы
           .replace(/[^a-zA-Z0-9-_.]/g, '')
-          // Опционально: сокращаем имя файла, если оно слишком длинное
           .slice(0, 80)
       );
     };
-    // Применяем нормализацию к имени файла
+
     const fileName = `${Math.floor(Math.random() * 10000)}-${normalizeFileName(info.filename)}`;
     let fileFullPath = path.join(filePath, fileName);
+    
     const fileProcess = fsp.mkdir(path.dirname(fileFullPath), { recursive: true }).then(
       () =>
         new Promise((resolve, reject) => {
@@ -74,36 +78,49 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
           stream.on('error', reject);
         })
     );
+    
     fileProcessingPromises.push(fileProcess);
+    
     file.on('limit', () => {
       filesWrongSize.push(info.filename);
       fsp.unlink(fileFullPath).catch(err => console.error(`Error deleting oversized file: ${err.message}`));
     });
   });
+
   bb.on('finish', () => {
     Promise.all(fileProcessingPromises)
       .then(() => {
         console.log(`Upload finished. Files: ${files.length}, Wrong Size: ${filesWrongSize.length}, Wrong Type: ${filesWrongType.length}`);
         req.files = files;
+        
         if (files.length === 0 && (filesWrongSize.length > 0 || filesWrongType.length > 0)) {
-          let errorMessage = 'No files uploaded.';
-          if (filesWrongSize.length > 0) {
-            errorMessage += ' Some files were too large.';
+          let errorCode = 'NO_FILES_UPLOADED';
+          let message = 'No files uploaded.';
+          
+          if (filesWrongSize.length > 0 && filesWrongType.length > 0) {
+            errorCode = 'FILES_SIZE_AND_TYPE_ERROR';
+          } else if (filesWrongSize.length > 0) {
+            errorCode = 'FILES_TOO_LARGE';
+          } else if (filesWrongType.length > 0) {
+            errorCode = 'FILES_WRONG_TYPE';
           }
-          if (filesWrongType.length > 0) {
-            errorMessage += ' Some files were of an unsupported type.';
-          }
-          return res.status(400).json({ message: errorMessage });
+          
+          return res.status(400).json({ errorCode, message });
         }
         next();
       })
       .catch(error => {
         console.error('Failed processing one or more files', error);
-        res.status(500).json({ message: 'Error processing files' });
+        res.status(500).json({ 
+          errorCode: 'FILE_PROCESSING_ERROR',
+          message: 'Error processing files' 
+        });
       });
   });
+
   req.pipe(bb);
 };
+
 const middlewareFactory = (db, publicPath) => {
   const generatePreviewMiddleware = async (req, res, next) => {
     const files = req.files;
@@ -114,10 +131,14 @@ const middlewareFactory = (db, publicPath) => {
       await Promise.all(files.map(file => createThumbnail(path.join(publicPath, file))));
     } catch (error) {
       console.error('Error generating previews:', error);
-      return res.status(500).json({ message: 'Internal server error while generating previews.' });
+      return res.status(500).json({ 
+        errorCode: 'PREVIEW_GENERATION_ERROR',
+        message: 'Internal server error while generating previews.' 
+      });
     }
     next();
   };
+
   const convertImagesMiddleware = async (req, res, next) => {
     const files = req.files;
     if (!files || files.length === 0) {
@@ -133,9 +154,13 @@ const middlewareFactory = (db, publicPath) => {
       next();
     } catch (error) {
       console.error('Error converting images or generating previews:', error);
-      return res.status(500).json({ message: 'Internal server error while processing images.' });
+      return res.status(500).json({ 
+        errorCode: 'IMAGE_CONVERSION_ERROR',
+        message: 'Internal server error while processing images.' 
+      });
     }
   };
+
   const uploadFilesMiddleware = (req, res, next) => {
     const allowedTypes = [
       // Images
@@ -153,7 +178,7 @@ const middlewareFactory = (db, publicPath) => {
       'video/mp4',
       'video/quicktime',
       'video/webm',
-      // Audito
+      // Audio
       'audio/mpeg',
       'audio/wav',
       'audio/ogg',
@@ -168,6 +193,7 @@ const middlewareFactory = (db, publicPath) => {
       allowedTypes,
     });
   };
+
   const uploadAudioMiddleware = (req, res, next) => {
     const allowedTypes = ['audio/mpeg', 'audio/wav', 'audio/ogg', 'audio/flac', 'audio/aac', 'audio/x-ms-wma', 'audio/aiff'];
     handleFileUpload(req, res, next, publicPath, {
@@ -176,6 +202,7 @@ const middlewareFactory = (db, publicPath) => {
       allowedTypes,
     });
   };
+
   const uploadImagesMiddleware = (req, res, next) => {
     const allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/heic', 'image/heif', 'image/webp', 'image/tiff', 'image/bmp'];
     handleFileUpload(req, res, next, publicPath, {
@@ -184,6 +211,7 @@ const middlewareFactory = (db, publicPath) => {
       allowedTypes,
     });
   };
+
   return {
     uploadImagesMiddleware,
     uploadAudioMiddleware,
@@ -192,4 +220,5 @@ const middlewareFactory = (db, publicPath) => {
     convertImagesMiddleware,
   };
 };
-export default middlewareFactory;
+
+export default middlewareFactory;

package/src/modules/globals/controllers/classes/crud/crud.controller.js

@@ -209,6 +209,9 @@ class CRUDController {
   // Обработка ошибок
   _handleError(error, res) {
     if (res.headersSent) return;
+
+    
+    console.log(error)
     
     const statusCode = error.statusCode || error.code === 'NOT_FOUND' ? 404 : 500;
     const message = error.message || 'Internal Server Error';
@@ -250,10 +253,10 @@ class CRUDController {
   // Определение цели верификации
   _getVerificationTarget(method, actionName) {
     // Для стандартных CRUD операций
-    if (['create', 'update'].includes(actionName)) {
+    if (['create', 'update', 'delete'].includes(actionName)) {
       return 'body';
     }
-    if (['read', 'delete'].includes(actionName)) {
+    if (['read'].includes(actionName)) {
       return 'query';
     }
     

package/src/modules/globals/controllers/classes/crud/crud.js

@@ -76,7 +76,7 @@ class CRUD {
     this.controller.registerRoute('post', '/create', 'create');
     this.controller.registerRoute('get', '/read', 'read');
     this.controller.registerRoute('put', '/update', 'update');
-    this.controller.registerRoute('delete', '/delete', 'delete');
+    this.controller.registerRoute('post', '/delete', 'delete');
   }
 
   // API методы для конфигурации

package/src/modules/globals/controllers/classes/crud/crud.service.js

@@ -180,7 +180,6 @@ export default class CRUDService {
       
       // Выполнение after хука
       await this.crud.core.executeHook('afterDelete', document, context);
-      
       return document;
     } catch (error) {
       await this.crud.events.logError('delete', error);

package/src/modules/globals/controllers/classes/globals.abac.js

@@ -108,7 +108,7 @@ class GlobalABAC {
       };
     }
     // Предзагрузка ресурса
-    if (data._id || data.params?._id || data.url) {
+    if ((action !== 'create') && (data._id || data.params?._id || data.url)) {
       try {
         const resourceModel = this.getResourceModel(resource);
         let currentResource;

package/src/modules/globals/locales/en.js

@@ -16,6 +16,14 @@ export default {
       WRONG_CODE: 'You entered an incorrect code. Please try again.',
       POST_URL_ALREADY_IN_USE: 'Failed! Blogpost with this URL is already in use!',
       NAME_CANNOT_BE_EMPTY: 'Error: Name cannot be empty. Please enter a name.',
+      // File upload errors
+      NO_FILES_UPLOADED: 'No files were uploaded.',
+      FILE_PROCESSING_ERROR: 'Error processing files. Please try again.',
+      FILES_TOO_LARGE: 'One or more files exceed the size limit.',
+      FILES_WRONG_TYPE: 'One or more files have unsupported format.',
+      FILES_SIZE_AND_TYPE_ERROR: 'Some files are too large and have unsupported format.',
+      PREVIEW_GENERATION_ERROR: 'Error generating file previews.',
+      IMAGE_CONVERSION_ERROR: 'Error converting image format.'
     }
   }
 };

package/src/modules/globals/models/schemas/ownership.schema.js

@@ -5,7 +5,7 @@ export default (function applyOwnershipSchema(schema, db) {
       type: {
         type: String,
         required: true,
-        enum: ['user', 'organization', 'platform'],
+        enum: ['user', 'organization', 'platform', 'User', 'Organization'],
       },
       target: {
         type: db.mongoose.Schema.Types.ObjectId,
@@ -23,7 +23,7 @@ export default (function applyOwnershipSchema(schema, db) {
       type: {
         type: String,
         required: true,
-        enum: ['user', 'organization', 'customer', 'platform'],
+        enum: ['user', 'organization', 'customer', 'platform', 'User', 'Organization'],
       },
       target: {
         type: db.mongoose.Schema.Types.ObjectId,

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

@@ -41,12 +41,18 @@ class Store {
 
     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;
     }
+
+    if (res.status === 204) {
+      return null;
+    }
+
     return res.json();
   }
 
@@ -109,10 +115,10 @@ class Store {
     console.log('Deleting item:', item);
     try {
       const result = await this.request(`/delete`, {
-        method: 'DELETE',
+        method: 'POST',
         body: item,
       });
-      console.log('Delete operation succeeded');
+      console.log('Delete operation succeeded', result);
       return result;
     } catch (error) {
       console.error('Delete operation failed:', error);

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

@@ -1,9 +1,7 @@
 <script setup>
 import { ref, watch } from 'vue';
-
 import IconSearch from '@martyrs/src/modules/icons/navigation/IconSearch.vue';
 import Field from '@martyrs/src/components/Field/Field.vue';
-
 const emits = defineEmits(['search', 'update:modelValue']);
 const props = defineProps({
   modelValue: {
@@ -23,14 +21,11 @@ const props = defineProps({
     default: 'Search'
   },
 });
-
 const stateSearch = ref(props.modelValue);
-
 // Обновлять поле при изменении modelValue извне
 watch(() => props.modelValue, (newVal) => {
   stateSearch.value = newVal;
 });
-
 // Когда пользователь вводит новое значение
 const updateSearch = (search) => {
   stateSearch.value = search;
@@ -38,18 +33,18 @@ const updateSearch = (search) => {
   emits('search', search);            // при необходимости
 };
 </script>
-
-
 <template>
-  <div class="flex-v-center flex-nowrap flex pd-small bg-light w-100 radius-medium">
+
+<Field
+  v-model:field="stateSearch"
+  :placeholder="placeholder"
+  :autofocus="autofocus"
+  class="flex-v-center flex-nowrap flex pd-small bg-light w-100 radius-medium w-100"
+  @update:field="updateSearch"
+>
+  <template #icon>
     <IconSearch class="i-medium t-transp mn-r-thin" />
+  </template>
+</Field>
 
-    <Field
-      v-model:field="stateSearch"
-      :placeholder="placeholder"
-      :autofocus="autofocus"
-      class="w-100"
-      @update:field="updateSearch"
-    />
-  </div>
-</template>
+</template>

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

@@ -8,12 +8,12 @@
 		>
 
 			<div
-				class="w-100 p-medium t-nowrap flex-nowrap flex-v-center flex"
+				class="w-100 gap-thin p-medium t-nowrap flex-nowrap flex-v-center flex"
 			>
 				<img loading="lazy" 
 					v-if="owner.target?.profile?.photo?.length > 0 && type !== 'short'" 
 					:src="(FILE_SERVER_URL || '') + owner.target.profile.photo" 
-					class="radius-medium flex-child-default object-fit-cover mn-r-thin i-thin" 
+					class="radius-medium bg-white flex-child-default object-fit-cover i-thin" 
 
 					@click.stop="$router.push({
 						name: owner.type === 'user' ? 'User Profile' : 'Organization', 
@@ -25,7 +25,7 @@
 				<component
 					v-if="!owner.target?.profile?.photo && type !== 'short'"
 					:is="owner.type === 'user' ? PlaceholderUserpic : PlaceholderOrganizationPic"
-					class="radius-medium flex-child-default cursor-pointer mn-r-thin i-thin"
+					class="radius-medium flex-child-default cursor-pointer i-thin"
 
 					@click.stop="$router.push({
 						name: owner.type === 'user' ? 'User Profile' : 'Organization', 
@@ -37,7 +37,7 @@
 
 				<div 
 					v-if="type !== 'short'"
-					class="flex flex-nowrap t-medium w-100 pos-relative"
+					class="gap-thin  flex flex-nowrap t-medium w-100 pos-relative"
 				>
 					<span 
 						@click.stop="$router.push({
@@ -51,7 +51,7 @@
 						{{owner.target?.profile?.name || creator.target?.username || 'Anonymous'}}
 					</span>
 
-					<span v-if="!creator.hidden && owner.target?.profile?.name !== creator.target?.profile?.name"class="mn-l-micro mn-r-micro ">·</span> 
+					<span v-if="!creator.hidden && owner.target?.profile?.name !== creator.target?.profile?.name">·</span> 
 
 					<span
 						v-if="!creator.hidden && owner.target?.profile?.name !== creator.target?.profile?.name"
@@ -66,7 +66,7 @@
 						<div>by {{creator.target?.profile?.name || creator.target?.username || 'Anonymous'}}</div>
 					</span>
 
-					<span v-if="date" class="mn-l-micro mn-r-micro ">·</span> 
+					<span v-if="date">·</span> 
 
 					<span v-if="date" class="pos-relative w-max">
 						<Tooltip v-if="date" :text="formatDate(date)">
@@ -74,16 +74,14 @@
 					 	</Tooltip>
 					</span>
 
-					<span v-if="dateFormatted">
-						· {{dateFormatted}}
-					</span>
+					<span v-if="dateFormatted">·</span>
+
+					<span v-if="dateFormatted"> {{dateFormatted}}</span>
 				</div>
 				
 
 				<!-- Participaters avatar -->
-
 				<div class="d-block mn-l-auto flex-nowrap flex flex-v-center">
-					
 					<PhotoStack
 						v-if="members"
 						:number="members"

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

@@ -8,6 +8,7 @@
       :availabilityData="availabilityData"
       :showAvailability="true"
       :lowAvailabilityThreshold="3"
+      :requiredQuantity="quantity"
       class="bg-light radius-small"
       :disabled="isLoading"
     />
@@ -61,7 +62,10 @@ import PriceTotal from '@martyrs/src/modules/orders/components/elements/PriceTot
 import * as rents from '@martyrs/src/modules/rents/views/store/rents.store.js'
 
 const props = defineProps({
-  product: { type: Object, required: true },
+  productId: { type: String, required: true },
+  variantId: { type: String, required: true },
+  quantity: { type: Number, default: 1 },
+  price: { type: Number, required: true },
   isOpen: { type: Boolean, required: true },
   showFees: { type: Boolean, default: false },
   showVat: { type: Boolean, default: false },
@@ -89,7 +93,10 @@ const isAvailable = ref(true)
 
 // Load availability data for the current month and next month
 async function loadAvailabilityData() {
-  if (!props.product || !props.product._id) return;
+  if (!props.productId || !props.variantId) return;
+
+  console.log('productId', props.productId)
+  console.log('variantId', props.variantId)
   
   isLoading.value = true;
   availabilityError.value = null;
@@ -100,7 +107,8 @@ async function loadAvailabilityData() {
     const end = new Date(today.getFullYear(), today.getMonth() + 2, 0);
     
     const data = await rents.loadAvailability({
-      productId: props.product._id,
+      productId: props.productId,
+      variantId: props.variantId,
       startDate: start.toISOString().split('T')[0],
       endDate: end.toISOString().split('T')[0]
     });
@@ -118,7 +126,7 @@ async function loadAvailabilityData() {
 
 // Check availability for selected date range
 async function checkAvailability() {
-  if (!selectedDates.value.start || !selectedDates.value.end || !props.product || !props.product._id) {
+  if (!selectedDates.value.start || !selectedDates.value.end || !props.productId || !props.variantId) {
     isAvailable.value = false;
     return;
   }
@@ -128,15 +136,16 @@ async function checkAvailability() {
   
   try {
     const data = await rents.loadAvailability({
-      productId: props.product._id,
+      productId: props.productId,
+      variantId: props.variantId,
       startDate: selectedDates.value.start.split('T')[0],
       endDate: selectedDates.value.end.split('T')[0]
     });
     
-    isAvailable.value = data.available > 0;
+    isAvailable.value = data.available >= props.quantity;
     
     if (!isAvailable.value) {
-      availabilityError.value = 'Product is not available for the selected dates.';
+      availabilityError.value = `Insufficient quantity. Available: ${data.available}, needed: ${props.quantity}`;
     }
   } catch (error) {
     console.error('Error checking availability:', error);
@@ -157,7 +166,7 @@ function calculateDays(start, end) {
 }
 
 const numberOfDays = computed(() => calculateDays(selectedDates.value.start, selectedDates.value.end))
-const totalAmount = computed(() => props.product.price * numberOfDays.value)
+const totalAmount = computed(() => props.price * numberOfDays.value * props.quantity)
 
 function closePopup() {
   emit('close')
@@ -174,7 +183,8 @@ function cancelSelection() {
   if (props.onCancel) {
     props.onCancel()
   }
-  closePopup()
+  // Эмитим close-popup чтобы плагин закрыл попап
+  emit('close-popup')
 }
 
 watch([() => selectedDates.value.start, () => selectedDates.value.end], ([newStart, newEnd]) => {

package/src/modules/globals/views/components/layouts/Client.vue

@@ -83,14 +83,6 @@
 					'mobile:pd-t-extra': MOBILE_APP === 'ios',  
 				}"
 			/>
-
-			<!-- <section v-if="!route.meta?.breadcrumbs?.hide" class="pd-thin pd-b-zero">
-				<Breadcrumbs 
-					v-if="!MOBILE_APP"
-					class="bg-light pd-small radius-big"
-				/>
-			</section> -->
-
 	    <component
 	      v-if="route.meta?.sidebar && !MOBILE_APP"
 	      v-slot="{ Component }"
@@ -121,7 +113,20 @@
 						@close="globals.state.error.show = false"
 						class="z-index-7" 
 					/>
+					<Snack 
+	  				v-if="globals.state.snack.show"
+						:data="globals.state.snack"
+						@close="globals.state.snack.show = false"
+						class="z-index-7" 
+					/>
 					<div class="h-min-100 pos-relative w-100">
+						<!-- <section v-if="!route.meta?.breadcrumbs?.hide" class="pd-thin pd-b-zero">
+							<Breadcrumbs 
+								v-if="!MOBILE_APP"
+								class="bg-light pd-small radius-small"
+							/>
+						</section> -->
+
 				 		<Suspense @resolve="onSuspenseResolved">
 							<router-view  
 								id="view"
@@ -188,8 +193,9 @@
 	import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
 	// Partials
 	import Status from '@martyrs/src/components/Status/Status.vue';
+	import Snack from '@martyrs/src/components/Status/Snack.vue';
 	import Popup from '@martyrs/src/components/Popup/Popup.vue';
-	// import Breadcrumbs from '@martyrs/src/components/Breadcrumbs/Breadcrumbs.vue'
+	import Breadcrumbs from '@martyrs/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import Loader from '@martyrs/src/components/Loader/Loader.vue';
 
 	import NavigationBar from '@martyrs/src/modules/globals/views/components/partials/NavigationBar.vue';

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

@@ -33,7 +33,7 @@
     </div>
     <!-- Description -->
     <p class="mn-b-small t-transp">{{t('helpus')}}</p> 
-    <div class="pd-small p-big radius-small bg-light">
+    <div class="pd-small p-semi radius-small bg-light">
       <a class="">hello@nms.network</a>
     </div>
   </div>

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

@@ -135,7 +135,7 @@ const handleSubscribe = () => {
             class="cursor-pointer h-3r mn-b-medium"
           />
 
-          <p class="p-big t-medium mn-b-medium ">{{t('description')}}</p>
+          <p class="p-semi t-medium mn-b-medium ">{{t('description')}}</p>
           
           <div class="mn-b-medium flex flex-column gap-small">
             <a 

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

@@ -50,7 +50,7 @@ router.beforeEach((to, from) => {
     :class="[
       stateSidebar
       ? `${width} w-min-10 tablet:w-min-100 tablet:w-100 mobile:w-min-100 mobile:w-100`
-      : `${widthHidden} mobile:w-0 br-zero`,
+      : `${widthHidden} mobile:w-0`,
       // 
       theme === 'light' 
       ? 't-black bg-white br-light'

package/src/modules/globals/views/components/sections/Walkthrough.vue

@@ -9,7 +9,7 @@
       >
         <img loading="lazy" class="w-100" :src="require(`@/assets/images/walkthrough/walkthrough_${index}.png`).default">
       	<h2 class="mn-b-small">{{slide.title}}</h2>
-      	<p class="p-big t-transp">{{slide.subtitle}}</p>
+      	<p class="p-semi t-transp">{{slide.subtitle}}</p>
       </div>
 
       <div
@@ -53,7 +53,7 @@
 	    >
 		  </div>
 
-		  <div @click.native="setFirstUseFalse()" class="h-100 w-6r pos-b-0r flex-nowrap flex flex-center pos-r-1r pos-relative radius-small br-solid br-main br-2px uppercase t-semi p-big t-main pos-absolute"> 
+		  <div @click.native="setFirstUseFalse()" class="h-100 w-6r pos-b-0r flex-nowrap flex flex-center pos-r-1r pos-relative radius-small br-solid br-main br-2px uppercase t-semi p-semi t-main pos-absolute"> 
 		  	skip
 		  </div>
 	  </div>