@ozdao/prometheus-framework 0.2.111 → 0.2.113

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

@@ -1,6 +1,6 @@
 <template>
   <section class="pd-thin">
-    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-grey radius-big">
+    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-light radius-big">
       <SkeletonEvent
         v-if="isLoading"
         v-for="i in 3" :key="i"
@@ -14,7 +14,7 @@
         v-if="!isLoading && !event"
         title="No Event Found"
         description="Currently, there are no events available. Please check back later."
-        class="pd-medium mn-b-thin bg-grey radius-big"
+        class="pd-medium mn-b-thin bg-light radius-big"
       />
     </transition>
 
@@ -117,7 +117,7 @@
         :owner="event.owner" 
         :user="auth.state.user._id"
         :type="'normal'"
-        class="mn-b-medium bg-grey radius-big"
+        class="mn-b-medium bg-light radius-big"
       >
         <ButtonJoin 
           v-if="auth.state.user._id"

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

@@ -11,7 +11,7 @@
     </header>
     <List
       :user="auth.state.user._id"
-      class="bg-grey mn-b-medium radius-big"
+      class="bg-light mn-b-medium radius-big"
       :phase="'planned'"
     />
     <header 
@@ -34,7 +34,7 @@
      <DatePicker
       v-model:date="events.state.filter.date"
       :locale="$i18n.locale"
-      class="radius-semi o-hidden bg-grey mn-b-thin pd-l-zero pd-r-zero pd-medium"
+      class="radius-semi o-hidden bg-light mn-b-thin pd-l-zero pd-r-zero pd-medium"
     />
 
     <Feed
@@ -64,7 +64,7 @@
         :event="event" 
         :user="auth.state.user._id" 
         :type="'normal'"
-        class="bg-grey radius-big mn-b-medium"
+        class="bg-light radius-big mn-b-medium"
       />
     </Feed>
   </section>
@@ -78,6 +78,7 @@
   import Feed from '@pf/src/components/Feed/Feed.vue'
   import DatePicker from '@pf/src/components/DatePicker/DatePicker.vue'
 
+
   import List from '@pf/src/modules/events/components/sections/List.vue';   
   import CardEvent from '@pf/src/modules/events/components/blocks/CardEvent.vue';
   // Import state

package/src/modules/events/components/sections/Feed.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="feed">
-    <TransitionGroup tag="ul" name="scaleTransition" class="o-hidden bg-grey radius-big">
+    <TransitionGroup tag="ul" name="scaleTransition" class="o-hidden bg-light radius-big">
       <SkeletonEvent
         v-if="isLoading"
         v-for="i in limit" :key="i"
@@ -14,7 +14,7 @@
         v-if="!isLoading && eventsList.length < 1"
         title="No Events Found"
         description="Currently, there are no events available. Please check back later."
-        class="pd-medium mn-b-thin bg-grey radius-big"
+        class="pd-medium mn-b-thin bg-light radius-big"
       />
     </transition>
 
@@ -28,7 +28,7 @@
         :event="event" 
         :user="user" 
         :type="'normal'"
-        class="bg-grey radius-big mn-b-medium"
+        class="bg-light radius-big mn-b-medium"
       />
 
       <button v-if="hasMoreEvents && eventsList.length > 0" @click="loadMoreEvents" class="w-100 bg-main button">Load more</button> 

package/src/modules/events/components/sections/List.vue

@@ -6,7 +6,7 @@
       <Loader v-if="isLoading" class="z-index-5 pos-t-50 left-t-50 pos-absolute"/>
     </transition> -->
 
-    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-grey radius-big">
+    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-light radius-big">
       <SkeletonEventShort
         v-if="isLoading"
         v-for="i in limit" :key="i"
@@ -20,7 +20,7 @@
         v-if="!isLoading && eventsList.length < 1"
         title="No Events Today"
         description="Today, are no events available. Please check back later."
-        class="pd-medium mn-b-thin bg-grey radius-big"
+        class="pd-medium mn-b-thin bg-light radius-big"
       />
     </transition>
 

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

@@ -3,18 +3,20 @@ 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.' });
     }
 
-    const convertToRelativePath = (absolutePath, publicPath) => {
-      return '/' + path.relative(publicPath, absolutePath);
+    const convertToRelativePath = (absolutePath) => {
+
+      if (!absolutePath.startsWith('/')) {
+        absolutePath = '/' + absolutePath;
+      }
+      
+      return absolutePath;
     };
 
-    req.files = req.files.map(file => convertToRelativePath(file, publicPath));
+    req.files = req.files.map(file => convertToRelativePath(file));
 
     try {
       const fileResponses = req.files.map(file => ({

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

@@ -4,12 +4,27 @@ const fsp = require('fs/promises');
 const path = require('path');
 const busboy = require('busboy');
 
+const convertToJpg = async (filePath) => {
+  const metadata = await sharp(filePath).metadata();
+
+  if (metadata.format === 'heic' || metadata.format === 'heif' || metadata.format === 'tiff' || metadata.format === 'bmp') {
+    const jpgPath = filePath.replace(/\.[^.]+$/, '.jpg');
+
+    await sharp(filePath).toFormat('jpeg').toFile(jpgPath);
+    await fsp.unlink(filePath);
+
+    filePath = jpgPath
+  }
+  
+  return filePath;
+};
+
 const createThumbnail = async (originalPath) => {
   const thumbnailPath = path.join(
     path.dirname(originalPath),
     'thumbnail_' + path.basename(originalPath)
   );
-  
+
   try {
     const metadata = await sharp(originalPath).metadata();
 
@@ -29,15 +44,14 @@ const createThumbnail = async (originalPath) => {
   }
 };
 
-
 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 = [];
@@ -52,6 +66,7 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
     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);
@@ -71,19 +86,21 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
 
     // Применяем нормализацию к имени файла
     const fileName = `${Math.floor(Math.random() * 10000)}-${normalizeFileName(info.filename)}`;
-    const fileFullPath = path.join(filePath, fileName);
+    
+    let fileFullPath = path.join(filePath, fileName);
 
     const fileProcess = fsp.mkdir(path.dirname(fileFullPath), { recursive: true })
       .then(() => new Promise((resolve, reject) => {
         const stream = file.pipe(fs.createWriteStream(fileFullPath));
-        stream.on('finish', () => {
+        stream.on('finish', async () => {
+         
           files.push(path.relative(publicPath, fileFullPath));
+
           resolve(); 
         });
         stream.on('error', reject);
       }));
 
-
     fileProcessingPromises.push(fileProcess);
 
     file.on('limit', () => {
@@ -122,6 +139,11 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
 const middlewareFactory = (db, publicPath) => {
   const generatePreviewMiddleware = async (req, res, next) => {
     const files = req.files; 
+
+    if (!files || files.length === 0) {
+      return next();
+    }
+
     try {
       await Promise.all(files.map(file => createThumbnail(path.join(publicPath, file))));
     } catch (error) {
@@ -131,32 +153,75 @@ const middlewareFactory = (db, publicPath) => {
     next();
   };
 
+  const convertImagesMiddleware = async (req, res, next) => {
+    const files = req.files;
+
+    if (!files || files.length === 0) {
+      return next();
+    }
+
+    try {
+      req.files = await Promise.all(files.map(async file => {
+        const convertedPath = await convertToJpg(path.join(publicPath, file));
+        return path.relative(publicPath, convertedPath);
+      }));
+      next();
+    } catch (error) {
+      console.error('Error converting images or generating previews:', error);
+      return res.status(500).json({ message: 'Internal server error while processing images.' });
+    }
+  };
+
   const uploadFilesMiddleware = (req, res, next) => {
     const allowedTypes = [
       'image/png',
       'image/jpeg',
       'image/jpg',
       'image/gif',
+      'image/heic',
+      'image/heif',
+      'image/webp',
+      'image/tiff',
+      'image/bmp',
       'application/pdf',
       'image/svg+xml',
       'video/mp4',
-      'video/quicktime', // MOV
+      'video/quicktime', 
       'video/webm'
     ];
 
-
-    handleFileUpload(req, res, next, publicPath, { folderNameDefault: 'unsorted', maxSize: 100 * 1024 * 1024, allowedTypes });
+    handleFileUpload(req, res, next, publicPath, { 
+      folderNameDefault: 'unsorted', 
+      maxSize: 100 * 1024 * 1024, 
+      allowedTypes 
+    });
   };
 
   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 });
+    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, { 
+      folderNameDefault: 'unsorted', 
+      maxSize: 10 * 1024 * 1024, 
+      allowedTypes 
+    });
   };
 
   return {
     uploadImagesMiddleware,
     uploadFilesMiddleware,
-    generatePreviewMiddleware
+    generatePreviewMiddleware,
+    convertImagesMiddleware
   };
 };
 

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

@@ -14,6 +14,17 @@ module.exports = function(app, db, origins, publicPath) {
     "/api/upload/image",
     [
       middlewareBusboy.uploadImagesMiddleware,
+      middlewareBusboy.convertImagesMiddleware,
+      middlewareBusboy.generatePreviewMiddleware
+    ],
+    controller.uploadMultipleFileController
+  );
+
+  app.post(
+    "/api/upload/multiple",
+    [
+      middlewareBusboy.uploadImagesMiddleware,
+      middlewareBusboy.convertImagesMiddleware,
       middlewareBusboy.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController
@@ -35,13 +46,4 @@ module.exports = function(app, db, origins, publicPath) {
     ],
     controller.uploadMultipleFileController
   );
-
-  app.post(
-    "/api/upload/multiple",
-    [
-      middlewareBusboy.uploadImagesMiddleware,
-      middlewareBusboy.generatePreviewMiddleware
-    ],
-    controller.uploadMultipleFileController
-  );
 };