@ozdao/prometheus-framework 0.0.86 → 0.0.87

package/src/modules/community/components/pages/CreateBlogPost.vue

@@ -17,55 +17,11 @@
           class="h2"
         />
       </div>
-      <!-- Content -->
-      <VueDraggableNext 
-        v-if="post.content" 
-        class="w-full" 
-        :list="post.content" 
-        @start="handleDragStart" 
-        @end="handleDragEnd"
-      >
-        <div
-          v-for="(block, index) in post.content"
-          :key="index"
-          class="relative"
-         
-        >
-          <div 
-            @mouseover="showControls = index, showMenu = false"
-            class="w-full h-full"
-          >
-            <component
-              :is="ComponentMap[block.type]"
-              :index="index"
-              :component="block"
-              :prop="block"
-              :class="block.class"
-              :setFocus="block.setFocus"
-              content="content"
-              @deleteBlock="handleDeleteBlock"
-              @addBlock="handleAddBlock"
-              @updateBlock="handleUpdateBlock"
-    
-            />
-          </div>
-
-          <transition name="fade">
-            <div 
-              v-if="showControls === index" 
-              class="pos-absolute pos-r-100 pos-t-0 z-index-4 i-semi" 
-              @mousedown.prevent="startDragging = true"
-            >
-              <button @click="showMenu = !showMenu" class="mn-small w-100 i-semi bg-white radius-thin">{{ block.content ? '...' : '+' }}</button>
-              <div v-if="showMenu" class="z-index-5 radius-thin mn-small relative left-0 mt-2 w-max bg-white shadow-lg rounded">
-                <button @click="handleDeleteBlock(block)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Удалить</button>
-                <button @click="handleAddBlock('ImageUpload', '', index)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Добавить изображение</button>
-                <button @click="handleAddBlock('H2', '', index)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Добавить заголовок</button>
-              </div>
-            </div>
-          </transition>
-        </div>
-      </VueDraggableNext>
+
+      <Constructor 
+        :content="post.content"
+        @update="update => post.content = update"
+      />
     </section>
 
     <section v-if="post" class="pd-thin pos-fixed pos-l-0 pos-b-0 w-100 ">
@@ -112,26 +68,14 @@
         </div>
         <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
       </div>
-      <!-- <DepartmentMemberModify 
-        :members="departments.state.department.members" 
-        :member="selectedMember" 
-        :users="users"
-        @callback="closeMemberPopup"
-      /> -->
     </Popup>
+    
   </article>
 </template>
 
-
-
-
 <script setup>
-import Textarea     from '@pf/src/modules/community/components/elements/Textarea.vue';
-import H2           from '@pf/src/modules/community/components/elements/H2.vue';
-import Caption      from '@pf/src/modules/community/components/elements/Caption.vue';
-import Bullets      from '@pf/src/modules/community/components/elements/Bullets.vue';
-import ImageUpload  from '@pf/src/modules/community/components/elements/ImageUpload.vue';
-
+import Textarea     from '@pf/src/modules/constructor/components/elements/Textarea.vue';
+import Constructor  from '@pf/src/modules/constructor/components/sections/Constructor.vue';
 
 import Popup    from '@pf/src/components/Popup/Popup.vue'
 import FieldTags    from '@pf/src/components/FieldTags/FieldTags.vue'
@@ -306,93 +250,6 @@ function onDelete() {
       });
   }
 }
-
-// /////////////////////////////////////////
-// CONSTRUCTOR
-// /////////////////////////////////////////
-
-const ComponentMap = {
-  'Textarea': Textarea,
-  'H2': H2,
-  'Bullets': Bullets,
-  'Caption': Caption,
-  'ImageUpload': ImageUpload
-};
-
-function handleAddBlock(type = 'Textarea', content = '', index, data) {
- console.log('We are adding new block (functuin HandleAddBlock):' + type + content + index + data )
-  let blockNew = {
-    order: post.value.content.length + 1,
-    type: type,
-    style: '',
-    class: '',
-    content: content,
-    blocks: [],
-    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);
-
-    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);
-  }
-
-  showControls.value = null
-}
-
-function handleUpdateBlock(block, update) {
-    const index = post.value.content.findIndex(item => item === block);
-
-    if (index !== -1) {
-        post.value.content[index] = { ...post.value.content[index], ...update };
-    }
-}
-
-
-function handleDeleteBlock(block) {
-  let index = post.value.content.findIndex(b => b === block);
-  
-  if (index !== -1) {
-    post.value.content.splice(index, 1);
-  }
-
-  post.value.content[index - 1].setFocus = true
-}
-
-// Добавлено из BlogConstructor
-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', '');
-  }
-});
 </script>
 
 

package/src/modules/community/middlewares/server/verifyBlogpost.js

@@ -4,31 +4,44 @@ const middlewareFactory = (db) => {
 
   const checkBlogpostExistOrNot = async (req, res, next) => {
     try {
-      const url = req.body.url 
-        ? req.body.url 
+      // Обработка URL
+      const url = req.body.url
+        ? req.body.url
         : req.body.name.toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g, '');
 
-      // Проверка на наличие _id в теле запроса
+      // Создание блога
       if (!req.body._id) {
-        res.status(400).send({ errorCode: 'MISSING_BLOGPOST_ID', accessToken: null });
+        const blogpost = await Blogpost.findOne({ url });
+        if (blogpost) {
+          res.status(400).send({ errorCode: 'POST_URL_ALREADY_IN_USE', accessToken: null });
+          return;
+        }
+        next();
         return;
       }
 
-      const blogpost = await Blogpost.findOne({ url });
+      // Обновление блога
       const updatingBlogpostId = req.body._id;
-
-      if (blogpost && (String(blogpost._id) !== String(updatingBlogpostId))) {
-        res.status(400).send({ errorCode: 'POST_URL_ALREADY_IN_USE', accessToken: null });
+      const existingBlogpost = await Blogpost.findById(updatingBlogpostId);
+      if (!existingBlogpost) {
+        res.status(404).send({ errorCode: 'BLOGPOST_NOT_FOUND', accessToken: null });
         return;
       }
-
+      if (existingBlogpost.url !== url) {
+        const blogpost = await Blogpost.findOne({ url });
+        if (blogpost) {
+          res.status(400).send({ errorCode: 'POST_URL_ALREADY_IN_USE', accessToken: null });
+          return;
+        }
+      }
+      
       next();
     } catch (err) {
       console.log(err);
       res.status(500).send({ message: err });
     }
-  };
-
+  }
+  
   const checkNameNotEmpty = (req, res, next) => {
     if (!req.body.name || req.body.name.trim() === '') {
       res.status(400).send({ errorCode: "NAME_CANNOT_BE_EMPTY", accessToken: null });

package/src/modules/{community → constructor}/components/elements/Textarea.vue

@@ -15,15 +15,13 @@
 <script setup="props">
   import { computed, ref, onMounted, watch, nextTick, onUpdated, watchEffect } from 'vue'
 
-  const props = defineProps(
-    ['obj','label','prop','value','content','textarea','placeholder','index','ref','setFocus']
-  )
+  const props = defineProps(['prop','value','content','placeholder','index','setFocus'])
+  const emit = defineEmits(['deleteBlock', 'updateBlock','addBlock','focus'])
 
   const data = ref(props)
   const textarea = ref(null)
-  const emit = defineEmits(['deleteBlock', 'updateBlock','addBlock','focus'])
 
-  let cursorPosition = ref(0); // To store the cursor position
+  let cursorPosition = ref(0);
 
   function handleInput(event) {
     let paragraphs = event.target.value.split(/\n+/);
@@ -79,12 +77,6 @@
     if (props.setFocus) nextTick(() => {  { focus()} })
     resize()
   });
-
-  watch(() => props.prop[props.content], (newValue) => {
-    // if (newValue === "" && !newValue.includes("\n")) {
-    //   emit('deleteBlock', props.prop)
-    // }
-  });
 </script>
 
 

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

@@ -0,0 +1,167 @@
+<template>
+  <!-- Content -->
+  <section>
+    <VueDraggableNext 
+      v-if="post.content" 
+      class="w-full" 
+      :list="post.content" 
+      @start="handleDragStart" 
+      @end="handleDragEnd"
+    >
+      <div
+        v-for="(block, index) in post.content"
+        :key="index"
+        class="relative"
+       
+      >
+        <div 
+          @mouseover="showControls = index, showMenu = false"
+          class="w-full h-full"
+        >
+          <component
+            :is="ComponentMap[block.type]"
+            :index="index"
+            :component="block"
+            :prop="block"
+            :class="block.class"
+            :setFocus="block.setFocus"
+            content="content"
+            @deleteBlock="handleDeleteBlock"
+            @addBlock="handleAddBlock"
+            @updateBlock="handleUpdateBlock"
+  
+          />
+        </div>
+
+        <transition name="fade">
+          <div 
+            v-if="showControls === index" 
+            class="pos-absolute pos-r-100 pos-t-0 z-index-4 i-semi" 
+            @mousedown.prevent="startDragging = true"
+          >
+            <button @click="showMenu = !showMenu" class="mn-small w-100 i-semi bg-white radius-thin">{{ block.content ? '...' : '+' }}</button>
+            <div v-if="showMenu" class="z-index-5 radius-thin mn-small relative left-0 mt-2 w-max bg-white shadow-lg rounded">
+              <button @click="handleDeleteBlock(block)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Удалить</button>
+              <button @click="handleAddBlock('ImageUpload', '', index)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Добавить изображение</button>
+              <button @click="handleAddBlock('H2', '', index)" class="block w-max text-left px-4 py-2 hover:bg-gray-200">Добавить заголовок</button>
+            </div>
+          </div>
+        </transition>
+      </div>
+    </VueDraggableNext>
+  </section>
+</template>
+
+
+<script setup>
+import Textarea     from '../elements/Textarea.vue';
+import H2           from '../elements/H2.vue';
+import Caption      from '../elements/Caption.vue';
+import Bullets      from '../elements/Bullets.vue';
+import ImageUpload  from '../elements/ImageUpload.vue';
+
+import { ref, watchEffect, computed, emit } from 'vue';
+import { VueDraggableNext } from 'vue-draggable-next';
+
+const props = defineProps(['content']);
+const emits = defineEmits(['update'])
+
+let post = ref(null);
+let publics = ref(null);
+
+post.value = { content: props.content } 
+
+const ComponentMap = {
+  'Textarea': Textarea,
+  'H2': H2,
+  'Bullets': Bullets,
+  'Caption': Caption,
+  'ImageUpload': ImageUpload
+};
+
+function handleAddBlock(type = 'Textarea', content = '', index, data) {
+ console.log('We are adding new block (functuin HandleAddBlock):' + type + content + index + data )
+  let blockNew = {
+    order: post.value.content.length + 1,
+    type: type,
+    style: '',
+    class: '',
+    content: content,
+    blocks: [],
+    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);
+
+    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);
+  }
+
+  showControls.value = null
+  emits('update', post.value.content);
+}
+
+function handleUpdateBlock(block, update) {
+  const index = post.value.content.findIndex(item => item === block);
+
+  if (index !== -1) {
+      post.value.content[index] = { ...post.value.content[index], ...update };
+  }
+
+  emits('update', post.value.content);
+}
+
+
+function handleDeleteBlock(block) {
+  let index = post.value.content.findIndex(b => b === block);
+  
+  if (index !== -1) {
+    post.value.content.splice(index, 1);
+  }
+
+  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>
+
+
+<style lang="scss">
+
+</style>

package/src/modules/events/components/blocks/CardEvent.vue

@@ -74,12 +74,20 @@
 			    </span>
 			</div>
 
-      <h3 
-      	v-if="type !== 'short'" 
-      	class="cursor-pointer mn-thin"
-      >
-    		{{ event.name }}
-    	</h3>
+      <div v-if="type !== 'short'" class="cursor-pointer mn-thin flex-nowrap flex w-100">
+
+				<h3 
+	      	v-if="type !== 'short'" 
+	      	class=""
+	      >
+	    		{{ event.name }}
+	    	</h3>
+
+				<div v-if="event.status === 'draft'" class="pd-micro t-white uppercase t-semi p-small flex-center flex pd-r-small pd-l-small mn-l-thin w-min bg-second radius-extra">
+					{{event.status}}
+				</div>
+				
+			</div>
 
     	<p 
     		v-if="type !== 'short'"