@ozdao/prometheus-framework 0.2.130 → 0.2.132

package/src/modules/community/controllers/comments.controller.populate.js

@@ -0,0 +1,180 @@
+const commentControllerFactory = (db) => {
+  const Comment = db.comment;
+  const Membership = db.membership;
+
+  const read = async (req, res) => {
+    try {
+        const { target, user, parentId, depth = 0, maxDepth = 2 } = req.query;
+        let conditions = parentId 
+            ? { parent: parentId }
+            : { target, parent: null };
+
+        if (user) {
+            const memberships = await Membership.find({ user });
+            const blockedMembers = memberships
+                .filter(membership => membership.role === 'blocked')
+                .map(membership => membership.target);
+            if (blockedMembers.length > 0) {
+                conditions.user = { "$nin": blockedMembers };
+            }
+        }
+
+        const populateRecursive = (currentDepth = 0) => ({
+            path: 'children',
+            populate: [
+                {
+                    path: 'user',
+                    select: 'username profile.photo profile.name _id'
+                },
+                ...(currentDepth < maxDepth ? [populateRecursive(currentDepth + 1)] : [])
+            ]
+        });
+
+        const comments = await Comment.find(conditions)
+            .populate({
+                path: 'user',
+                select: 'username profile.photo profile.name _id'
+            })
+            .populate(populateRecursive(Number(depth)));
+
+        if (!comments || comments.length === 0) {
+            return res.status(404).send({ 
+                message: parentId 
+                    ? "No more comments found." 
+                    : "Comments not found."
+            });
+        }
+
+        // Функция для рекурсивного подсчета всех вложенных комментариев без ограничения глубины
+        const countAllChildren = (comment) => {
+            let count = 0;
+            const stack = [comment];
+            while (stack.length > 0) {
+                const current = stack.pop();
+                if (current.children && current.children.length > 0) {
+                    count += current.children.length;
+                    stack.push(...current.children);
+                }
+            }
+            return count;
+        };
+
+        const addHasMoreFlag = (comment, currentDepth = 0) => {
+            const commentObj = comment.toObject();
+            commentObj.childrenCount = countAllChildren(comment); // Обновлено здесь для подсчета всех вложенных комментариев
+            commentObj.hasMore = currentDepth >= maxDepth && comment.children.length > 0;
+
+            if (currentDepth < maxDepth && comment.children.length > 0) {
+                commentObj.children = comment.children.map(child => addHasMoreFlag(child, currentDepth + 1));
+            } else {
+                commentObj.children = [];
+            }
+
+            return commentObj;
+        };
+
+        const commentsWithHasMore = comments.map(comment => addHasMoreFlag(comment, Number(depth)));
+
+        res.status(200).send(commentsWithHasMore);
+    } catch (err) {
+        res.status(500).send({ message: err.message });
+    }
+};
+
+
+
+
+  const create = async (req, res) => {
+  try {
+    const { user, type, target, content, parent } = req.body;
+
+    let depth = 0;
+    
+    if (parent) {
+      const parentComment = await Comment.findById(parent);
+      if (!parentComment) {
+        return res.status(404).send({ message: "Parent comment not found." });
+      }
+      depth = parentComment.depth + 1;
+    }
+
+    const comment = new Comment({
+      user,
+      type,
+      target,
+      content,
+      parent,
+      depth
+    });
+
+    const savedComment = await comment.save();
+
+    if (parent) {
+      await Comment.findByIdAndUpdate(parent, {
+        $push: { children: savedComment._id }
+      });
+    }
+
+    const populatedComment = await Comment.findById(savedComment._id)
+      .populate({
+        path: 'user',
+        select: 'username profile.photo profile.name _id'
+      })
+      .populate({
+        path: 'children',
+        populate: {
+          path: 'user',
+          select: 'username profile.photo profile.name _id'
+        }
+      });
+
+    res.status(201).send(populatedComment);
+  } catch (err) {
+    console.error(err);
+    res.status(500).send({
+      message: err.message || "Some error occurred while creating the comment."
+    });
+  }
+};
+
+  const update = async (req, res) => {
+    try {
+      const comment = await Comment.findByIdAndUpdate(req.params._id, req.body, { new: true })
+        .populate({
+          path: 'user',
+          select: 'username profile.photo profile.name _id'
+        });
+
+      if (!comment) {
+        return res.status(404).send({ message: "Comment not found." });
+      }
+
+      res.status(200).send(comment);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  const deleteComment = async (req, res) => {
+    try {
+      const comment = await Comment.findByIdAndRemove(req.params._id);
+
+      if (!comment) {
+        return res.status(404).send({ message: "Comment is not deleted." });
+      }
+
+      res.status(200).send(comment);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  return {
+    read,
+    create,
+    update,
+    delete: deleteComment
+  };
+};
+
+module.exports = commentControllerFactory;

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

@@ -21,6 +21,19 @@ module.exports = (mongoose) => {
             },
             required: true,
         },
+        parent: { 
+            type: mongoose.Schema.Types.ObjectId, 
+            ref: 'Comment', 
+            default: null 
+        },
+        children:[{
+            type: mongoose.Schema.Types.ObjectId,
+            ref: "Comment"
+        }],
+        depth: { 
+            type: Number, 
+            default: 0 
+        },
         content: { 
             type: String,
             required: true 
@@ -30,6 +43,8 @@ module.exports = (mongoose) => {
         }
     });
 
+    CommentSchema.index({ target: 1, parent: 1, depth: 1 });
+
     const Comment = mongoose.model("Comment", CommentSchema);
 
     return Comment;

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

@@ -21,8 +21,19 @@ const state = reactive({
   },
   // Sort
   sort: {
-    current: 'popularity',
-    ascending: false
+    param: 'createdAt',
+    order: 'desc',
+    hideButton: true,
+    options: [{
+      label: 'Date',
+      value: 'createdAt'
+    },{
+      label: 'Popularity',
+      value: 'views'
+    },{
+      label: 'Creator',
+      value: 'creator'
+    }]
   },
   current: {
     _id: "",
@@ -75,6 +86,13 @@ async function read(options = {}) {
   if (options.user) {
     options.params.user = options.user;
   }
+  // Sort
+  if (options.sortParam) {
+    options.params.sortParam = options.sortParam;
+  }
+  if (options.sortOrder) {
+    options.params.sortOrder = options.sortOrder;
+  }
   // Handle pagination
   options.params.skip = options.skip || 0;
   options.params.limit = options.limit || 10;

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

@@ -1,22 +1,23 @@
 <template>
   <div 
-    class="mn-b-thin w-100 pd-medium bg-white radius-medium">
-    
-    <div 
-      v-if="prop.content" 
-      v-html="prop.content" 
-      class="flex-center flex"
-    />
-    
+    class="mn-b-thin w-100 radius-medium"
+  >
+      
+    <div v-if="prop.content" class="flex-center flex">
+      <audio controls class="w-100 h-max-30r">
+        <source :src="prop.content" type="video/mp4">
+        Your browser does not support the video tag.
+      </audio>
+    </div>
+
     <div
-      class="" 
       v-else
     >
       <Upload 
-        v-model:field="embedCode"
-        @file-change="onComponentClick"
-        type="file"   
-        :placeholder="'Enter embed code'" 
+        v-model:field="audioUrl"
+        @file-change="onComponentSave"
+        type="audio"   
+        :placeholder="'Upload video'" 
         class="
           w-100
           br-solid
@@ -27,14 +28,7 @@
           mn-b-thin
         "
       />
-      <button 
-        @click="onComponentClick"
-        class="button-small button"
-      >
-        Save
-      </button>
     </div>
-    <!-- <button v-if="prop.content" @click="editEmbedCode">Edit Embed Code</button> -->
   </div>
 </template>
 
@@ -43,7 +37,8 @@ import { ref } from 'vue';
 
 import Upload         from '@pf/src/components/Upload/Upload.vue'
 
-const embedCode = ref(null);
+const audioUrl = ref(null);
+const fileInput = ref(null);
 
 const props = defineProps([
   'label',
@@ -53,30 +48,23 @@ const props = defineProps([
 
 const emit = defineEmits(['input', 'updateBlock']);
 
-function isValidEmbedCode(code) {
-  const allowedSources = [/youtube\.com/, /soundcloud\.com/, /vimeo\.com/];
-  return allowedSources.some(pattern => pattern.test(code));
-}
-
-function onComponentClick(file) {
-    embedCode.value = file
-  if (embedCode.value && isValidEmbedCode(embedCode.value)) {
-    emit('input', embedCode.value);
-    emit('updateBlock', props.prop, { content: embedCode.value });
-  } else {
-    alert('Invalid embed code or source not allowed.');
+function updateBlock(updatedBlock) {
+  const index = post.value.content.findIndex(block => block === updatedBlock);
+  if (index !== -1) {
+    post.value.content.splice(index, 1, updatedBlock);
   }
 }
 
-function editEmbedCode() {
-  let embedInput = prompt('Edit embed code:', prop.content);
-  if (embedInput && isValidEmbedCode(embedInput)) {
-    embedCode.value = embedInput;
-    emit('input', embedCode.value);
-    emit('updateBlock', props.prop, { content: embedCode.value });
+
+function onComponentSave(url) {
+  audioUrl.value = url
+
+  if (audioUrl.value ) {
+    emit('input', audioUrl.value);
+    emit('updateBlock', props.prop, { content: audioUrl.value });
   } else {
     alert('Invalid embed code or source not allowed.');
   }
 }
-</script>
 
+</script>

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

@@ -3,10 +3,12 @@
     @click="onComponentClick"
     @drop="onDrop"
     @dragover.prevent
+    @dragenter.prevent
+    @dragleave.prevent
     class="w-100 radius-big bg-white image-upload-area flex-v-center flex-h-center flex t-black mn-b-small">
     <img v-if="prop.content" :src="(FILE_SERVER_URL || '') + prop.content" alt="Uploaded image" class="w-100 h-30r object-fit-contain"/>
     <span v-else class="t-transp pd-extra" >Click or drag-and-drop your image</span>
-    <input type="file" ref="fileInput" tabindex="-1" @change="onFileChange" style="display: none"/>
+    <input v-if="!prop.content" type="file" ref="fileInput" tabindex="-1" @change="onFileChange" style="display: none"/>
   </div>
 </template>
 
@@ -48,7 +50,7 @@ async function onFileChange(e) {
   try {
     const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 
-    let response = await $axios.post(`/api/upload/multiple?folderName=${encodeURIComponent(props.uploadPath)}`, formData, {
+    let response = await $axios.post(`/api/upload/multiple?folderName=${encodeURIComponent(props.uploadPath || 'images')}`, formData, {
       headers: {
         "Content-Type": "multipart/form-data"
       }
@@ -64,10 +66,13 @@ async function onFileChange(e) {
 
 function onDrop(e) {
   e.preventDefault();
-  onFileChange({
-    target: {
-      files: e.dataTransfer.files
-    }
-  });
+
+  if (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length) {
+    onFileChange({
+      target: {
+        files: e.dataTransfer.files
+      }
+    });
+  }
 }
 </script>

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

@@ -4,17 +4,17 @@
   >
       
     <div v-if="prop.content" class="flex-center flex">
-      <video controls class="w-100 h-max-30r">
-        <source :src="prop.content" type="video/mp4">
-        Your browser does not support the video tag.
-      </video>
+      <audio controls class="w-100 h-max-30r">
+        <source :src="prop.content" type="audio/mp3">
+        Your browser does not support the audio tag.
+      </audio>
     </div>
 
     <div
       v-else
     >
       <Upload 
-        v-model:field="imageUrl"
+        v-model:field="videoUrl"
         @file-change="onComponentSave"
         type="file"   
         :placeholder="'Enter embed code'" 
@@ -37,7 +37,7 @@ import { ref } from 'vue';
 
 import Upload         from '@pf/src/components/Upload/Upload.vue'
 
-const imageUrl = ref(null);
+const videoUrl = ref(null);
 const fileInput = ref(null);
 
 const props = defineProps([
@@ -48,12 +48,6 @@ const props = defineProps([
 
 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) {
@@ -63,13 +57,11 @@ function updateBlock(updatedBlock) {
 
 
 function onComponentSave(url) {
-  console.log(imageUrl.value )
-
-  imageUrl.value = url
+  videoUrl.value = url
 
-  if (imageUrl.value ) {
-    emit('input', imageUrl.value);
-    emit('updateBlock', props.prop, { content: imageUrl.value });
+  if (videoUrl.value ) {
+    emit('input', videoUrl.value);
+    emit('updateBlock', props.prop, { content: videoUrl.value });
   } else {
     alert('Invalid embed code or source not allowed.');
   }

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

@@ -1,17 +1,22 @@
-a<template>
+<template>
   <!-- Content -->
   <section>
-    <VueDraggableNext 
-      v-if="post.content" 
-      class="w-full" 
+    <Draggable 
       :list="post.content" 
+      @update:list="updateContent" 
       @start="handleDragStart" 
-      @end="handleDragEnd"
+      @end="handleDragEnd" 
+      disabledClass="no-drag"
     >
       <div
         v-for="(block, index) in post.content"
         :key="index"
-        class="pos-relative"
+        :data-index="index"
+        draggable="true"
+        class="draggable-item pos-relative"
+        :class="{
+          'no-drag': index === 0
+        }"
       >
         <div 
           @mouseover="showControls = index, showMenu = false"
@@ -22,6 +27,7 @@ a<template>
             :index="index"
             :component="block"
             :prop="block"
+            :placeholder="block.placeholder"
             :class="block.class"
             :setFocus="block.setFocus"
             content="content"
@@ -36,7 +42,6 @@ a<template>
             v-if="showControls === index" 
             class="pos-absolute z-index-4 i-semi" 
             style="right: calc(100% + 0.5rem); top: calc(50% - 1.125rem);"
-            @mousedown.prevent="startDragging = true"
           >
             <button 
               @click="showMenu = !showMenu" 
@@ -50,6 +55,7 @@ a<template>
               class="z-index-5 radius-thin pd-thin bg-white w-max mn-b-small flex-nowrap flex-column flex"
             >
               <span 
+                v-if="index !== 0"
                 @click="handleDeleteBlock(block)" 
                 class="mn-b-thin w-max t-red bg-white button-small button"
               >
@@ -95,7 +101,7 @@ a<template>
           </div>
         </transition>
       </div>
-    </VueDraggableNext>
+    </Draggable>
   </section>
 </template>
 
@@ -110,16 +116,23 @@ import Embed        from '../elements/Embed.vue';
 import Audio        from '../elements/Audio.vue';
 import Video        from '../elements/Video.vue';
 
-import { ref, watchEffect, computed } from 'vue';
-import { VueDraggableNext } from 'vue-draggable-next';
+import Draggable        from '@pf/src/components/Draggable/Draggable.vue';
+
+import { ref, onMounted, watchEffect, computed } from 'vue';
+
+const props = defineProps({
+  content: {
+    type: Array
+  }
+});
 
-const props = defineProps(['content']);
 const emits = defineEmits(['update'])
 
-let post = ref(null);
 let publics = ref(null);
+let post = ref(null); 
 
-post.value = { content: props.content } 
+const showControls = ref(null)
+const showMenu = ref(false)
 
 const ComponentMap = {
   'Textarea': Textarea,
@@ -133,24 +146,42 @@ const ComponentMap = {
   'Video': Video,
 };
 
-function handleAddBlock(type = 'Textarea', content = '', index, data) {
-  console.log('We are adding new block (functuin HandleAddBlock):' + type + content + index + data )
-  
+post.value = { content: props.content }; 
+
+onMounted(() => {
+  if (post.value && post.value.content.length === 0) {
+    handleAddBlock('Textarea', '', 0, null, 'h2', 'Enter title');
+  }
+})
+
+const updateContent = (newContent) => {
+  post.value.content = newContent;
+};
+
+const handleDragStart = (startIndex) => {
+  console.log('Drag started from index:', startIndex);
+};
+
+const handleDragEnd = (startIndex, endIndex) => {
+  console.log('Drag ended. Start index:', startIndex, 'End index:', endIndex);
+};
+
+function handleAddBlock(type = 'Textarea', content = '', index, data, classBlock = '', placeholder = '') {
+
   let blockNew = {
-    order: post.value.content.length + 1,
     type: type,
     style: '',
-    class: '',
+    class: classBlock,
+    placeholder: placeholder,
     content: content,
     blocks: [],
-    setFocus: false,
+    setFocus: true,
   };
   
   if (data && data.blocks && Array.isArray(data.blocks)) {
     let newBlocks = data.blocks.map(block => ({
       ...blockNew,
       content: block.content,
-      
     }));
 
     let args = [(data.index || index) + 1, 0].concat(newBlocks);
@@ -158,13 +189,9 @@ function handleAddBlock(type = 'Textarea', content = '', index, data) {
     post.value.content.splice.apply(post.value.content, args);
 
     const lastBlock = newBlocks[newBlocks.length - 1];
-
-    console.log('New block is' + lastBlock)
   } else if (index !== undefined) {
     post.value.content.splice(index + 1, 0, blockNew);
-    console.log('Latest block is' + blockNew)
   } else {
-    console.log('Another block is' + blockNew)
     post.value.content.push(blockNew);
   }
 
@@ -186,34 +213,14 @@ function handleUpdateBlock(block, update) {
 function handleDeleteBlock(block) {
   let index = post.value.content.findIndex(b => b === block);
   
-  if (index !== -1) {
+  // Не даем удалить первый (нулевой) элемент в конструкторе
+  if (index !== -1 && index !== 0) {
     post.value.content.splice(index, 1);
+    post.value.content[index - 1].setFocus = true
   }
 
-  post.value.content[index - 1].setFocus = true
-
   emits('update', post.value.content);
 }
-
-const showControls = ref(null)
-const startDragging = ref(false)
-const showMenu = ref(false)
-
-function handleDragStart() {
-  startDragging.value = true
-}
-
-function handleDragEnd() {
-  startDragging.value = false
-}
-
-watchEffect(() => {
-  if (post.value && post.value.content.length === 0) {
-    handleAddBlock('Textarea', '');
-  }
-
-  emits('update', post.value.content);
-});
 </script>
 
 

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

@@ -18,6 +18,8 @@ const controllerFactory = (db, publicPath) => {
 
     req.files = req.files.map(file => convertToRelativePath(file));
 
+    console.log(req.files)
+
     try {
       const fileResponses = req.files.map(file => ({
         message: 'File uploaded successfully.',