@ozdao/prometheus-framework 0.2.32 → 0.2.34

package/src/modules/events/models/event.model.js

@@ -28,6 +28,35 @@ module.exports = (db) => {
             end: { 
                 type: Date, 
             }
+        },
+        specialData: {
+            type: Object,
+            default: () => ({
+                subtitle: 'NMS Presents', 
+                ticketPrice: '499',
+                ticketImage: null,
+                ticketLinkStripe: null,
+                video: null,
+                guests: [],
+                guestVideo: null,
+                guestTitle: null,
+                guestDescription: null,
+                guestFacebook: null,
+                guestInstagram: null,
+                guestTelegram: null,
+                guestTwitter: null,
+                guestSoundcloud: null,
+                guestSpotify: null,
+                logos: [],
+                lineup: [],
+                lineupBackground: null,
+                previousVideo: null
+            })
+        },
+        // Adding special boolean property
+        special: {
+            type: Boolean,
+            default: false
         }
     }, {
         timestamps: { 

package/src/modules/events/store/events.js

@@ -27,6 +27,10 @@ const state = reactive({
   },
   current: {
     _id: "",
+    special: false,
+    specialData: {
+      subtitle: null
+    },
     cover: "",
     url: "",
     status: "",

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

@@ -3,6 +3,9 @@ const path = require('path');
 const controllerFactory = (db, publicPath) => {
 
   const uploadMultipleFileController = async (req, res, next) => {
+    console.log('uploadMultipleFileController called');
+    console.log("Files received:", req.files ? req.files.length : 0); // Лог
+
     if (!req.files || req.files.length === 0) {
       return res.status(400).send({ message: 'No files uploaded.' });
     }

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

@@ -1,8 +1,6 @@
-// middlewareFactory.js
 const sharp = require('sharp');
 const fs = require('fs');
 const fsp = require('fs/promises');
-const os = require('os');
 const path = require('path');
 const busboy = require('busboy');
 
@@ -11,127 +9,144 @@ const createThumbnail = async (originalPath) => {
     path.dirname(originalPath),
     'thumbnail_' + path.basename(originalPath)
   );
+  
   try {
+    const metadata = await sharp(originalPath).metadata();
+
+    const resizeOptions = {};
+
+    if (metadata.width > 800) {
+      resizeOptions.width = 800; 
+    } 
+
     await sharp(originalPath)
-      .rotate() 
-      .resize({ width: 800 })
+      .rotate()
+      .resize(resizeOptions)
       .toFile(thumbnailPath);
   } catch (error) {
     console.error("Error creating thumbnail:", error);
+    throw error; 
   }
 };
 
 
-const middlewareFactory = (db, publicPath) => {
-
-  const generatePreviewMiddleware = async (req, res, next) => {
-    const files = req.file ? [req.file] : req.files;
-
-    try {
-      await Promise.all(files.map(file => createThumbnail(file)));
-    } catch (error) {
-      console.error('Error generating previews:', error);
+const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'unsorted', maxSize = 10 * 1024 * 1024, allowedTypes = null }) => {
+  console.log('handleFileUpload middleware called');
+  console.log('Options:' + folderNameDefault + maxSize + allowedTypes);
+
+  let folderName = req.query.folderName || folderNameDefault;
+  folderName = decodeURIComponent(folderName);
+  folderName = folderName.startsWith('/') ? folderName : '/' + folderName;
+  const filePath = path.join(publicPath, folderName);
+  let files = [];
+  let filesWrongSize = [];
+  let filesWrongType = [];
+  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);
+    if (!isValidType) {
+      console.log(`File of wrong type: ${info.filename}`);
+      filesWrongType.push(info.filename);
+      file.resume();
+      return;
     }
-    next();
-  };
-  
-  const uploadMultipleFilesMiddleware = (req, res, next) => {
-    let folderName = req.query.folderName || 'unsorted';
 
-    if (!folderName.startsWith('/')) {
-      folderName = '/' + folderName;
-    }
-    
-    let files = [];
-    let filesWrongSize = [];
-    let filesWrongType = [];
-
-    let filePath = path.join(publicPath, folderName);
-    let filePromise;
-
-    try {
-      const bb = busboy({
-        headers: req.headers,
-        limits: {
-          fileSize: 10*1024*1024
-        }
-      });
-
-      bb.on('error', err => {
-        next(err);
-      });
-
-      let fileFullPath
-
-      bb.on('file', (name, file, info) => {
-        if(info.filename.length > 0) { 
-          file.resume();
-        }
-
-        if(info.mimeType != 'image/png' && info.mimeType != 'image/jpeg' && info.mimeType != 'image/gif') {
-          filesWrongType.push(info.filename);
-          file.resume();
-        }
+    const fileName = `${Math.floor(Math.random() * 10000)}-${info.filename}`;
+    const fileFullPath = path.join(filePath, fileName);
 
-        let fileName = `${Math.floor(Math.random() * 10000)}-${info.filename}`;
-
-        fileFullPath = path.join(filePath, fileName);
-        fileRelativePath = path.join(folderName, fileName);
-
-        filePromise = new Promise((resolve, reject) => {
-          const writeStream = fs.createWriteStream(fileFullPath).on('error', reject).on('finish', resolve);
-          file.on('error', reject);
-          file.pipe(writeStream);
+    const fileProcess = fsp.mkdir(path.dirname(fileFullPath), { recursive: true })
+      .then(() => new Promise((resolve, reject) => {
+        const stream = file.pipe(fs.createWriteStream(fileFullPath));
+        stream.on('finish', () => {
+          files.push(path.relative(publicPath, fileFullPath));
+          resolve(); // This line replaces the thumbnail creation process
         });
-
-        files.push(fileFullPath)
-
-        file.on('limit', () => {
-          filesWrongSize.push(info.filename);
-         
-          fsp.unlink(fileFullPath);
-
-          const index = files.indexOf(fileFullPath);
-
-          if (index !== -1) {
-            files.splice(index, 1);
+        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.';
           }
-
-          file.resume();
-        });
-
-      });
-
-      bb.on('close', async () => {
-        try {
-          if (!filePromise) {
-            res.status(400).json({ message: `Uploaded file '${name}' is missing` });
-            return;
+          if (filesWrongType.length > 0) {
+            errorMessage += ' Some files were of an unsupported type.';
           }
+          return res.status(400).json({ message: errorMessage });
+        }
+        next();
+      })
+      .catch((error) => {
+        console.error('Failed processing one or more files', error);
+        res.status(500).json({ message: 'Error processing files' });
+      });
+  });
 
-          await filePromise
+  req.pipe(bb);
+};
 
-          req.files = files
 
-          next()
-        } catch (err) {
-          next(err);
+const middlewareFactory = (db, publicPath) => {
+  const generatePreviewMiddleware = async (req, res, next) => {
+    const files = req.files; 
+    try {
+      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.' });
+    }
+    next();
+  };
 
-        } finally {
-          bb.removeAllListeners();
-        }
-      });
+  const uploadFilesMiddleware = (req, res, next) => {
+    const allowedTypes = [
+      'image/png',
+      'image/jpeg',
+      'image/jpg',
+      'image/gif',
+      'application/pdf',
+      'image/svg+xml',
+      'video/mp4',
+      'video/quicktime', // MOV
+      'video/webm'
+    ];
+
+
+    handleFileUpload(req, res, next, publicPath, { folderNameDefault: 'unsorted', maxSize: 10 * 1024 * 1024, allowedTypes });
+  };
 
-      req.pipe(bb);
-    } catch (err) {
-      res.status(400).json({ message: `Could not retrieve file from request - ${err.message}`});
-    }
+  const uploadImagesMiddleware = (req, res, next) => {
+    const allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
+    handleFileUpload(req, res, next, publicPath, { folderNameDefault: 'unsorted', maxSize: 10 * 1024 * 1024, allowedTypes });
   };
 
-  return {  
-    uploadMultipleFilesMiddleware,
+  return {
+    uploadImagesMiddleware,
+    uploadFilesMiddleware,
     generatePreviewMiddleware
   };
 };
 
-module.exports = middlewareFactory;
+module.exports = middlewareFactory;

package/src/modules/files/routes/files.routes.js

@@ -27,7 +27,7 @@ module.exports = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/image",
     [
-      middlewareBusboy.uploadMultipleFilesMiddleware,
+      middlewareBusboy.uploadImagesMiddleware,
       middlewareBusboy.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController
@@ -36,8 +36,7 @@ module.exports = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/file",
     [
-      middlewareBusboy.uploadMultipleFilesMiddleware,
-      middlewareBusboy.generatePreviewMiddleware
+      middlewareBusboy.uploadFilesMiddleware,
     ],
     controller.uploadMultipleFileController
   );
@@ -45,7 +44,7 @@ module.exports = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/multiple",
     [
-      middlewareBusboy.uploadMultipleFilesMiddleware,
+      middlewareBusboy.uploadImagesMiddleware,
       middlewareBusboy.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController

package/src/modules/globals/globals.server.js

@@ -7,7 +7,6 @@ const parseCookie = require('./utils/parseCookie.js');
 
 // Exporting middlewares and utils
 module.exports = {
-  middlewareFactory,
   sitemap,
   mailing,
   parseCookie

package/src/modules/marketplace/components/pages/Catalog.vue

@@ -19,6 +19,7 @@
 		      :organization="organization"
 		      :showRating="true"
 		      :showFollowers="false"
+		      :showProducts="true"
 		      class="bg-grey w-100 o-hidden radius-big pd-small "
 		    />
 			</div>

package/src/modules/orders/components/blocks/CardOrder.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="pd-big mn-regular order-client-card col"> 
 	  <p class="mn-regular flex-center flex-nowrap flex w-100">
-			<!-- <img v-if="order.status === 'Created'" 			class="mn-r-small" src="@/assets/icons/status/created.svg"/>
-			<img v-if="order.status === 'Confirmed'"	class="mn-r-small" src="@/assets/icons/status/confirmed.svg"/>
-			<img v-if="order.status === 'Awaiting shipment'" 			class="mn-r-small" src="@/assets/icons/status/paid.svg"/>
-			<img v-if="order.status === 'In delivery'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/>
-			<img v-if="order.status === 'Finished'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/> -->
+				<!-- <img v-if="order.status === 'Created'" 			class="mn-r-small" src="@/assets/icons/status/created.svg"/>
+				<img v-if="order.status === 'Confirmed'"	class="mn-r-small" src="@/assets/icons/status/confirmed.svg"/>
+				<img v-if="order.status === 'Awaiting shipment'" 			class="mn-r-small" src="@/assets/icons/status/paid.svg"/>
+				<img v-if="order.status === 'In delivery'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/>
+				<img v-if="order.status === 'Finished'" 		class="mn-r-small" src="@/assets/icons/status/finished.svg"/> -->
 	    <span class="w-100 t-medium p-big">{{order.status}}</span>
 	  </p>
 	  

package/src/modules/orders/components/blocks/StatusHistory.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="bg-grey radius-medium w-100">
+    <h3 class="pd-medium">Tracking History</h3>
+    <div v-for="status in statuses" :key="status.value" class="w-100 br-t br-solid br-black-transp-10 pd-medium flex-v-center flex-nowrap flex">
+      <div v-if="isStatusInHistory(status.value)" class="flex-center flex i-big radius-extra br-solid br-2px br-black-transp-10 mn-r-small">✔</div>
+      <p class="h4 w-8r">{{status.name}}</p>
+      <button :disabled="!isNextPossibleStatus(status.value)" @click="setStatus(status)" class="mn-l-auto bg-main button radius-big">Set status</button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+
+const props = defineProps({
+  statusHistory: {
+    type: Array
+  },
+  statusCurrent: {
+    type: String
+  }
+})
+
+// Инициализация состояния компонента
+const statuses = ref([{
+  value: 'created',
+  name: 'Received',
+  nextstatus: 'Confirming order...',
+  description: 'Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.'
+},{
+  value: 'confirming',
+  name: 'Confirming',
+  nextstatus: 'Confirming order...',
+  description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
+},{
+  value: 'confirmed',
+  name: 'Confirmed',
+  nextstatus: 'Order is confirmed. Packing order...',
+  description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
+},{
+  value: 'packing',
+  name: 'Packing',
+  nextstatus: 'Packing order...',
+  description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
+},{
+  value: 'packed',
+  name: 'Packed',
+  nextstatus: 'Delivering order...',
+  description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
+},{
+  value: 'in delivery',
+  name: 'Delivering',
+  description: 'Your order is currently in transit. Our delivery team is working hard to get your items to you as soon as possible.'
+},{
+  value: 'delivered',
+  name: 'Delivered',
+  description: 'Congratulations! Your order has been successfully delivered. If you have any concerns or feedback, feel free to contact us.'
+}]);
+
+const statusCurrent = ref(props.statusCurrent);
+const statusHistory = ref(props.statusHistory);
+
+// Проверка, был ли статус уже установлен
+const isStatusInHistory = (statusValue) => {
+  return statusHistory.value.some(status => status.status === statusValue);
+};
+
+// Проверка, является ли статус следующим возможным действием
+const isNextPossibleStatus = (statusValue) => {
+  const currentIndex = statuses.value.findIndex(status => status.value === statusCurrent.value);
+  console.log(status.status === statusCurrent.value)
+  console.log(statusCurrent.value)
+   console.log(status)
+  const nextIndex = currentIndex + 1;
+  return statuses.value[nextIndex] && statuses.value[nextIndex].value === statusValue;
+};
+
+// Функция установки нового статуса
+const setStatus = async (newStatus) => {
+  console.log(status)
+  // orders.state.current.status = status.value
+  // await orders.actions.update(orders.state.current)
+}
+</script>

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

@@ -9,7 +9,7 @@
 	  	<p class="mn-b-medium w-m-40r p-medium">Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.</p>
 	  
 	  	
-	  	<p class="p-medium mn-b-thin t-semi">{{ statuses.find(status => status.value === order.status).nextstatus}}</p>
+	  	<!-- <p class="p-medium mn-b-thin t-semi">{{ statuses.find(status => status.value === order.status).nextstatus}}</p> -->
 
 	  	<div class="radius-extra  mn-b-medium flex-nowrap flex h-1r pos-relativew-40r">
 	  		<div 
@@ -126,19 +126,16 @@
 			    </div>
 
 				</div>
-
 				
-	     	<div class="bg-grey radius-medium  w-100">
-					<h3 class="pd-medium">Tracking History</h3>
-					<div v-for="status in statuses" 	
-						class="w-100 br-t br-solid br-black-transp-10 pd-medium flex-nowrap flex"
-					>	
-						<img class="mn-r-small" src="@/assets/icons/status/created.svg"/>
-						<p  class="h4 w-8r">{{status.name}}<br><span class="p-small">16:30, 29th Aug 2021</span></p>
-						<button  @click="setStatus(status)" class="bg-main button radius-big">Set status</button>
-					</div>
-			  </div>
+				<div class="pd-big bg-red">
+					{{orders.state.current.status_history}}
+				</div>
 
+	     	<StatusHistory 
+	     		v-if="orders.state.current.status_history"
+	     		:statusHistory="orders.state.current.status_history"
+	     		:statusCurrent="orders.state.current.status"
+	     	/>
 
 	     <!-- 	<button 
 	     	@click="requestPayment(order)"
@@ -204,6 +201,7 @@
 
 	import ChatWindow from '@pf/src/modules/chats/components/pages/ChatPage.vue';
 
+	import StatusHistory from '@pf/src/modules/orders/components/blocks/StatusHistory.vue'
 
 	import * as orders 	from '@pf/src/modules/orders/store/orders'
 	import * as products 	from '@pf/src/modules/products/store/products'
@@ -216,40 +214,6 @@
 
 	let order = ref(orders.state.current)
 
-	let statuses = [{
-		value: 'created',
-		name: 'Received',
-		nextstatus: 'Confirming order...',
-		description: 'Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.'
-	},{
-		value: 'confirming',
-		name: 'Confirming',
-		nextstatus: 'Confirming order...',
-		description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
-	},{
-		value: 'confirmed',
-		name: 'Confirmed',
-		nextstatus: 'Order is confirmed. Packing order...',
-		description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
-	},{
-		value: 'packing',
-		name: 'Packing',
-		nextstatus: 'Packing order...',
-		description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-	},{
-		value: 'packing',
-		name: 'Packed',
-		nextstatus: 'Delivering order...',
-		description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-	},{
-		value: 'in delivery',
-		name: 'Delivering',
-		description: 'Your order is currently in transit. Our delivery team is working hard to get your items to you as soon as possible.'
-	},{
-		value: 'delivered',
-		name: 'Delivered',
-		description: 'Congratulations! Your order has been successfully delivered. If you have any concerns or feedback, feel free to contact us.'
-	}]
 
 	const productsOrganization = ref([])
 	const orderOrganization = ref([])
@@ -297,14 +261,7 @@
 
 	// const payment = computed(() => store.state.payments.current)
 
-	async function setStatus(status) {
-		console.log(status)
-		orders.state.current.status = status.value
-
-
-
-		await orders.actions.update(orders.state.current)
-	}
+	
 
 	function requestPayment(order) {
 		 // store.dispatch("payments/newPayment", order);

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

@@ -74,17 +74,25 @@ const controllerFactory = (db) => {
 
   // Обновление заказа
   const update = async (req, res) => {
-    console.log(req.body)
-    console.log(req.params._id)
+    const order = await Order.findById(req.body._id);
+    
+    if (!order) {
+      return res.status(404).send({ errorCode: "ORDER_NOT_FOUND", message: "Order not found." });
+    }
+
+    if (req.body.status && req.body.status !== order.status) {
+      order.status = req.body.status; // Обновление текущего статуса заказа
+      // Добавление записи в историю изменений статусов
+      order.status_history.push({
+        status: req.body.status,
+        changedBy: req.userId, 
+        timestamp: new Date(),
+        comment: ''
+      });
+    }
 
     try {
-      const order = await Order.findOneAndUpdate(
-        { _id: req.params._id }, 
-        req.body,
-      ).exec();
-      if (!order) {
-        return res.status(404).send({ errorCode: "ORDER_UPDATE_FAILED", message: "Failed to update the order." });
-      }
+      await order.save(); // Сохранение обновленного заказа
       res.status(200).send(order);
     } catch (err) {
       res.status(500).send({ errorCode: "UPDATE_ORDER_FAILED", message: "Error occurred while updating the order.", error: err });

package/src/modules/orders/models/order.model.js

@@ -24,6 +24,25 @@ module.exports = (db) => {
     status: { 
       type: String 
     },
+    status_history: [{
+      status: { 
+        type: String, 
+        trim: true 
+      },
+      changedBy: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+      },
+      timestamp: { 
+        type: Date, 
+        default: Date.now 
+      },
+      comment: {
+        type: String,
+        trim: true
+      }
+      // Здесь вы можете добавить любые другие поля, которые считаете нужными
+    }],
     comment: { 
       type: String, 
       trim: true 

package/src/modules/orders/routes/orders.routes.js

@@ -5,7 +5,7 @@ const middlewareFactory = require('@pf/src/modules/middlewares/server');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
-  const { verifySignUp, verifyUser } = middlewareFactory(db);
+  const { authJwt } = middlewareFactory(db);
 
   app.use(function(req, res, next) {
     res.header(
@@ -33,6 +33,9 @@ module.exports = function(app, db) {
   );
   app.post(
     "/api/orders/update",
+    [
+      authJwt.verifyToken
+    ],
     controller.update
   );
     // Update order

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -127,7 +127,7 @@
     // View
     showProducts: {
       type: Boolean,
-      default: true
+      default: false
     },
     showFollowers: {
       type: Boolean,

package/src/modules/users/components/pages/Profile.vue

@@ -172,7 +172,7 @@
 			  </MenuItem>
 			</Menu>
 
-			<Menu class="mn-b-regular bg-grey">
+			<Menu v-if="APP_NAME === 'Weeder'"class="mn-b-regular bg-grey">
 				<MenuItem @click="router.push({name: 'User Wallet', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <IconGroups class="i-semi" :icon="true"/>
 			    <span>Wallet</span>