@ozdao/prometheus-framework 0.2.129 → 0.2.132

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

@@ -0,0 +1,213 @@
+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 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 
+      });
+
+      // console.log(rewards)
+    }
+
+    res.status(200).send(rewards);
+  };
+
+  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/localization/Wallet.json

@@ -0,0 +1,22 @@
+{
+  "messages": {
+    "en-default": {
+      "pay": "pay",
+      "youReceived": "you received",
+      "enterAmount": "enter amount to top up",
+      "backToWallet": "back to wallet",
+      "backToSelection": "back to selection",
+      "balanceReplenished": "balance replenished",
+      "depositeWithCrypto": "deposite with crypto"
+    },
+    "ru-default": {
+      "pay": "купить",
+      "youReceived": "вы пополнили на сумму",
+      "enterAmount": "введите сумму для пополнения",
+      "backToWallet": "назад к кошельку",
+      "backToSelection": "назад к списку",
+      "balanceReplenished": "баланс пополнен",
+      "depositeWithCrypto": "пополнение криптовалютой"
+    }
+  }
+}

package/src/modules/wallet/views/components/pages/Wallet.vue

@@ -10,76 +10,75 @@
 
       <div 
         v-if="state.account"
-        class="gap-thin flex-nowrap bg-black radius-extra t-white br-solid br-white-transp-10 br-1px flex-v-center flex pd-medium"
+        class="gap-thin mn-b-thin flex-nowrap bg-black radius-extra t-white br-solid br-white-transp-10 br-1px flex-v-center flex pd-medium"
       >
         <div class="flex-v-center flex-nowrap flex mn-r-auto">
           <!-- <img src="/logo/wdt.svg" class="mn-r-thin i-big"> -->
           <h2>{{state.tokenBalance}} WDT</h2>
         </div>
 
-        <button class="w-max bg-main t-medium button">Get More</button>
+        <button @click="openGetMorePopup" class="w-max bg-main t-medium button">Get More</button>
         <button class="w-max bg-white t-black t-medium button" @click="actions.collectRewards">Withdraw</button>
       </div>
 
-    </section>
-
-       <div v-if="!state.account" class="mn-b-semi cols-2 gap-thin">
-          <div
-            class="w-100 pd-medium radius-medium t-center bg-light"
-          >
-            <h3 class="mn-b-small">Make first order and start earning Weeder Token</h3>
-            <button class="mn-l-auto mn-r-auto bg-main button">Explore marketplace</button>
-          </div>
+      <div
+        v-if="state.account"
+        class="w-100 mn-b-semi flex-column flex pd-big radius-big bg-main t-black"
+      >
+        <p class="t-transp t-medium mn-b-thin">You own:</p>
+        <p class="h1 mn-b-small">{{state.share}}%</p>
+        <p class="t-white p-big t-medium mn-b-semi">of all shares</p>
 
           <div
-            class="w-100 pd-medium flex-center flex flex-column radius-medium t-center bg-light"
+            class="flex-v-center mn-b-small flex-nowrap flex pd-small bg-black-transp-5 radius-extra"
           >
-            <h3 
-              v-if="!state.account"
-              class="mn-b-small"
-            >
-              Connect Metamask to withdrawal your earnings.
-            </h3>
+              <!-- <img src="@/assets/icons/metamask.svg" class="mn-r-small i-big" > -->
+            
+            <p v-if="state.account" class="t-transp t-medium ">
+               <span class="uppercase p-small t-medium t-transp">Connected Metamask</span><br>
+               <span>{{state.account}}</span>
+            </p>
 
             <button
-              v-if="!state.account"
-              @click="actions.connectWallet"
-              class="br-solid br-2px br-black-transp-10 t-black button"
+              v-if="state.account"
+              @click="actions.disconnectWallet"
+              class="mn-l-auto bg-red button"
             >
-              Connect Wallet
+              Disconnect Wallet
             </button>
           </div>
-        </div>
+      </div>
+
+    </section>
 
-        <div
-          v-if="state.account"
-          class="w-100 mn-b-semi flex-column flex pd-big radius-big bg-main t-black"
+    <div v-if="!state.account" class="mn-b-semi cols-2 gap-thin">
+      <div
+        class="w-100 pd-medium radius-medium t-center bg-light"
+      >
+        <h3 class="mn-b-small">Make first order and start earning Weeder Token</h3>
+        <button class="mn-l-auto mn-r-auto bg-main button">Explore marketplace</button>
+      </div>
+
+      <div
+        class="w-100 pd-medium flex-center flex flex-column radius-medium t-center bg-light"
+      >
+        <h3 
+          v-if="!state.account"
+          class="mn-b-small"
         >
-          <p class="t-transp t-medium mn-b-thin">You own:</p>
-          <p class="h1 mn-b-small">{{state.share}}%</p>
-          <p class="t-white p-big t-medium mn-b-semi">of all shares</p>
+          Connect Metamask to withdrawal your earnings.
+        </h3>
+
+        <button
+          v-if="!state.account"
+          @click="actions.connectWallet"
+          class="br-solid br-2px br-black-transp-10 t-black button"
+        >
+          Connect Wallet
+        </button>
+      </div>
+    </div>
 
-            <div
-              class="flex-v-center mn-b-small flex-nowrap flex pd-small bg-black-transp-5 radius-extra"
-            >
-                <!-- <img src="@/assets/icons/metamask.svg" class="mn-r-small i-big" > -->
-              
-              <p v-if="state.account" class="t-transp t-medium ">
-                 <span class="uppercase p-small t-medium t-transp">Connected Metamask</span><br>
-                 <span>{{state.account}}</span>
-              </p>
-
-              <button
-                v-if="state.account"
-                @click="actions.disconnectWallet"
-                class="mn-l-auto bg-red button"
-              >
-                Disconnect Wallet
-              </button>
-            </div>
-
-         
-        </div>
     <h2 class="mn-b-small" v-if="state.rewards.length > 0">Latest Rewards </h2>
 
     <section class="cols-3 gap-thin">
@@ -103,15 +102,98 @@
 
 
     </section>
+
+    <h2 class="mn-b-small" v-if="state.rewards.length > 0">Activity</h2>
+
+    <section class="cols-3 gap-thin">
+      <div 
+        class="radius-medium bg-grey"
+        v-for="income in state.rewards"
+      > 
+        <div class="flex-nowrap br-b br-black-transp-10 br-solid flex pd-medium">
+          <!-- <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi"> -->
+          <p class="t-semi mn-r-auto">{{income.amount}} WDT</p>
+          
+          <span class="pd-t-nano pd-b-nano pd-l-thin pd-r-thin bg-main flex flex-center radius-extra t-semi p-small">{{income.type === 'blogpost' ? 'Community Reward' : income.type}}</span>
+        </div>
+
+        <div class="pd-medium">
+          <h4 class="t-regular mn-b-thin">{{income.name}}</h4>
+          <!-- <p class="p-small">{{income.content[0].content}}</p> -->
+        </div>
+      </div>
+    </section>
   </section>
+
+  <Popup 
+    title="Добавить участника" 
+    @close-popup="closeGetMorePopup" 
+    :isPopupOpen="isGetMorePopup"
+    class="w-m-33r t-left pd-big bg-white radius-big"
+  >
+    <div
+      v-if="currentMenuPopup === 0"
+    >
+      <h2 class="mn-b-small t-center t-bold">Choose the way of deposit</h2>
+
+      <button
+        class="w-100 bg-white t-black pd-thin radius-medium h3 t-center br-solid br-2px br-black-transp-10 mn-t-small"
+        @click="switchGetMoreMenu(1)"
+      >
+        CASH
+      </button>
+
+      <button
+        class="w-100 bg-white t-black pd-thin radius-medium h3 t-center br-solid br-2px br-black-transp-10 mn-t-small"
+        @click="switchGetMoreMenu(2)"
+      >
+        CARD
+      </button>
+
+      <button
+        class="w-100 bg-white t-black pd-thin radius-medium h3 t-center br-solid br-2px br-black-transp-10 mn-t-small"
+        @click="switchGetMoreMenu(4)"
+      >
+        CRYPTO
+      </button>
+    </div>
+
+    <CashDepositeMenu
+      v-if="currentMenuPopup === 1"
+      @back-selection="switchGetMoreMenu(0)"
+    />
+
+    <CardDepositeMenu
+      v-if="currentMenuPopup === 2"
+      @back-selection="switchGetMoreMenu(0)"
+      @switch-menu="switchGetMoreMenu"
+    />
+
+    <CardBalanceReplenished
+      v-if="currentMenuPopup === 3"
+      @close="closeGetMorePopup"
+    />
+
+    <CryptoDepositeMenu
+      v-if="currentMenuPopup === 4"
+      @back-selection="switchGetMoreMenu(0)"
+      @switch-menu="switchGetMoreMenu"
+    />
+  </Popup>
 </template>
 
 <script setup>
-  import { onMounted } from 'vue';
+  import { onMounted, ref } from 'vue';
   import { state, actions } from '@pf/src/modules/wallet/views/store/wallet.store';
+
   import Web3 from "web3";
 
-  import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue';
+  import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue'
+  import Popup    from '@pf/src/components/Popup/Popup.vue'
+  import CashDepositeMenu from '@pf/src/modules/wallet/components/blocks/CashDeposite.vue'
+  import CardDepositeMenu from '@pf/src/modules/wallet/components/blocks/CardDeposite.vue'
+  import CryptoDepositeMenu from '@pf/src/modules/wallet/components/blocks/CryptoDeposite.vue'
+  import CardBalanceReplenished from '@pf/src/modules/wallet/components/blocks/CardBalanceReplenished.vue'
 
   // User has disconnected metamask from extension
   window.ethereum.on('accountsChanged', (accounts) => {
@@ -128,4 +210,22 @@
     actions.listRewards();
     actions.tryReconnectWallet();
   });
-</script>
+
+  // /////////////////////////////////////////
+  // GetMore Popup
+  // /////////////////////////////////////////
+  const isGetMorePopup = ref(false)
+  const currentMenuPopup = ref(0)
+
+  function switchGetMoreMenu(value) {
+    currentMenuPopup.value = value;
+  }
+
+  function openGetMorePopup() {
+    isGetMorePopup.value = true;
+  }
+  function closeGetMorePopup() {
+    isGetMorePopup.value = false;
+    currentMenuPopup.value = 0;
+  }
+</script>

package/src/styles/base/all.scss

@@ -167,32 +167,31 @@ body {
 	.d-flex 				{display: flex; }
 	.d-block 				{display: block; }
 	.d-inline-block {display: inline-block; }
+	.d-inline-flex 	{display: inline-flex; }	
 	.d-grid 				{display: grid; }	
 	// Flex
 	.flex {
 		display: flex;
 		&-row 						{ flex-direction: row; }
 		&-column 					{ flex-direction: column; }
-		&-h-center 				{ justify-content: center; }
-		&-v-center 				{ align-items: center; }
-		&-center 					{ align-items: center; justify-content: center; }
-		&-stretch 				{ align-items: stretch }
 		&-nowrap 					{ flex-wrap: nowrap; } 
-		&-wrap 						{ flex-wrap: wrap; }
-		&-justify-start 	{ justify-content: flex-start; }
-    &-justify-center	{ justify-content: center; }
-    &-justify-end 		{ justify-content: flex-end; }
-    &-justify-between { justify-content: space-between; }
-    &-justify-around 	{ justify-content: space-around; }
-    &-items-start 		{ align-items: flex-start; }
-    &-items-center 		{ align-items: center; }
-    &-items-end 			{ align-items: flex-end; }
-    &-items-stretch 	{ align-items: stretch; }
-    &-items-baseline 	{ align-items: baseline; } 
+		&-wrap 						{ flex-wrap: wrap; }	
+		&-center 					{ align-items: center; justify-content: center; }
+		// &-h-center 				{ justify-content: center; }
+		// &-justify-start 	{ justify-content: flex-start; }
+    // &-justify-center	{ justify-content: center; }
+    // &-justify-end 		{ justify-content: flex-end; }
+    // &-justify-between { justify-content: space-between; }
+    // &-justify-around 	{ justify-content: space-around; }
+    // &-items-start 		{ align-items: flex-start; }
+    // &-items-center 		{ align-items: center; }
+    // &-items-end 			{ align-items: flex-end; }
+    // &-items-stretch 	{ align-items: stretch; }
+    // &-items-baseline 	{ align-items: baseline; } 
+    // &-v-center 				{ align-items: center; }
+		// &-stretch 				{ align-items: stretch }
 	}
 
-	.d-inline-flex 				{display: inline-flex; }	
-
 	.align-self-start {
 		align-self: start;
 	}
@@ -322,15 +321,6 @@ body {
 
 
 	// Gaps
-	.gap-extra 		{ gap: var(--extra); }
-	.gap-big 			{ gap: var(--big); }
-	.gap-semi 		{ gap: var(--semi); }
-	.gap-medium 	{ gap: var(--medium); }
-	.gap-regular	{ gap: var(--regular); }
-	.gap-small 		{ gap: var(--small); }
-	.gap-thin 		{ gap: var(--thin); }
-	.gap-micro 		{ gap: var(--micro); }
-	.gap-zero 		{ gap: 0; }
 	// Z-INDEX
 
 	.z-index-0 	{z-index: 0;  }