@ozdao/prometheus-framework 0.2.129 → 0.2.132

package/src/modules/users/components/pages/ProfileBlogposts.vue

@@ -1,15 +1,15 @@
 <template>
 	<div class="pd-thin">
 		<header class="mn-b-medium flex-v-center flex-nowrap flex">
-	      	<h2 class="mn-r-medium">Posts</h2>
-	      	<button 
-	      		v-if="auth.state.user._id === route.params._id"
-	      		@click="$router.push({
-	      			name: 'Create BlogPost'
-	      		})" 
-	      		class="radius-100 t-white t-semi i-big hover-scale-1 cursor-pointer t-white bg-second">
-	      			+
-	      	</button>
+    	<h2 class="mn-r-medium">Posts</h2>
+    	<button 
+    		v-if="auth.state.user._id === route.params._id"
+    		@click="$router.push({
+    			name: 'Create BlogPost'
+    		})" 
+    		class="radius-100 t-white t-semi i-big hover-scale-1 cursor-pointer t-white bg-second">
+    			+
+    	</button>
 		</header>
 
 		<Tab 
@@ -23,24 +23,37 @@
 			class="mn-b-small o-hidden h5 radius-big bg-light"
 		/>
 
-		<Feed 
-			v-if="tabOrganization === 'posts'"
-	  		:user="auth.state.user._id"
-			:creator="route.params._id"
-		/>
-
-		<Feed 
-			v-if="tabOrganization === 'drafts'"
-	  		:user="auth.state.user._id"
-			:creator="route.params._id"
-			:status="'draft'"
-		/>
-
-		<Feed 
-			v-if="tabOrganization === 'following'"
-	  		:user="auth.state.user._id"
-			:following="route.params._id"
-		/>
+		<Feed
+			:showLoadMore="false"
+			:states="{
+				empty: {
+					title: 'No Blog Posts Found',
+					description: 'Currently, there are no posts available in this blog. Please check back later.'
+				},
+			}"
+			:store="{
+				read: (options) => blog.read(options)
+			}"
+			:options="{
+				limit: 15,
+				category: route.params.category,
+				period: route.query.period,
+				status: tabOrganization === 'drafts' ? 'draft' : 'published',
+				user: auth.state.user._id,
+				creator: ['posts', 'drafts'].includes(tabOrganization) ? route.params._id : null,
+				following: tabOrganization === 'following' ? auth.state.user._id : null,
+			}"
+			v-slot="{ items }"
+			class="row-1 gap-thin"
+		>
+			<CardBlogpost 
+				v-for="item in items" 
+				:key="item._id" 
+				:blogpost="item" 
+				:user="auth.state.user._id" 
+				class="h-max-40r mn-b-medium"
+			/>
+		</Feed>
 	</div>
 </template>
 
@@ -49,9 +62,13 @@
 	import { useRoute, useRouter } from 'vue-router'
 	// Components
 	import Tab  		from '@pf/src/components/Tab/Tab.vue'
-	import Feed from '@pf/src/modules/community/components/sections/Feed.vue'; 
+
+	import Feed from '@pf/src/components/Feed/Feed.vue'
+
+  import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue';
 
 	import * as auth from '@pf/src/modules/auth/store/auth';
+  import * as blog from '@pf/src/modules/community/store/blogposts.js';
 	// Accessing router
 	const route = useRoute()
 	const router = useRouter()

package/src/modules/wallet/components/blocks/CardBalanceReplenished.vue

@@ -0,0 +1,40 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">{{ t('balanceReplenished') }}</h2>
+
+  <div class="radius-medium br-1px br-black br-solid pd-big flex flex-column flex-justify-center flex-items-center">
+    <h3 class="t-semi">
+      {{ t('youReceived') }}
+    </h3>
+    <h3 class="t-semi">
+      500 WDT
+    </h3>
+
+  </div>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="close"
+  >
+    {{ t('backToWallet') }}
+  </button>
+</template>
+
+<script setup>
+  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import { useI18n } from 'vue-i18n'
+
+  const emits = defineEmits(['close'])
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global', 
+    ...text
+  })
+
+  function close() {
+    emits("close")
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/components/blocks/CardDeposite.vue

@@ -0,0 +1,55 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">Deposit with card</h2>
+
+  <div class="bg-grey radius-big mn-t-semi mn-b-semi flex flex-justify-between">
+    <Field
+      :placeholder="t('enterAmount')"
+      class="pd-medium radius-small"
+    />
+
+    <div class="uppercase flex flex-justify-center flex-items-center mn-r-semi t-semi">
+      USD
+    </div>
+  </div>
+
+  <h3 class="t-semi">You will receieve: 0 WDT</h3>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="switchMenu(3)"
+  >
+    {{ t('pay') }}
+  </button>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="backSelection"
+  >
+    {{ t('backToSelection') }}
+  </button>
+</template>
+
+<script setup>
+  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import Field from '@pf/src/components/Field/Field.vue'
+  import { useI18n } from 'vue-i18n'
+
+  const emits = defineEmits(['back-selection', 'switch-menu'])
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global', 
+    ...text
+  })
+
+  function backSelection() {
+    emits("back-selection")
+  }
+
+  function switchMenu(screen = 0) {
+    emits("switch-menu", screen)
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/components/blocks/CashDeposite.vue

@@ -0,0 +1,28 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">Deposit with cash</h2>
+
+  <p class="t-transp t-center">
+    You need to go to casse to topup balance
+  </p>
+
+  <div
+    class="w-100 bg-grey radius-medium mn-t-medium mn-b-medium"
+    style="height: 152px"
+  />
+
+  <button
+      class="w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+      @click="backSelection">Back to selection
+  </button>
+</template>
+
+<script setup>
+  const emits = defineEmits(['back-selection'])
+
+  function backSelection() {
+    emits("back-selection");
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/components/blocks/CryptoDeposite.vue

@@ -0,0 +1,55 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">{{ t('depositeWithCrypto') }}</h2>
+
+  <div class="bg-grey radius-big mn-t-semi mn-b-semi flex flex-justify-between">
+    <Field
+      :placeholder="t('enterAmount')"
+      class="pd-medium radius-small"
+    />
+
+    <div class="uppercase flex flex-justify-center flex-items-center mn-r-semi t-semi">
+      POLY USDT
+    </div>
+  </div>
+
+  <h3 class="t-semi">You will receieve: 0 WDT</h3>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="switchMenu(3)"
+  >
+    {{ t('pay') }}
+  </button>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="backSelection"
+  >
+    {{ t('backToSelection') }}
+  </button>
+</template>
+
+<script setup>
+  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import Field from '@pf/src/components/Field/Field.vue'
+  import { useI18n } from 'vue-i18n'
+
+  const emits = defineEmits(['back-selection', 'switch-menu'])
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global', 
+    ...text
+  })
+
+  function backSelection() {
+    emits("back-selection")
+  }
+
+  function switchMenu(screen = 0) {
+    emits("switch-menu", screen)
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/controllers/factories/rewards.factory.aggr.js

@@ -0,0 +1,181 @@
+const ObjectId = require('mongoose').Types.ObjectId;
+const { BigNumber } = require('bignumber.js');
+
+const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
+
+const VIEWS_REWARD_COEFF = '0.1';
+const WDT_DECIMALS = 8;
+
+const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCount) => {
+
+  console.log('views',viewsCount)
+  console.log('reactions',reactionsCount)
+  console.log('comments',commentsCount)
+  
+  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));
+  }
+
+  return new BigNumber('10')
+    .plus(new BigNumber(viewsCount).multipliedBy(VIEWS_REWARD_COEFF))
+    .plus(reactionsCount)
+    .plus(commentsCount);
+};
+
+const rewardsControllerFactory = (db, wdmClient) => {
+  const Blogpost = db.blogpost;
+  const Reaction = db.reaction;
+  const Comment = db.comment;
+  const Reward = db.reward;
+
+
+
+  const listRewards = async (req, res) => {
+    try {
+      const aggregationResults = await Blogpost.aggregate([
+        // Соответствие блогпостов для данного пользователя
+        { $match: { "creator.target": new ObjectId(req.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", req.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 });
+    }
+  };
+
+  const collectTokens = async (req, res) => {
+    const blogs = await Blogpost.find({ "creator.target": req.userId }).exec();
+
+    let totalRewards = new BigNumber(0);
+
+    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 })
+        .sort({ createdAt: -1 })
+        .exec();
+
+      const reward = calculateRewardForPost(
+        previousReward?.snapshot,
+        blog.views,
+        reactions,
+        comments
+      );
+
+      if (reward.gt(0)) {
+        totalRewards = totalRewards.plus(reward);
+
+        const snapshot = {
+          views: previousReward ?
+            previousReward.snapshot.views < blog.views ? blog.views : previousReward.snapshot.views
+            : blog.views,
+          reactions: previousReward ?
+            previousReward.snapshot.reactions < reactions ? reactions : previousReward.snapshot.reactions
+            : reactions,
+          comments: previousReward ?
+            previousReward.snapshot.comments < comments ? comments : previousReward.snapshot.comments
+            : comments,
+        };
+
+        await Reward.create({
+          user: req.userId,
+          type: 'blogpost',
+          target: blog._id,
+          amount: reward.toString(),
+          snapshot: snapshot,
+        });
+      }
+    }
+
+    if (totalRewards.gt(0)) {
+      await wdmClient.transfer(
+        totalRewards.shiftedBy(WDT_DECIMALS).toString(),
+        req.body.recipient,
+        req.userId
+      );
+    }
+
+    res.status(200).send();
+  };
+
+  return { listRewards, collectTokens };
+};
+
+module.exports = rewardsControllerFactory;

package/src/modules/wallet/controllers/factories/rewards.factory.js

@@ -7,6 +7,9 @@ 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)
@@ -26,123 +29,94 @@ const rewardsControllerFactory = (db, wdmClient) => {
   const Comment = db.comment;
   const Reward = db.reward;
 
-  // const listRewards = async (req, res) => {
-  //   try {
-  //     const rewards = await Blogpost.aggregate([
-  //       // Шаг 1: Фильтрация блогпостов по создателю
-  //       { $match: { "creator.target": req.userId } },
-  //       // Шаг 2: Соединение с Reaction для подсчета реакций
-  //       {
-  //         $lookup: {
-  //           from: "reactions",
-  //           localField: "_id",
-  //           foreignField: "target",
-  //           as: "reactions"
-  //         }
-  //       },
-  //       // Шаг 3: Соединение с Comment для подсчета комментариев
-  //       {
-  //         $lookup: {
-  //           from: "comments",
-  //           localField: "_id",
-  //           foreignField: "target",
-  //           as: "comments"
-  //         }
-  //       },
-  //       // Шаг 4: Соединение с Reward для получения предыдущих наград
-  //       {
-  //         $lookup: {
-  //           from: "rewards",
-  //           let: { blogId: "$_id", userId: req.userId },
-  //           pipeline: [
-  //             { $match: { 
-  //                 $expr: { 
-  //                   $and: [
-  //                     { $eq: ["$user", "$$userId"] },
-  //                     { $eq: ["$type", "blogpost"] },
-  //                     { $eq: ["$target", "$$blogId"] }
-  //                   ] 
-  //                 } 
-  //               } 
-  //             },
-  //             { $sort: { createdAt: -1 } },
-  //             { $limit: 1 }
-  //           ],
-  //           as: "previousReward"
-  //         }
-  //       },
-  //       // Шаг 5: Проецирование результата и преобразование массивов в счетчики
-  //       {
-  //         $project: {
-  //           user: req.userId,
-  //           type: 'blogpost',
-  //           name: "$name",
-  //           content: "$content",
-  //           url: "$url",
-  //           views: "$views",
-  //           reactionsCount: { $size: "$reactions" },
-  //           commentsCount: { $size: "$comments" },
-  //           previousRewardSnapshot: { $arrayElemAt: ["$previousReward.snapshot", 0] },
-  //         }
-  //       }
-  //     ]).exec();
-
-  //     // Пересчет наград на основе полученных данных
-  //     const calculatedRewards = rewards.map(reward => ({
-  //       ...reward,
-  //       amount: calculateRewardForPost(
-  //         reward.previousRewardSnapshot,
-  //         reward.views,
-  //         reward.reactionsCount,
-  //         reward.commentsCount
-  //       ).toString(),
-  //     }));
-
-  //     res.status(200).send(calculatedRewards);
-  //   } catch (error) {
-  //     console.error("Error listing rewards:", error);
-  //     res.status(500).send({ message: "Internal server error" });
-  //   }
-  // };
-
-  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 listRewards = async (req, res) => {
 
-      // console.log(rewards)
+    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) => {