@ozdao/prometheus-framework 0.2.30 → 0.2.32

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

@@ -1,151 +1,146 @@
 <template>
   <section class="pd-big">
-    <h1 class="mn-b-small">
-      Your Wallet
-    </h1>
+    <h1 class="mn-b-small">Your Wallet</h1>
 
     <p class="mn-b-semi p-big">
       Earn Weeder Token Crypto with buying our weed, use it as money when buying our products or withdraw and trade
     </p>
 
-    <div class="mn-b-semi flex-nowrap flex gap-thin">
-      <div 
-        v-if="!account"
+    <div class="mn-b-semi cols-2 gap-thin">
+      <div
+        v-if="!state.account"
         class="w-100 pd-medium radius-medium t-center bg-grey"
       >
-        <h3 class="mn-b-small">Make first order and start earning Weeder Token </h3>
-        <!-- <p class="w-max-25r p-big t-transp mn-b-small">You can also connect a wallet in advance, to which you can withdraw your earned OZET</p> -->
+        <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="account"
+      <div
+        v-if="state.account"
         class="w-100 pd-medium radius-medium bg-grey"
       >
-        <p class="h4 mn-b-thin">You own: </p>
-        <h3 class="mn-b-small">0.14% of Weeder</h3>
-        <!-- <p class="p-big mn-b-small">0.0032 WDT</p> -->
+        <p class="h4 mn-b-thin">You own:</p>
+        <h3 class="mn-b-small">{{state.share}}% of Weeder</h3>
         <button class="w-100 bg-main button">Get More</button>
       </div>
 
-      <div 
-        v-if="account"
-        class="w-100 pd-medium radius-medium bg-grey"
-      >
-         <p class="h4 mn-b-thin">You earn: </p>
-        <h3 class="mn-b-small">245.43 WDT</h3>
-        <!-- <p class="p-big mn-b-small">0.0032 WDT</p> -->
-        <button class="w-100 bg-main button">Get More</button>
-      </div>
-
-      <div class="w-50 bg-black radius-semi pd-medium t-white">
+      <div class="w-100 bg-black radius-semi pd-medium t-white">
         <p class="h4 mn-b-thin">Your Metamask</p>
-        
-        <div v-if="account" class="mn-b-small pd-small br-solid br-1px br-white-transp-10 radius-small">
-          {{account}}
+
+        <div
+          v-if="state.account"
+          class="mn-b-small pd-small br-solid br-1px br-white-transp-10 radius-small"
+        >
+          {{state.account}}
         </div>
 
-        <p v-if="!account"  class="p-medium t-transp mn-b-small">Connect Metamask to withdrawal your earnings.</p>
+        <p
+          v-if="!state.account"
+          class="p-medium t-transp mn-b-small"
+        >
+          Connect Metamask to withdrawal your earnings.
+        </p>
 
-        <button 
-          v-if="!account" 
-          @click="connectWallet"
-          class="w-100 button"
+        <button
+          v-if="!state.account"
+          @click="actions.connectWallet"
+          class="w-100 br-solid br-2px br-white t-white button"
         >
           Connect Wallet
         </button>
 
-        <button 
-          v-if="account" 
-          @click="disconnectWallet"
+        <button
+          v-if="state.account"
+          @click="actions.disconnectWallet"
           class="w-100 bg-red button"
         >
-          Disonnect Wallet
+          Disconnect Wallet
         </button>
-
       </div>
     </div>
 
+     <div
+        v-if="state.account"
+        class="w-100 pd-medium radius-medium bg-grey"
+      >
+        <p class="h4 mn-b-thin">You earn:</p>
+        <h3 class="mn-b-small">{{state.tokenBalance}} WDT</h3>
+        <button class="w-100 bg-main button" @click="actions.collectRewards">Withdraw</button>
+      </div>
+
 
-    <h3
-      class="mn-b-small"
-    >
-      Incomes
-    </h3>
+    <h3 class="mn-b-small" v-if="state.rewards.length > 0">Latest Rewards </h3>
 
-    <section class="cols-4 gap-thin">
+    <section class="cols-3 gap-thin">
       <div 
-        class="pd-medium radius-medium bg-grey"
-        v-for="income in [{
-          balance: 34,
-          type: 'income',
-          reason: 'order',
-          target: 'ef34dsdase4389snjnu (_id)'
-        },{
-          balance: 25,
-          type: 'income',
-          reason: 'post',
-          target: 'ef34dsdase4389snjnu (_id)'
-        },{
-          balance: 17,
-          type: 'income',
-          reason: 'comment',
-          target: 'ef34dsdase4389snjnu (_id)'
-        },{
-          balance: 43,
-          type: 'event',
-          reason: 'order',
-          target: 'ef34dsdase4389snjnu (_id)'
-        }]"
-      >
-        <h3 class="mn-b-small">+ {{income.balance}} WDT</h3>
-        <p class="p-small mn-b-small">For {{income.reason}} {{income.target}}</p>
+        class="radius-medium bg-grey"
+        v-for="income in state.rewards"
+      > 
+        <!-- <pre>{{income}}</pre> -->
+        
+        <div class="pd-medium">
+           <span class="w-max mn-b-small d-block pd-t-nano pd-b-nano pd-l-thin pd-r-thin bg-main radius-extra t-semi p-small">{{income.type === 'blogpost' ? 'Community Reward' : income.type}}</span>
+          <h4 class="mn-b-thin">{{income.name}}</h4>
+          <p class="mn-b-small p-small">{{income.content[0].content}}</p>
+
+          <div class="bg-black t-white radius-extra pd-thin flex-center flex-nowrap flex">
+            <!-- <img src="/logo/wdt-plus.svg" class="mn-r-thin i-semi"> -->
+            <p class="t-semi">{{income.amount}} WDT</p>
+          </div>
+        </div>
+        
+
+        <!-- <CardBlogpost 
+          :key="income._id" 
+          :blogpost="income" 
+          class=""
+        /> -->
+
       </div>
-    </section>
 
+      <div 
+        class="radius-medium bg-grey"
+        v-for="income in state.rewards"
+      > 
+        <div class="flex-nowrap 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="mn-b-thin">{{income.name}}</h4>
+          <p class="p-small">{{income.content[0].content}}</p>
+        </div>
+
+      </div>
+
+
+    </section>
   </section>
 </template>
 
-
 <script setup>
-import Web3 from 'web3'
-
-import { computed, onMounted,reactive, ref,toRefs  } from 'vue'
-
-import { useRoute,useRouter } from 'vue-router'
-
-const route = useRoute()
-
-let connected = ref(false);
-
-const web3 = new Web3(Web3.givenProvider || 'http://localhost:8080');
-const account = ref(null)
-/////////////////////////////
-// METHODS
-/////////////////////////////
-function connect() {
-  // this connects to the wallet
-  if (window.ethereum) { // first we check if metamask is installed
-    window.ethereum.request({ method: 'eth_requestAccounts' }).then(() => {
-      console.log('aman')
-      connected.value = true; // If users successfully connected their wallet
-    });
-  }
-}
-
-async function connectWallet () {
-  const accounts = await web3.eth.requestAccounts();
-
-  account.value = accounts[0];
-}
-/////////////////////////////
-// MOUNTED
-/////////////////////////////
-onMounted(() => {
-
-});
+  import { onMounted } from 'vue';
+  import { state, actions } from '../../store/wallet';
+  import Web3 from "web3";
+
+  import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue';
+
+  // User has disconnected metamask from extension
+  window.ethereum.on('accountsChanged', (accounts) => {
+    if (accounts.length < 1) {
+      state.account = null;
+    }
+  });
+
+  state.web3 = new Web3(window.ethereum || 'http://localhost:8080');
+
+  onMounted(() => {
+    // Load list with the latest rewards and try to reconnect metamask,
+    // if a user is already connected to it before
+    actions.listRewards();
+    actions.tryReconnectWallet();
+  });
 </script>
-
-<style lang="scss" scoped>
-</style>

package/src/modules/wallet/controllers/crypto.controller.js

@@ -0,0 +1,129 @@
+const ObjectId = require('mongoose').Types.ObjectId;
+const { BigNumber } = require('bignumber.js');
+
+const queryProcessorGlobals = require('../../globals/controllers/utils/queryProcessor');
+
+const VIEWS_REWARD_COEFF = '0.1';
+const WDT_DECIMALS = 8;
+
+const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, 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 cryptoControllerFactory = (db, wdmClient) => {
+  const Blogpost = db.blogpost;
+  const Reaction = db.reaction;
+  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 
+      });
+
+      // 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 = cryptoControllerFactory;

package/src/modules/wallet/models/reward.model.js

@@ -0,0 +1,53 @@
+module.exports = (mongoose) => {
+  const RewardSchema = new mongoose.Schema(
+    {
+      user: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: () => {
+          if (this.owner.type === 'user') return 'User';
+          if (this.owner.type === 'organization') return 'Organization';
+        },
+        required: true,
+      },
+      type: {
+        type: String,
+        enum: ['blogpost', 'order'],
+        required: true,
+      },
+      target: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: () => {
+          if (this.owner.blogpost === 'blogpost') return 'Blogpost';
+          if (this.owner.blogpost === 'order') return 'Order';
+        },
+        required: true,
+      },
+      amount: {
+        type: String,
+        required: true,
+      },
+      snapshot: {
+        views: {
+          type: String,
+          required: true,
+        },
+        reactions: {
+          type: String,
+          required: true,
+        },
+        comments: {
+          type: String,
+          required: true,
+        },
+      },
+    },
+    {
+      timestamps: {
+        currentTime: () => Date.now(),
+      },
+    },
+    { strict: false },
+  );
+
+  return mongoose.model("Reward", RewardSchema);
+};

package/src/modules/wallet/routes/crypto.routes.js

@@ -0,0 +1,36 @@
+// Controllers
+const cryptoControllerFactory = require('../controllers/crypto.controller');
+
+// Middlewares
+const middlewareFactory = require('../../middlewares/server');
+
+// Routes
+module.exports = (app, db, wdmClient, origins) => {
+  const controller = cryptoControllerFactory(db, wdmClient);
+
+  const { authJwt } = middlewareFactory(db);
+
+  app.use((req, res, next) => {
+    const origin = req.headers.origin;
+
+    if (origins.includes(origin)) {
+      res.setHeader('Access-Control-Allow-Origin', origin);
+    }
+
+    res.header("Access-Control-Allow-Headers", "x-access-token, Origin, Content-Type, Accept");
+
+    next();
+  });
+
+  app.get(
+    "/api/crypto/rewards",
+    [authJwt.verifyToken],
+    controller.listRewards
+  );
+
+  app.post(
+    "/api/crypto/collect",
+    [authJwt.verifyToken],
+    controller.collectTokens
+  );
+};

package/src/modules/wallet/store/wallet.js

@@ -1,55 +1,58 @@
-/////////////////////////////
-// DEPENDENCIES
-/////////////////////////////
-import { reactive, watch, computed  } from "vue";
-// Dependencies
-import Cookies from 'js-cookie'
-// Globals 
-import { setError }   from '@pf/src/modules/globals/store/globals'
-
-/////////////////////////////
-// STATE
-/////////////////////////////
+import axios from 'axios';
+import { reactive } from 'vue';
+import { BigNumber } from 'bignumber.js';
+
+const API_CRYPTO_PATH = '/api/crypto';
+const WDT_SUPPLY = 20_000_000;
+
+const $axios = axios.create({ baseURL: process.env.API_URL, withCredentials: true });
+
 const state = reactive({
-  
+  rewards: [],
+  tokenBalance: '0',
+  share: '0',
+  account: null,
+  web3: null,
 });
 
-/////////////////////////////
-// ACTIONS
-/////////////////////////////
 const actions = {
-
-};
-
-/////////////////////////////
-// GETTERS
-/////////////////////////////
-const getters = {
-  
+  listRewards: () => $axios
+    .get(`${API_CRYPTO_PATH}/rewards`)
+    .then((r) => {
+      state.rewards = r.data;
+      state.tokenBalance = r.data
+        .reduce((acc, v) => acc.plus(v.amount), new BigNumber('0'))
+        .toString();
+      state.share = new BigNumber(state.tokenBalance)
+        .div(WDT_SUPPLY)
+        .multipliedBy(100)
+        .toFormat(6);
+    })
+    .catch((e) => console.error(e)),
+
+  collectRewards: () => $axios
+    .post(`${API_CRYPTO_PATH}/collect`, { recipient: state.account })
+    .then(() => actions.listRewards())
+    .catch((e) => console.error(e)),
+
+  disconnectWallet: () => window.ethereum
+    .request({ method: "wallet_revokePermissions", params: [{ "eth_accounts": {} }] })
+    .then(() => { state.account = null; })
+    .catch((e) => console.error(e)),
+
+  connectWallet: () => state.web3.eth
+    .requestAccounts()
+    .then((accounts) => { state.account = accounts[0] })
+    .catch((e) => console.error(e)),
+
+  tryReconnectWallet: () => state.web3.eth
+    .getAccounts()
+    .then((a) => {
+      if (a.length > 0) {
+        return actions.connectWallet();
+      }
+    })
+    .catch((e) => console.error(e)),
 };
 
-/////////////////////////////
-// UTILS
-/////////////////////////////
-
-/////////////////////////////
-// HISTORY
-/////////////////////////////
-const history = []
-history.push(state) 
-
-/////////////////////////////
-// WATCH
-/////////////////////////////
-watch(state, (newState, oldState) => {
-  history.push(newState)
-})
-
-/////////////////////////////
-// Module Export
-/////////////////////////////
-export default {
-  state,
-  actions,
-  getters
-}
+export { state, actions };