@ozdao/martyrs 0.2.438 → 0.2.440

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

@@ -1,10 +1,22 @@
+const queryProcessorGlobals = require('@martyrs/src/modules/globals/controllers/utils/queryProcessor');
+
+
 const commentControllerFactory = (db) => {
   const Comment = db.comment;
   const Membership = db.membership;
 
   const read = async (req, res) => {
     try {
-      const { target, type, user, maxDepth = 4, parentId = null } = req.query;
+      const { 
+        target, 
+        type, 
+        user, 
+        maxDepth = 4, 
+        parentId = null, 
+        format = 'tree', 
+        sortParam = 'createdAt',
+        sortOrder = 'desc'
+      } = req.query;
       
       let conditions = {};
       
@@ -24,20 +36,20 @@ const commentControllerFactory = (db) => {
         blockedMembers = memberships.map(membership => membership.target);
       }
 
-      console.log(conditions)
       const pipeline = [
         { $match: conditions },
-        { $sort: { createdAt: 1 } },
-        {
+      
+        ...(format === 'tree' ? [{
           $graphLookup: {
             from: 'comments',
             startWith: '$_id',
             connectFromField: '_id',
             connectToField: 'parent',
             as: 'children',
+            maxDepth: Number(req.query.maxDepth),
             depthField: 'childDepth'
           }
-        },
+        }] : []),
         {
           $lookup: {
             from: 'users',
@@ -55,6 +67,10 @@ const commentControllerFactory = (db) => {
             as: 'childUsers'
           }
         },
+        ...queryProcessorGlobals.getSortingOptions(
+          sortParam,
+          sortOrder,
+        ),
         {
           $project: {
             _id: 1,
@@ -67,35 +83,37 @@ const commentControllerFactory = (db) => {
             'owner._id': 1,
             depth: 1,
             createdAt: 1,
-            childrenCount: { $size: '$children' },
-            children: {
-              $map: {
-                input: '$children',
-                as: 'child',
-                in: {
-                  _id: '$$child._id',
-                  content: '$$child.content',
-                  type: '$$child.type',
-                  parent: '$$child.parent',
-                  target: '$$child.target',
-                  owner: {
-                    $arrayElemAt: [
-                      {
-                        $filter: {
-                          input: '$childUsers',
-                          as: 'childUser',
-                          cond: { $eq: ['$$childUser._id', '$$child.owner.target'] }
-                        }
-                      },
-                      0
-                    ]
-                  },
-                  depth: '$$child.depth',
-                  createdAt: '$$child.createdAt',
-                  childrenCount: { $size: '$$child.children' }
+             ...(format === 'tree' ? {
+              childrenCount: { $size: '$children' },
+              children: {
+                $map: {
+                  input: '$children',
+                  as: 'child',
+                  in: {
+                    _id: '$$child._id',
+                    content: '$$child.content',
+                    type: '$$child.type',
+                    parent: '$$child.parent',
+                    target: '$$child.target',
+                    owner: {
+                      $arrayElemAt: [
+                        {
+                          $filter: {
+                            input: '$childUsers',
+                            as: 'childUser',
+                            cond: { $eq: ['$$childUser._id', '$$child.owner.target'] }
+                          }
+                        },
+                        0
+                      ]
+                    },
+                    depth: '$$child.depth',
+                    createdAt: '$$child.createdAt',
+                    childrenCount: { $size: '$$child.children' }
+                  }
                 }
               }
-            }
+            } : {}),
           }
         },
       ];
@@ -161,9 +179,7 @@ const commentControllerFactory = (db) => {
         return rootComments;
       }
 
-      let commentsTree = buildCommentTree(comments)
-
-      console.log(commentsTree)
+      let commentsTree = format === 'tree' ? buildCommentTree(comments) : comments
 
       res.status(200).json(commentsTree);
     } catch (error) {

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

@@ -16,7 +16,7 @@ function getPeriodConditions(period) {
       startDate.setFullYear(currentDate.getFullYear() - 1);
       break;
     default:
-      startDate.setFullYear(currentDate.getFullYear() - 1);
+      return [];
   }
 
   return [{ 
@@ -29,6 +29,7 @@ function getPeriodConditions(period) {
   }];
 }
 
+
 async function getCategoryConditions(category, user) {
   const aggregationStages = [];
 

package/src/modules/globals/views/components/blocks/BlockSearch.vue

@@ -1,16 +1,20 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 
 import IconSearch from '@martyrs/src/modules/icons/navigation/IconSearch.vue';
 import Field from '@martyrs/src/components/Field/Field.vue';
 
-const emits = defineEmits(['search']);
+const emits = defineEmits(['search', 'update:modelValue']);
 const props = defineProps({
+  modelValue: {
+    type: String,
+    default: ''
+  },
   placeholder: {
     type: String,
     default: 'Enter shop or product name'
   },
-  autofocus:{ 
+  autofocus: {
     type: Boolean,
     default: false
   },
@@ -20,29 +24,32 @@ const props = defineProps({
   },
 });
 
-const stateSearch = ref(null)
+const stateSearch = ref(props.modelValue);
+
+// Обновлять поле при изменении modelValue извне
+watch(() => props.modelValue, (newVal) => {
+  stateSearch.value = newVal;
+});
 
+// Когда пользователь вводит новое значение
 const updateSearch = (search) => {
-  emits('search', search);
+  stateSearch.value = search;
+  emits('update:modelValue', search); // уведомим родителя
+  emits('search', search);            // при необходимости
 };
 </script>
 
+
 <template>
   <div class="flex-v-center flex-nowrap flex pd-small bg-light w-100 radius-medium">
     <IconSearch class="i-medium t-transp mn-r-thin" />
 
     <Field
+      v-model:field="stateSearch"
       :placeholder="placeholder"
-      @update:field="search => updateSearch(search)"
       :autofocus="autofocus"
       class="w-100"
+      @update:field="updateSearch"
     />
-
-    <!-- <button 
-      class="pd-r-small pd-l-small pd-t-thin pd-b-thin p-medium uppercase p-small t-medium cursor-pointer radius-extra bg-main" 
-      @click="updateSearch(stateSearch)"
-    >
-      {{ button }}
-    </button> -->
   </div>
 </template>

package/src/modules/globals/views/components/partials/Header.vue

@@ -141,7 +141,7 @@
 
 	<div class="flex-justify-end flex-v-center flex-nowrap flex gap-micro">
 		<Button 
-			v-if="router.hasRoute('Search')"
+			v-if="router.hasRoute('Search') && route.meta.header_search"
 			aria-label="search"
 			class="pd-zero bg-transp"
 			:submit="() => router.push({name: 'Search'})"

package/dist/Media-BboZTslJ.mjs

@@ -1,111 +0,0 @@
-import { ref as u, computed as m, onMounted as N, onUnmounted as P, createElementBlock as c, openBlock as d, createCommentVNode as f, mergeProps as V, createElementVNode as S, toDisplayString as q } from "vue";
-import { _ as z } from "./main-BDd3Ou7C.mjs";
-const D = { class: "media-container" }, T = ["src", "data-src", "alt"], U = ["controls", "loop", "muted", "autoplay", "playsinline", "preload"], _ = ["src", "type"], $ = {
-  key: 2,
-  class: "media-placeholder"
-}, A = {
-  key: 3,
-  class: "media-error"
-}, F = {
-  __name: "Media",
-  props: {
-    url: {
-      type: String,
-      required: !0
-    },
-    options: {
-      type: Object,
-      default: () => ({
-        muted: !0,
-        loop: !0,
-        playsinline: !0,
-        preload: "metadata"
-        // 'none' | 'metadata' | 'auto'
-      })
-    }
-  },
-  setup(e) {
-    const g = e, a = u(null), y = u(null), l = u(!1), v = u(null), h = u(!1);
-    let s = null, E = !1;
-    const p = m(() => {
-      var t, n, o;
-      return (o = (n = (t = g.url) == null ? void 0 : t.split(".")) == null ? void 0 : n.pop()) == null ? void 0 : o.toLowerCase();
-    }), b = m(() => ["jpg", "jpeg", "png", "gif", "webp", "svg", "avif"].includes(p.value)), x = m(() => ["mp4", "webm", "ogg"].includes(p.value)), j = m(() => ({
-      mp4: "video/mp4",
-      webm: "video/webm",
-      ogg: "video/ogg"
-    })[p.value] || "");
-    function k() {
-      l.value = !0;
-    }
-    function C(t) {
-      v.value = `Ошибка загрузки медиа: ${t.message}`, l.value = !1;
-    }
-    async function O() {
-      if (a.value)
-        try {
-          a.value.paused && !E && (await a.value.play(), E = !0);
-        } catch (t) {
-          C(t);
-        }
-    }
-    function B() {
-      const t = {
-        root: null,
-        rootMargin: "50px",
-        threshold: 0.1
-      };
-      s = new IntersectionObserver((o) => {
-        o.forEach((i) => {
-          var r;
-          h.value = i.isIntersecting, i.isIntersecting && (x.value && ((r = g.options) != null && r.autoplay) && O(), s.disconnect());
-        });
-      }, t);
-      const n = b.value ? y.value : a.value;
-      n && s.observe(n);
-    }
-    return N(() => {
-      B();
-    }), P(() => {
-      s && s.disconnect();
-    }), (t, n) => {
-      var o, i, r, I, w, L, M;
-      return d(), c("div", D, [
-        b.value ? (d(), c("img", V({
-          key: 0,
-          src: h.value ? e.url : "",
-          "data-src": e.url,
-          alt: ((o = e.options) == null ? void 0 : o.alt) || "Image",
-          class: ["media-item", { loading: !l.value }],
-          loading: "lazy",
-          onLoad: k
-        }, e.options, {
-          ref_key: "imageElement",
-          ref: y
-        }), null, 16, T)) : x.value ? (d(), c("video", V({
-          key: 1,
-          ref_key: "videoElement",
-          ref: a,
-          class: [{ loading: !l.value }, "media-item"],
-          controls: !((i = e.options) != null && i.hideControls),
-          loop: ((r = e.options) == null ? void 0 : r.loop) !== !1,
-          muted: ((I = e.options) == null ? void 0 : I.muted) !== !1,
-          autoplay: (w = e.options) == null ? void 0 : w.autoplay,
-          playsinline: ((L = e.options) == null ? void 0 : L.playsinline) !== !1,
-          preload: ((M = e.options) == null ? void 0 : M.preload) || "metadata",
-          onLoadeddata: k
-        }, e.options), [
-          S("source", {
-            src: e.url,
-            type: j.value
-          }, null, 8, _)
-        ], 16, U)) : f("", !0),
-        l.value ? f("", !0) : (d(), c("div", $, " Загрузка... ")),
-        v.value ? (d(), c("div", A, q(v.value), 1)) : f("", !0)
-      ]);
-    };
-  }
-}, J = /* @__PURE__ */ z(F, [["__scopeId", "data-v-94bcf726"]]);
-export {
-  J as default
-};

package/dist/Media-DUh-liJN.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),C=require("./main-BsjyqqFT.js"),L={class:"media-container"},M=["src","data-src","alt"],j=["controls","loop","muted","autoplay","playsinline","preload"],N=["src","type"],O={key:2,class:"media-placeholder"},P={key:3,class:"media-error"},S={__name:"Media",props:{url:{type:String,required:!0},options:{type:Object,default:()=>({muted:!0,loop:!0,playsinline:!0,preload:"metadata"})}},setup(t){const m=t,a=e.ref(null),p=e.ref(null),s=e.ref(!1),u=e.ref(null),v=e.ref(!1);let i=null,f=!1;const d=e.computed(()=>{var o,l,n;return(n=(l=(o=m.url)==null?void 0:o.split("."))==null?void 0:l.pop())==null?void 0:n.toLowerCase()}),g=e.computed(()=>["jpg","jpeg","png","gif","webp","svg","avif"].includes(d.value)),y=e.computed(()=>["mp4","webm","ogg"].includes(d.value)),x=e.computed(()=>({mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg"})[d.value]||"");function E(){s.value=!0}function I(o){u.value=`Ошибка загрузки медиа: ${o.message}`,s.value=!1}async function w(){if(a.value)try{a.value.paused&&!f&&(await a.value.play(),f=!0)}catch(o){I(o)}}function V(){const o={root:null,rootMargin:"50px",threshold:.1};i=new IntersectionObserver(n=>{n.forEach(r=>{var c;v.value=r.isIntersecting,r.isIntersecting&&(y.value&&((c=m.options)!=null&&c.autoplay)&&w(),i.disconnect())})},o);const l=g.value?p.value:a.value;l&&i.observe(l)}return e.onMounted(()=>{V()}),e.onUnmounted(()=>{i&&i.disconnect()}),(o,l)=>{var n,r,c,k,h,b,B;return e.openBlock(),e.createElementBlock("div",L,[g.value?(e.openBlock(),e.createElementBlock("img",e.mergeProps({key:0,src:v.value?t.url:"","data-src":t.url,alt:((n=t.options)==null?void 0:n.alt)||"Image",class:["media-item",{loading:!s.value}],loading:"lazy",onLoad:E},t.options,{ref_key:"imageElement",ref:p}),null,16,M)):y.value?(e.openBlock(),e.createElementBlock("video",e.mergeProps({key:1,ref_key:"videoElement",ref:a,class:[{loading:!s.value},"media-item"],controls:!((r=t.options)!=null&&r.hideControls),loop:((c=t.options)==null?void 0:c.loop)!==!1,muted:((k=t.options)==null?void 0:k.muted)!==!1,autoplay:(h=t.options)==null?void 0:h.autoplay,playsinline:((b=t.options)==null?void 0:b.playsinline)!==!1,preload:((B=t.options)==null?void 0:B.preload)||"metadata",onLoadeddata:E},t.options),[e.createElementVNode("source",{src:t.url,type:x.value},null,8,N)],16,j)):e.createCommentVNode("",!0),s.value?e.createCommentVNode("",!0):(e.openBlock(),e.createElementBlock("div",O," Загрузка... ")),u.value?(e.openBlock(),e.createElementBlock("div",P,e.toDisplayString(u.value),1)):e.createCommentVNode("",!0)])}}},q=C._export_sfc(S,[["__scopeId","data-v-94bcf726"]]);exports.default=q;