@ozdao/prometheus-framework 0.2.30 → 0.2.32

package/src/modules/community/controllers/blog.controller.js

@@ -49,7 +49,7 @@ const controllerFactory = (db) => {
 		    ),
 			...queryProcessorGlobals.getPaginationOptions(
 				req.query.skip,
-		        req.query.limit
+		    req.query.limit
 			),
 			// For creator
 			queryProcessorGlobals.getCreatorUserLookupStage(),
@@ -58,18 +58,16 @@ const controllerFactory = (db) => {
 			queryProcessorGlobals.getOwnerUserLookupStage(),
 			queryProcessorGlobals.getOwnerOrganizationLookupStage(),
 			queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+			{ $sample: { size: Number(req.query.limit) } }
 		]
 
 		try {
-			console.log(stages)
 			const posts = await Blogpost.aggregate(stages).exec();
 
 			if (posts.length === 0) {
 				return res.status(200).send([]);
 			}
 
-			// console.log(posts)
-
 			res.status(200).send(posts);
 		} catch (err) {
 			console.log(err);
@@ -85,6 +83,7 @@ const controllerFactory = (db) => {
 			status: req.body.status,
 			tags: req.body.tags ? req.body.tags : ['All'],
 			owner: req.body.owner,
+			source: req.body.source,
 			creator: req.body.creator,
 			content: req.body.content,
 			views: 1

package/src/modules/community/controllers/utils/queryProcessor.js

@@ -1,29 +1,32 @@
 function getPeriodConditions(period) {
-  const date = new Date();
-  const matchStage = [];
+  const currentDate = new Date();
+  const startDate = new Date();
 
   switch (period) {
     case 'today':
-      date.setDate(date.getDate() - 1);
+      startDate.setDate(currentDate.getDate() - 1);
       break;
     case 'week':
-      date.setDate(date.getDate() - 7);
+      startDate.setDate(currentDate.getDate() - 7);
       break;
     case 'month':
-      date.setMonth(date.getMonth() - 1);
+      startDate.setMonth(currentDate.getMonth() - 1);
       break;
     case 'year':
-      date.setFullYear(date.getFullYear() - 1);
+      startDate.setFullYear(currentDate.getFullYear() - 1);
       break;
     default:
-      date.setFullYear(date.getFullYear() - 1);
+      startDate.setFullYear(currentDate.getFullYear() - 1);
   }
 
-  if (date) {
-   return [{ $match: { createdAt: { $gte: date } } }];
-  } else {
-  return []
- };
+  return [{ 
+    $match: { 
+      createdAt: { 
+        $gte: startDate, 
+        $lte: currentDate // Добавлено условие, чтобы исключить будущие записи
+      } 
+    } 
+  }];
 }
 
 async function getCategoryConditions(category, user) {
@@ -38,13 +41,10 @@ async function getCategoryConditions(category, user) {
         aggregationStages.push({ $sort: { views: -1, likes: -1 } });
         break;
       case 'new':
-        aggregationStages.push({ $sort: { createdAt: -1 } });
+        aggregationStages.push({ $sort: { createdAt: 1 } });
         break;
     }
   }
-
-  // Возвращаем накопленные этапы агрегации.
-  console.log(aggregationStages)
   return aggregationStages;
 }
 
@@ -52,5 +52,4 @@ async function getCategoryConditions(category, user) {
 module.exports = { 
   getPeriodConditions,
   getCategoryConditions,
-  // ... other functions that you might want to export
 };

package/src/modules/community/models/blogpost.model.js

@@ -12,9 +12,12 @@ module.exports = (db) => {
         content: { 
             type: Array 
         },
-    }, {
-        timestamps: { 
-            currentTime: () => Date.now() 
+        source: { 
+            type: String
+        },
+        createdAt: { 
+            type: Date, 
+            default: Date.now 
         }
     },{
         strict: false

package/src/modules/community/store/blogposts.js

@@ -31,6 +31,7 @@ const state = reactive({
     name: "",
     tags: [],
     owner: {},
+    source: null,
     date: "",
     views: 0,
     content: [],

package/src/modules/constructor/components/elements/Embed.vue

@@ -57,7 +57,18 @@ const props = defineProps([
 const emit = defineEmits(['input', 'updateBlock']);
 
 function isValidEmbedCode(code) {
-  const allowedSources = [/youtube\.com/, /soundcloud\.com/, /vimeo\.com/];
+  const allowedSources = [
+    /youtube\.com/,
+    /facebook\.com/,
+    /instagram\.com/,
+    /twitter\.com/,
+    /tiktok\.com/,
+    /soundcloud\.com/,
+    /vimeo\.com/,
+    /reddit\.com/,
+    /linkedin\.com/,
+    /medium\.com/,
+  ];
   return allowedSources.some(pattern => pattern.test(code));
 }
 

package/src/modules/constructor/components/elements/ImageUpload.vue

@@ -48,12 +48,12 @@ async function onFileChange(e) {
   try {
     const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 
-    let response = await $axios.post(`/api/upload/file?folderName=${encodeURIComponent(uploadPath)}`, formData, {
+    let response = await $axios.post(`/api/upload/multiple?folderName=${encodeURIComponent(props.uploadPath)}`, formData, {
       headers: {
         "Content-Type": "multipart/form-data"
       }
     });
-    imageUrl.value = response.data.filepath;
+    imageUrl.value = response.data[0].filepath;
     console.log(imageUrl.value)
     emit('input', imageUrl.value);
     emit('updateBlock', props.prop, { content: imageUrl.value });

package/src/modules/constructor/components/elements/Textarea.vue

@@ -8,7 +8,12 @@
       @keyup="handleKeyUp"
       ref="textarea" 
       tabindex="-1"
-      class="text-area mn-b-thin">    
+      class="text-area mn-b-thin"
+      :class="{
+        't-main t-semi': prop.type === 'Link'
+      }"  
+    >  
+      
     </textarea>
   </div>
 </template>

package/src/modules/constructor/components/elements/Video.vue

@@ -0,0 +1,79 @@
+<template>
+  <div 
+    class="mn-b-thin w-100 pd-medium bg-white radius-medium"
+  >
+      
+    <div v-if="prop.content" class="flex-center flex">
+      <video controls class="w-100">
+        <source :src="prop.content" type="video/mp4">
+        Your browser does not support the video tag.
+      </video>
+    </div>
+
+    <div
+      v-else
+    >
+      <Upload 
+        v-model:field="imageUrl"
+        @file-change="onComponentSave"
+        type="file"   
+        :placeholder="'Enter embed code'" 
+        class="
+          w-100
+          br-solid
+          br-1px
+          br-black-transp-10
+          pd-medium
+          radius-small
+          mn-b-thin
+        "
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+import Upload         from '@pf/src/components/Upload/Upload.vue'
+
+const imageUrl = ref(null);
+const fileInput = ref(null);
+
+const props = defineProps([
+  'label',
+  'value',
+  'prop'
+]);
+
+const emit = defineEmits(['input', 'updateBlock']);
+
+function isValidEmbedCode(code) {
+  const allowedSources = [/youtube\.com/, /soundcloud\.com/, /vimeo\.com/];
+  return allowedSources.some(pattern => pattern.test(code));
+}
+
+
+function updateBlock(updatedBlock) {
+  const index = post.value.content.findIndex(block => block === updatedBlock);
+  if (index !== -1) {
+    post.value.content.splice(index, 1, updatedBlock);
+  }
+}
+
+
+function onComponentSave(url) {
+  console.log(imageUrl.value )
+
+  imageUrl.value = url
+
+  if (imageUrl.value ) {
+    emit('input', imageUrl.value);
+    emit('updateBlock', props.prop, { content: imageUrl.value });
+  } else {
+    alert('Invalid embed code or source not allowed.');
+  }
+}
+
+</script>
+

package/src/modules/constructor/components/elements/VideoPlayer.vue

@@ -0,0 +1,59 @@
+<template>
+  <div 
+    class="mn-b-thin w-100 pd-medium bg-white radius-medium"
+  >
+      
+    <div v-if="prop.content" class="flex-center flex">
+      <video controls class="w-100">
+        <source :src="prop.content" type="video/mp4">
+        Your browser does not support the video tag.
+      </video>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+import Upload         from '@pf/src/components/Upload/Upload.vue'
+
+const imageUrl = ref(null);
+const fileInput = ref(null);
+
+const props = defineProps([
+  'label',
+  'value',
+  'prop'
+]);
+
+const emit = defineEmits(['input', 'updateBlock']);
+
+function isValidEmbedCode(code) {
+  const allowedSources = [/youtube\.com/, /soundcloud\.com/, /vimeo\.com/];
+  return allowedSources.some(pattern => pattern.test(code));
+}
+
+
+function updateBlock(updatedBlock) {
+  const index = post.value.content.findIndex(block => block === updatedBlock);
+  if (index !== -1) {
+    post.value.content.splice(index, 1, updatedBlock);
+  }
+}
+
+
+function onComponentSave(url) {
+  console.log(imageUrl.value )
+
+  imageUrl.value = url
+
+  if (imageUrl.value ) {
+    emit('input', imageUrl.value);
+    emit('updateBlock', props.prop, { content: imageUrl.value });
+  } else {
+    alert('Invalid embed code or source not allowed.');
+  }
+}
+
+</script>
+

package/src/modules/constructor/components/elements/Youtube.vue

@@ -0,0 +1,52 @@
+<template>
+  <div class="mn-b-thin w-100 pd-medium bg-white radius-medium">
+     <!-- <VueYoutube v-if="prop.content" :video-id="prop.content"  />
+
+     
+      <div  v-else class="flex-v-center flex-nowrap flex gap-small">
+        <Field 
+        v-model:field="embedCode"
+        type="textarea"   
+        :placeholder="'Paste your embed code here'" 
+        class="
+          w-100
+          br-solid
+          br-1px
+          br-black-transp-10
+          pd-medium
+          radius-small
+          mn-b-thin
+        "
+      />
+
+        <p class="t-center">Embeds from youtube.com, vimeo.com, soundcloud.com are allowed</p>
+        <button @click="onComponentClick" class="button-small button">Save</button>
+      </div> -->
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+// import VueYoutube from 'vue-youtube-vue-3'
+import Field         from '@pf/src/components/Field/Field.vue'
+
+const embedCode = ref(null);
+
+const props = defineProps(['label', 'value', 'prop']);
+
+const emit = defineEmits(['input', 'updateBlock']);
+
+function isValidEmbedCode(code) {
+  const allowedSources = [/youtube\.com/,/youtu\.be/,/soundcloud\.com/, /vimeo\.com/];
+  return allowedSources.some(pattern => pattern.test(code));
+}
+
+function onComponentClick() {
+  if (embedCode.value) {
+    emit('input', embedCode.value);
+    emit('updateBlock', props.prop, { content: embedCode.value });
+  } else {
+    alert('Invalid embed code or source not allowed.');
+  }
+}
+</script>

package/src/modules/constructor/components/sections/Constructor.vue

@@ -75,12 +75,30 @@ a<template>
               >
                 Add Embed
               </span>
-             <!--  <span 
+              <span 
                 @click="handleAddBlock('Audio', '', index)"
                 class="w-max button-small t-black bg-white button"
               >
                 Add Audio
-              </span> -->
+              </span>
+              <span 
+                @click="handleAddBlock('Video', '', index)"
+                class="w-max button-small t-black bg-white button"
+              >
+                Add Video
+              </span>
+              <span 
+                @click="handleAddBlock('Youtube', '', index)"
+                class="w-max button-small t-black bg-white button"
+              >
+                Add Youtube
+              </span>
+              <span 
+                @click="handleAddBlock('Link', '', index)"
+                class="w-max button-small t-black bg-white button"
+              >
+                Add Link
+              </span>
 
             </div>
 
@@ -104,6 +122,9 @@ import Bullets      from '../elements/Bullets.vue';
 import ImageUpload  from '../elements/ImageUpload.vue';
 import Embed        from '../elements/Embed.vue';
 import Audio        from '../elements/Audio.vue';
+import Video        from '../elements/Video.vue';
+import Youtube        from '../elements/Youtube.vue';
+
 
 import { ref, watchEffect, computed } from 'vue';
 import { VueDraggableNext } from 'vue-draggable-next';
@@ -119,11 +140,14 @@ post.value = { content: props.content }
 const ComponentMap = {
   'Textarea': Textarea,
   'H2': H2,
+  'Link': Textarea,
   'Bullets': Bullets,
   'Caption': Caption,
   'ImageUpload': ImageUpload,
   'Embed': Embed,
-  'Audio': Audio
+  'Audio': Audio,
+  'Video': Video,
+  'Youtube': Youtube
 };
 
 function handleAddBlock(type = 'Textarea', content = '', index, data) {

package/src/modules/events/components/layouts/layoutEvents.vue

@@ -1,38 +1,17 @@
 <template>
 
-  <div class="pd-thin min-h-100vh">
+  <div class="pd-thin h-min-100">
     <DatePicker
       v-model:date="events.state.filter.date"
       :locale="$i18n.locale"
-      class="radius-small bg-grey pd-l-zero pd-r-zero pd-medium"
+      class="radius-semi o-hidden bg-grey mn-b-thin pd-l-zero pd-r-zero pd-medium"
     />
-    <div class="mn-b-thin br-solid br-1px br-grey bg-grey radius-big">
 
-     <!--  <section class="radius-bl-big radius-br-big pd-medium bg-black t-white">
-        <ul class="flex-nowrap flex">
-          <li
-            :class="{'t-black bg-white': !route.params.category }"
-            @click="router.push({name: 'EventList'})" 
-            class="mn-r-small t-medium pd-small radius-small">Featured</li>
-          <li
-            :class="{'t-black bg-white': route.params.category === 'new'}" 
-            @click="router.push({name: 'EventList', params: { category: 'new' } })" 
-            class="mn-r-small t-medium pd-small radius-small">No More Snow</li>
-          <li
-            :class="{'t-black bg-white': route.params.category === 'following'}" 
-            @click="router.push({name: 'EventList', params: { category: 'following' } })" 
-            class="t-medium pd-small radius-small">Partners</li>
-        </ul>
-      </section> -->
-    </div>
-
-    <section class="">
-      <router-view v-slot="{ Component, route }">
-        <transition name="scaleIn" mode="out-in">
-          <component ref="page" :key="route.query" :is="Component" />
-        </transition>
-      </router-view>
-    </section>
+    <router-view v-slot="{ Component, route }">
+      <transition name="scaleIn" mode="out-in">
+        <component ref="page" :key="route.query" :is="Component" />
+      </transition>
+    </router-view>
   </div>
 </template>
 

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

@@ -1,36 +1,24 @@
-const controllerFactory = (db, publicPath) => {
-
-  const uploadFileController = async (req, res, next) => {
-    if (!req.file) {
-      return res.status(400).send({ message: 'No file uploaded.' });
-    }
+const path = require('path');
 
-    try {
-      res.status(200).send({ 
-        message: 'File uploaded successfully.',
-        filename: req.file.filename,
-        filepath: `/${req.query.folderName || 'unsorted'}/${req.file.filename}`
-      });
-    } catch (error) {
-      console.error('Error in uploadFileController:', error);
-      return res.status(500).send({ message: 'Error during file processing.' });
-    }
-  };
+const controllerFactory = (db, publicPath) => {
 
   const uploadMultipleFileController = async (req, res, next) => {
     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);
+    };
+
+    req.files = req.files.map(file => convertToRelativePath(file, publicPath));
+
     try {
       const fileResponses = req.files.map(file => ({
         message: 'File uploaded successfully.',
-        filename: file.filename,
-        filepath: `/${req.query.folderName || 'unsorted'}/${file.filename}`
+        filepath: file
       }));
 
-      // Your logic related to the DB or further processing can be here.
-
       res.status(200).send(fileResponses);
     } catch (error) {
       console.error('Error in uploadMultipleFileController:', error);
@@ -39,7 +27,6 @@ const controllerFactory = (db, publicPath) => {
   };
 
   return {
-    uploadFileController,
     uploadMultipleFileController
   };
 };

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

@@ -1,9 +1,9 @@
 // middlewareIndexFactory.js
 const middlewareIndexFactory = (db, publicPath) => {
-  const middlewareMulter = require("./middlewareMulter")(db, publicPath);
+  const middlewareBusboy = require("./middlewareBusboy")(db, publicPath);
 
   return {
-    middlewareMulter
+    middlewareBusboy
   };
 };
 

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

@@ -0,0 +1,137 @@
+// 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');
+
+const createThumbnail = async (originalPath) => {
+  const thumbnailPath = path.join(
+    path.dirname(originalPath),
+    'thumbnail_' + path.basename(originalPath)
+  );
+  try {
+    await sharp(originalPath)
+      .rotate() 
+      .resize({ width: 800 })
+      .toFile(thumbnailPath);
+  } catch (error) {
+    console.error("Error creating thumbnail:", 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);
+    }
+    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();
+        }
+
+        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);
+        });
+
+        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);
+          }
+
+          file.resume();
+        });
+
+      });
+
+      bb.on('close', async () => {
+        try {
+          if (!filePromise) {
+            res.status(400).json({ message: `Uploaded file '${name}' is missing` });
+            return;
+          }
+
+          await filePromise
+
+          req.files = files
+
+          next()
+        } catch (err) {
+          next(err);
+
+        } finally {
+          bb.removeAllListeners();
+        }
+      });
+
+      req.pipe(bb);
+    } catch (err) {
+      res.status(400).json({ message: `Could not retrieve file from request - ${err.message}`});
+    }
+  };
+
+  return {  
+    uploadMultipleFilesMiddleware,
+    generatePreviewMiddleware
+  };
+};
+
+module.exports = middlewareFactory;