@ozdao/prometheus-framework 0.2.130 → 0.2.132

package/dist/wallet.server.mjs

@@ -8,7 +8,7 @@ import { t as tickets_controller } from "./tickets.controller-ByZ33N6_.mjs";
 import require$$1 from "stripe";
 import require$$0 from "mongoose";
 import require$$1$1 from "bignumber.js";
-import "./queryProcessor-g8208K6g.mjs";
+import "./queryProcessor-DQSFR9YA.mjs";
 var wallet_model = (db) => {
   const WalletSchema = new db.mongoose.Schema(
     {
@@ -316,11 +316,12 @@ var payments_routes = function(app, db, origins, publicPath) {
     controller.delete
   );
 };
-require$$0.Types.ObjectId;
+const ObjectId = require$$0.Types.ObjectId;
 const { BigNumber } = require$$1$1;
 const VIEWS_REWARD_COEFF = "0.1";
 const WDT_DECIMALS = 8;
 const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCount) => {
+  console.log("snapshot", snapshot);
   if (snapshot) {
     return new BigNumber(Math.max(viewsCount - snapshot.views, 0)).multipliedBy(VIEWS_REWARD_COEFF).plus(Math.max(reactionsCount - snapshot.reactions, 0)).plus(Math.max(commentsCount - snapshot.comments, 0));
   }
@@ -332,32 +333,84 @@ const rewardsControllerFactory$1 = (db, wdmClient) => {
   const Comment = db.comment;
   const Reward = db.reward;
   const listRewards = async (req, res) => {
-    const blogs = await Blogpost.find({ "creator.target": req.userId }).exec();
-    const rewards = [];
-    for (const blog of blogs) {
-      const reactions = await Reaction.countDocuments({ target: { $in: blog._id } }).exec();
-      const comments = await Comment.countDocuments({ target: { $in: blog._id } }).exec();
-      const previousReward = await Reward.findOne({ user: req.userId, type: "blogpost", target: blog._id }).populate({
-        path: "target",
-        model: "Blogpost"
-        // Убедитесь, что 'Blogpost' соответствует имени вашей модели блогпоста
-      }).sort({ createdAt: -1 }).exec();
-      const reward = calculateRewardForPost(
-        previousReward?.snapshot,
-        blog.views,
-        reactions,
-        comments
-      );
-      rewards.push({
-        user: req.userId,
-        type: "blogpost",
-        amount: reward.toString(),
-        name: blog.name,
-        content: blog.content,
-        url: blog.url
-      });
+    const userId = new ObjectId(req.userId);
+    try {
+      const aggregationResults = await Blogpost.aggregate([
+        // Соответствие блогпостов для данного пользователя
+        { $match: { "creator.target": userId } },
+        // Добавление информации о реакциях и комментариях
+        {
+          $lookup: {
+            from: "reactions",
+            localField: "_id",
+            foreignField: "target",
+            as: "reactions"
+          }
+        },
+        {
+          $lookup: {
+            from: "comments",
+            localField: "_id",
+            foreignField: "target",
+            as: "comments"
+          }
+        },
+        // Добавление информации о предыдущей награде
+        {
+          $lookup: {
+            from: "rewards",
+            let: { blogId: "$_id" },
+            pipeline: [
+              {
+                $match: {
+                  $expr: {
+                    $and: [
+                      { $eq: ["$user", userId] },
+                      { $eq: ["$type", "blogpost"] },
+                      { $eq: ["$target", "$$blogId"] }
+                    ]
+                  }
+                }
+              },
+              { $sort: { createdAt: -1 } },
+              { $limit: 1 }
+            ],
+            as: "previousReward"
+          }
+        },
+        // Преобразование результатов
+        {
+          $project: {
+            _id: 1,
+            user: req.userId,
+            type: "blogpost",
+            views: 1,
+            reactionsCount: { $size: "$reactions" },
+            commentsCount: { $size: "$comments" },
+            previousReward: { $arrayElemAt: ["$previousReward", 0] },
+            name: 1,
+            content: 1,
+            url: 1
+          }
+        }
+      ]);
+      const rewards = aggregationResults.map((result) => ({
+        user: result.user,
+        type: result.type,
+        amount: calculateRewardForPost(
+          result.previousReward?.snapshot,
+          result.views,
+          result.reactionsCount,
+          result.commentsCount
+        ),
+        name: result.name,
+        content: result.content,
+        url: result.url
+      }));
+      res.status(200).send(rewards);
+    } catch (error) {
+      res.status(500).send({ message: "Произошла ошибка при получении наград", error: error.message });
     }
-    res.status(200).send(rewards);
   };
   const collectTokens = async (req, res) => {
     const blogs = await Blogpost.find({ "creator.target": req.userId }).exec();

package/dist/web-DZUec7pP.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./main-CI9l9xMs.js");class p extends c.WebPlugin{constructor(){super(...arguments),this.group="CapacitorStorage"}async configure({group:e}){typeof e=="string"&&(this.group=e)}async get(e){return{value:this.impl.getItem(this.applyPrefix(e.key))}}async set(e){this.impl.setItem(this.applyPrefix(e.key),e.value)}async remove(e){this.impl.removeItem(this.applyPrefix(e.key))}async keys(){return{keys:this.rawKeys().map(t=>t.substring(this.prefix.length))}}async clear(){for(const e of this.rawKeys())this.impl.removeItem(e)}async migrate(){var e;const t=[],s=[],n="_cap_",o=Object.keys(this.impl).filter(i=>i.indexOf(n)===0);for(const i of o){const r=i.substring(n.length),a=(e=this.impl.getItem(i))!==null&&e!==void 0?e:"",{value:l}=await this.get({key:r});typeof l=="string"?s.push(r):(await this.set({key:r,value:a}),t.push(r))}return{migrated:t,existing:s}}async removeOld(){const e="_cap_",t=Object.keys(this.impl).filter(s=>s.indexOf(e)===0);for(const s of t)this.impl.removeItem(s)}get impl(){return window.localStorage}get prefix(){return this.group==="NativeStorage"?"":`${this.group}.`}rawKeys(){return Object.keys(this.impl).filter(e=>e.indexOf(this.prefix)===0)}applyPrefix(e){return this.prefix+e}}exports.PreferencesWeb=p;

package/dist/web-krQQeSb6.mjs

@@ -0,0 +1,54 @@
+import { W as p } from "./main-DPg58GOU.mjs";
+class f extends p {
+  constructor() {
+    super(...arguments), this.group = "CapacitorStorage";
+  }
+  async configure({ group: e }) {
+    typeof e == "string" && (this.group = e);
+  }
+  async get(e) {
+    return { value: this.impl.getItem(this.applyPrefix(e.key)) };
+  }
+  async set(e) {
+    this.impl.setItem(this.applyPrefix(e.key), e.value);
+  }
+  async remove(e) {
+    this.impl.removeItem(this.applyPrefix(e.key));
+  }
+  async keys() {
+    return { keys: this.rawKeys().map((t) => t.substring(this.prefix.length)) };
+  }
+  async clear() {
+    for (const e of this.rawKeys())
+      this.impl.removeItem(e);
+  }
+  async migrate() {
+    var e;
+    const t = [], s = [], n = "_cap_", o = Object.keys(this.impl).filter((i) => i.indexOf(n) === 0);
+    for (const i of o) {
+      const r = i.substring(n.length), a = (e = this.impl.getItem(i)) !== null && e !== void 0 ? e : "", { value: l } = await this.get({ key: r });
+      typeof l == "string" ? s.push(r) : (await this.set({ key: r, value: a }), t.push(r));
+    }
+    return { migrated: t, existing: s };
+  }
+  async removeOld() {
+    const e = "_cap_", t = Object.keys(this.impl).filter((s) => s.indexOf(e) === 0);
+    for (const s of t)
+      this.impl.removeItem(s);
+  }
+  get impl() {
+    return window.localStorage;
+  }
+  get prefix() {
+    return this.group === "NativeStorage" ? "" : `${this.group}.`;
+  }
+  rawKeys() {
+    return Object.keys(this.impl).filter((e) => e.indexOf(this.prefix) === 0);
+  }
+  applyPrefix(e) {
+    return this.prefix + e;
+  }
+}
+export {
+  f as PreferencesWeb
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.130",
+  "version": "0.2.132",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Address/Address.vue

@@ -27,7 +27,7 @@
   </div>
 </template>
 
-<style scoped>
+<style>
 .pac-container {
   position: absolute;
   background-color: white;

package/src/components/Chips/Chips.vue

@@ -26,7 +26,7 @@ import { ref, defineProps } from 'vue';
 const props = defineProps(['chips']);
 </script>
 
-<style scoped>
+<style>
 	.t-trimmed {
 		font-size: 0;
 	}

package/src/components/Completion/Completion.vue

@@ -70,7 +70,4 @@ const calculateCompletion = (profileObject) => {
 
 
 if (target) completionPercentage.value = calculateCompletion(target)
-</script>
-
-<style scoped>
-</style>
+</script>

package/src/components/DatePicker/Calendar.vue

@@ -267,7 +267,7 @@ const selectLastYear = () => {
 </script>
 
 
-<style scoped>
+<style >
 .calendar__week {
   display: grid;
   grid-template-columns: repeat(7, 1fr);

package/src/components/Draggable/Draggable.vue

@@ -0,0 +1,113 @@
+<template>
+  <div ref="container" class="draggable-container">
+    <slot></slot>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+
+const props = defineProps({
+  list: {
+    type: Array,
+    required: true,
+  },
+  disabledClass: {
+    type: String,
+    default: 'draggable-disabled',
+  },
+});
+
+const emit = defineEmits(['update:list', 'start', 'end']);
+const container = ref(null);
+
+let dragStartIndex = null;
+
+onMounted(() => {
+  const handleDragStart = (e) => {
+    const target = e.target.closest('.draggable-item');
+    if (!target || target.classList.contains(props.disabledClass)) {
+      e.preventDefault();
+      return;
+    }
+    dragStartIndex = Number(target.dataset.index);
+    e.dataTransfer.effectAllowed = 'move';
+    emit('start', dragStartIndex);
+  };
+
+  const handleDragOver = (e) => {
+    e.preventDefault();
+  };
+
+  const handleDrop = (e) => {
+    e.preventDefault();
+    const target = e.target.closest('.draggable-item');
+    if (!target || target.classList.contains(props.disabledClass)) {
+      return;
+    }
+    const dragEndIndex = Number(target.dataset.index);
+    if (dragStartIndex !== dragEndIndex && !isInvalidMove(dragStartIndex, dragEndIndex)) {
+      const updatedList = [...props.list];
+      const [removed] = updatedList.splice(dragStartIndex, 1);
+      updatedList.splice(dragEndIndex, 0, removed);
+      emit('update:list', updatedList);
+    }
+    emit('end', dragStartIndex, dragEndIndex);
+    dragStartIndex = null;
+  };
+
+  const handleTouchStart = (e) => {
+    const target = e.target.closest('.draggable-item');
+    if (!target || target.classList.contains(props.disabledClass)) {
+      e.preventDefault();
+      return;
+    }
+    dragStartIndex = Number(target.dataset.index);
+    emit('start', dragStartIndex);
+  };
+
+  const handleTouchMove = (e) => {
+    e.preventDefault();
+  };
+
+  const handleTouchEnd = (e) => {
+    const target = document.elementFromPoint(
+      e.changedTouches[0].clientX,
+      e.changedTouches[0].clientY
+    ).closest('.draggable-item');
+    if (!target || target.classList.contains(props.disabledClass)) {
+      return;
+    }
+    const dragEndIndex = Number(target.dataset.index);
+    if (dragStartIndex !== dragEndIndex && !isInvalidMove(dragStartIndex, dragEndIndex)) {
+      const updatedList = [...props.list];
+      const [removed] = updatedList.splice(dragStartIndex, 1);
+      updatedList.splice(dragEndIndex, 0, removed);
+      emit('update:list', updatedList);
+    }
+    emit('end', dragStartIndex, dragEndIndex);
+    dragStartIndex = null;
+  };
+
+  const isInvalidMove = (start, end) => {
+    const disabledIndices = Array.from(container.value.children)
+      .map((child, index) => (child.classList.contains(props.disabledClass) ? index : null))
+      .filter(index => index !== null);
+    return disabledIndices.includes(end);
+  };
+
+  container.value.addEventListener('dragstart', handleDragStart);
+  container.value.addEventListener('dragover', handleDragOver);
+  container.value.addEventListener('drop', handleDrop);
+  container.value.addEventListener('touchstart', handleTouchStart);
+  container.value.addEventListener('touchmove', handleTouchMove);
+  container.value.addEventListener('touchend', handleTouchEnd);
+});
+</script>
+
+<style>
+.draggable-container {
+  display: flex;
+  flex-direction: column;
+}
+</style>

package/src/components/Dropdown/Dropdown.vue

@@ -43,7 +43,7 @@ function clickedOutside () {
 }
 </script>
 
-<style scoped>
+<style >
 .dropdown-content {
   display: block;
   position: absolute;

package/src/components/Feed/Feed.vue

@@ -1,6 +1,6 @@
 <template>
 
-  <div v-if="search || date || sort" class="flex-nowrap flex gap-thin mn-b-thin">
+  <div v-if="search || date || (sort && !sort.hideButton)" class="flex-nowrap flex gap-thin">
 
     <BlockSearch 
       v-if="search"
@@ -12,7 +12,10 @@
     <template
       v-if="filter"
     >
-      <div class="flex-center flex pd-thin bg-light radius-extra aspect-1x1 h-100">
+      <div 
+        :class="filter.class || 'bg-light'"
+        class="flex-center flex pd-thin bg-light radius-extra aspect-1x1 h-100"
+      >
         <IconFilter @click="() => filter.active = !filter.active" class="w-1r h-auto"/>
       </div>
 
@@ -55,7 +58,7 @@
     </Dropdown> 
 
     <Dropdown 
-      v-if="sort"
+      v-if="sort && !sort.hideButton"
       :label="{
         component: ButtonSort,
         props: { order: sort.order },
@@ -76,21 +79,23 @@
   </div>
 
   <TransitionGroup 
-    v-if="isLoading" 
+
+    v-if="isLoading"
     tag="ul" 
     name="scaleTransition" 
-    class="o-hidden bg-light radius-big"
-   :class="$attrs.class"
   >
     <SkeletonEvent
       v-if="isLoading"
       v-for="i in currentLimit" 
       :key="'skeleton-' + i"
+      class="mn-b-small radius-big o-hidden d-block"
     />
   </TransitionGroup>
 
-  <transition 
-    name="scaleTransition"
+  <TransitionGroup 
+    tag="ul" 
+    v-if="!isLoading && itemsList.length < 1"
+    name="feed"
   >
     <EmptyState
       v-if="!isLoading && itemsList.length < 1"
@@ -100,7 +105,7 @@
       :callback="states.empty.callback"
       class="pd-medium mn-b-thin bg-light radius-big"
     />
-  </transition>
+   </TransitionGroup>
 
   <TransitionGroup 
     tag="ul" 
@@ -297,7 +302,7 @@ watch(() => sort.value?.order, (newVal, oldVal) => {
      currentSkip.value = 0
     fetchItems();
   }
-}, { deep: true });
+});
 
 watch(() => sort.value?.param, (newVal, oldVal) => {
 
@@ -305,7 +310,7 @@ watch(() => sort.value?.param, (newVal, oldVal) => {
      currentSkip.value = 0
     fetchItems();
   }
-}, { deep: true });
+});
 
 
 watch(() => props.options, (newVal, oldVal) => {
@@ -318,7 +323,8 @@ watch(() => props.options, (newVal, oldVal) => {
     newVal.status !== oldVal.status ||
     newVal.hidden !== oldVal.hidden ||
     newVal.type !== oldVal.type ||
-    newVal.tags !== oldVal.tags
+    newVal.tags !== oldVal.tags || 
+    newVal.following !== oldVal.following
   ) {
     currentSkip.value = 0
     fetchItems();

package/src/components/FieldBig/FieldBig.vue

@@ -9,13 +9,23 @@
       @blur="checkInput"
       class="w-100 p-medium t-regular uppercase pd-small"
     />
-    <button v-if="action" @click="emitAction" class="t-nowrap t-medium radius-big uppercase cursor-pointer pd-l-semi pd-r-semi w-max hover-bg-fifth t-semi transition-linear transition-timing-1 t-black bg-main" v-html="action"/>
+    <button
+      v-if="action" 
+      @click="emitAction" 
+      class="t-nowrap t-medium radius-big uppercase cursor-pointer flex flex-v-center pd-r-small pd-l-small w-max hover-bg-fifth t-semi transition-linear transition-timing-1 t-black bg-main" 
+    >
+      <span>{{action}}</span>
+      <IconArrow class="mn-l-thin radius-extra bg-white i-medium"/>
+    
+  
+    </button>
   </div>
 </template>
 
 <script setup="props">
   import { ref, watchEffect, onMounted } from 'vue'
   import Field from '@pf/src/components/Field/Field.vue'
+  import IconArrow from '@pf/src/modules/icons/navigation/IconArrow.vue'
   import { useI18n } from 'vue-i18n'
 
   const props = defineProps({

package/src/components/FieldPhone/FieldPhone.vue

@@ -608,7 +608,7 @@
   }
 </script>
 
-<style scoped>
+<style lang="scss">
   .vue3-reactive-tel-input{
     display:flex
   }

package/src/components/FieldTags/FieldTags.vue

@@ -190,4 +190,5 @@
 
 <!-- js and scss resources → I separated it into different files, because they became huge -->
 <script src="./vue-tags-input.js"></script>
-<style lang="scss" src="./vue-tags-input.scss" scoped></style>
+
+<style lang="scss" src="./vue-tags-input.scss" ></style>

package/src/components/FieldTags/tag-input.vue

@@ -27,7 +27,7 @@ export default {
 
 </script>
 
-<style lang="css" scoped>
+<style lang="css" >
 .ti-tag-input {
   background-color: transparent;
   color: inherit;

package/src/components/LocationMarker/LocationMarker.vue

@@ -154,7 +154,7 @@ async function setUserLocation() {
 </script>
 
 
-<style scoped>
+<style >
 .my-location-button {
   position: absolute;
   right: 10px;

package/src/components/PhotoViewer/PhotoViewer.vue

@@ -96,7 +96,7 @@ const initialize = () => {
 };
 </script>
 
-<style scoped>
+<style>
 .photo-container {
   width: 100%;
   height: 100%;

package/src/components/Shader/Shader.vue

@@ -165,8 +165,8 @@
   });
 </script>
 
-<style scoped>
-  canvas {
+<style >
+  #glcanvas {
     width: 100%;
     height: 100%;
   }

package/src/components/Slider/Slider.vue

@@ -14,11 +14,7 @@
   </div>
 </template>
 
-<style scoped>
-
-</style>
-
-<script setup scoped>
+<script setup >
 import { ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'

package/src/components/Spoiler/Spoiler.vue

@@ -5,7 +5,7 @@
     </div>
 
     <transition name="collapse">
-      <div v-if="showSpoiler" class="spoiler">
+      <div v-show="showSpoiler" class="spoiler">
         <slot name="content"></slot>
       </div>
     </transition>

package/src/components/Text/Text.vue

@@ -38,7 +38,4 @@ const isTruncated = computed(() => props.text.length > props.maxLen);
 // Вычисляем текст для кнопки "Показать больше/Скрыть"
 const showMoreText = computed(() => showFull.value ? 'Hide' : 'Show more');
 
-</script>
-
-<style scoped>
-</style>
+</script>

package/src/components/Tooltip/Tooltip.vue

@@ -44,7 +44,7 @@ function hideTooltip() {
 }
 </script>
 
-<style scoped>
+<style >
 .tooltip-container {
   position: relative;
   display: inline-block;

package/src/components/Upload/Upload.vue

@@ -48,7 +48,10 @@ const emit = defineEmits(['update:field', 'focus', 'blur', 'file-change']);
 const props = defineProps({
   field: String,
   label: null,
-  type: 'file',
+  type: {
+    type: String,
+    default: 'file'
+  },
   placeholder: 'Upload a file',
   validation: false,
   uploadPath: {
@@ -80,13 +83,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(props.uploadPath)}`, formData, {
+    let response = await $axios.post(`/api/upload/${props.type}?folderName=${encodeURIComponent(props.uploadPath)}`, formData, {
       headers: {
         "Content-Type": "multipart/form-data"
       }
     });
 
-    console.log(response.data)
     fileURL.value = response.data[0].filepath;
     emit('file-change', fileURL.value);
   } catch (error) {

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

@@ -241,8 +241,6 @@ const controllerFactory = (db) => {
 
         const defaultAccesses = new Department
 
-        console.log(defaultAccesses)
-
         const accessData = isOwner ? defaultAccesses.accesses : (depts.find(dept => dept.organization.toString() === orgId) || {}).accesses;
        
         Object.keys(accessData).forEach(key => {

package/src/modules/auth/store/auth.js

@@ -231,7 +231,7 @@
   // Cookies
   const optionsDefault = {
     development: { secure: false, expires: 7, sameSite: 'Lax'  },
-    production: { expires: 7, path: '/', domain: process.env.API_URL, sameSite: 'none', secure: true }
+    production: { expires: 7, path: '/', domain: process.env.DOMAIN_URL, sameSite: 'none', secure: true }
   };
 
   async function getCookie(name) {
@@ -263,7 +263,7 @@
       Preferences.remove({ key: name });
     } else {
       // Для веб-версии
-      const options = env === 'production' ? { domain: process.env.API_URL } : {};
+      const options = env === 'production' ? { domain: process.env.DOMAIN_URL } : {};
       Cookies.remove(name, options);
     }
   }

package/src/modules/community/DOCUMENTATION.MD

@@ -0,0 +1,4 @@
+# Дефолтное состояние
+Дефолтное состояние определяется через query указанное в роуте, которое передается в стор модуля. Механизм считывания query находится в lifecycle onMounted компонента Blog.vue. Если query нет, то он берет дефолтное значение из стора. Period и tags назначаются на null и [] в lifecycle onMounted компонента Blog.vue.
+
+Для блока с периодом (Topic for $period) используется route.query.period, если он не указан - то Period назначаются на null в lifecycle onMounted компонента Blog.vue

package/src/modules/community/community.client.js

@@ -6,7 +6,6 @@ import Blog from './components/pages/Blog.vue';
 import FooterBlogpost from './components/blocks/FooterBlogpost.vue';
 import Activity from './components/blocks/Activity.vue';
 import CardBlogpost from './components/blocks/CardBlogpost.vue';
-import Feed from './components/sections/Feed.vue';
 import JoinUs from './components/sections/JoinUs.vue';
 import Comments from './components/sections/Comments.vue';
 import HotPosts from './components/sections/HotPosts.vue';
@@ -28,7 +27,6 @@ export {
   FooterBlogpost,
   Activity,
   CardBlogpost,
-  Feed,
   JoinUs,
   Comments,
   HotPosts,