@ozdao/prometheus-framework 0.2.133 → 0.2.135

package/src/modules/organizations/components/pages/OrganizationEdit.vue

@@ -39,6 +39,33 @@
     <BlockTags
       @tags-changed="newTags => organization.state.current.profile.tags = newTags"
       :tags="organization.state.current.profile.tags"
+      class="mn-b-small"
+    />
+
+    <h3 class="mn-b-small">Contacts</h3>
+    <Field 
+      v-model:field="organization.state.current.contacts.email"
+      label="Email"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.contacts.website"
+      label="Website"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.contacts.phone"
+      label="Phone"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.contacts.address"
+      label="Address"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
     />
 
     <h3 class="mn-b-small">Socials</h3>
@@ -70,11 +97,12 @@
     />
     <Field 
       v-model:field="organization.state.current.socials.youtube"
-      label="Telegram"   
+      label="Youtube"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
    
+   
     <Button :submit="onSubmit" :callback="redirectTo" class="bg-main w-100 mn-b-thin">Save</Button>
     <!-- <Button :submit="onDelete" :callback="redirectDash" class="mn-b-thin bg-fourth">Delete</Button> -->
 

package/src/modules/spots/components/layouts/Spots.vue

@@ -56,7 +56,7 @@
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
  	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 
- 	import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
+ 	// import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
 
 
 	import * as globals from '@pf/src/modules/globals/store/globals';

package/src/modules/spots/components/pages/SpotEdit.vue

@@ -155,7 +155,6 @@ import { useRoute, useRouter } from "vue-router";
 import Block from '@pf/src/components/Block/Block.vue';
 import UploadImage from '@pf/src/components/UploadImage/UploadImage.vue';
 
-
 import Tab from "@pf/src/components/Tab/Tab.vue";
 import Field from "@pf/src/components/Field/Field.vue";
 import Select from "@pf/src/components/Select/Select.vue";
@@ -165,72 +164,28 @@ import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue
 import Button from "@pf/src/components/Button/Button.vue";
 import Popup from "@pf/src/components/Popup/Popup.vue";
 
-import EditArray from "@pf/src/modules/organizations/components/blocks/EditArray.vue";
-import SpotSub from "@pf/src/modules/spots/components/blocks/SpotSub.vue";
-import SpotMemberModify from "@pf/src/modules/spots/components/blocks/SpotMemberModify.vue";
-// import SpotSubSpotModify from "@pf/src/modules/spots/components/blocks/SpotSubSpotModify.vue";
-import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
-
 import * as spots from "@pf/src/modules/spots/store/spots";
-import * as memberships from "@pf/src/modules/organizations/store/memberships";
 
 const router = useRouter();
 const route = useRoute();
 const tabOrganization = ref("details");
 const showAddNew = ref(false);
 
-onMounted(() => {
-  // spots.state.spot.location = spots.state.spot.location
+onMounted(async () => {
+  await fetchData();
 })
 
 async function fetchData() {
-  if (route.params.spot) {
-    await memberships.actions.read(route.params.spot);
-  }
-  const users = ref(memberships.state.memberships);
 
   if (route.params.spot) await spots.actions.readOne(route.params.spot);
 
-}
-
-await fetchData();
-
-// const [ lng, lat ] = spots.state.spot.location?.coordinates
-
-const lng = spots.state.spot.location?.coordinates[0]
-const lat = spots.state.spot.location?.coordinates[1]
-
-spots.state.spot.location = {
-  lat: lat || 1,
-  lng: lng || 1
-}
-
-const members = ref(spots.state.spot.members);
+  const lng = spots.state.spot.location?.coordinates[0]
+  const lat = spots.state.spot.location?.coordinates[1]
 
-const isOpenAddMemberPopup = ref(false);
-const selectedMember = ref(null);
-
-function openMemberPopup(member) {
-  isOpenAddMemberPopup.value = true;
-  if (typeof member === "number") selectedMember.value = member;
-}
-
-function closeMemberPopup() {
-  isOpenAddMemberPopup.value = false;
-  selectedMember.value = null;
-}
-
-const isOpenSpotPopup = ref(false);
-const selectedSpot = ref(null);
-
-function openSpotPopup(spot) {
-  isOpenSpotPopup.value = true;
-  if (typeof spot === "number") selectedSpot.value = spot;
-}
-
-function closeSpotPopup() {
-  isOpenSpotPopup.value = false;
-  selectedSpot.value = null;
+  spots.state.spot.location = {
+    lat: lat || 1,
+    lng: lng || 1
+  }
 }
 
 async function onSubmit() {

package/src/modules/spots/models/spot.model.js

@@ -1,12 +1,12 @@
-module.exports = (mongoose) => {
+module.exports = (db) => {
   // Схема отдела
-  const spotSchema = new mongoose.Schema({
+  const spotSchema = new db.mongoose.Schema({
     owner: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'User', 
     },
     organization: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'Organization',
     },
     profile: {
@@ -47,7 +47,7 @@ module.exports = (mongoose) => {
     members: [
       {
         user: {
-          type: mongoose.Schema.Types.ObjectId,
+          type: db.mongoose.Schema.Types.ObjectId,
           ref: 'User',
         },
         position: { 
@@ -58,7 +58,7 @@ module.exports = (mongoose) => {
     ],
     subspots: [
       {
-        type: mongoose.Schema.Types.ObjectId,
+        type: db.mongoose.Schema.Types.ObjectId,
         ref: 'Spot',
       },
     ],
@@ -69,7 +69,7 @@ module.exports = (mongoose) => {
   spotSchema.index({ location: '2dsphere' });
 
 
-  const Spot = mongoose.model('Spot', spotSchema);
+  const Spot = db.mongoose.model('Spot', spotSchema);
 
   return Spot
 }

package/src/modules/spots/router/spots.js

@@ -3,70 +3,74 @@ import layoutSpots from '../components/layouts/Spots.vue'
 
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
-const spots = [
-  {
-    path: 'spots',
-    component: layoutEmpty,
-    meta: {
-      title: {
-        en: 'Spots',
-        ru: 'Места'
+const spots = {
+  path: 'spots',
+  component: layoutEmpty,
+  meta: {
+    title: {
+      en: 'Spots',
+      ru: 'Места'
+    },
+  },
+  children: [
+    {
+      path: ':country?',
+      component: layoutSpots,
+      meta: {
+        title: {
+          en: 'Spots',
+          ru: 'Места'
+        },
+        header_theme: 'dark',
+        footer_theme: 'dark'
       },
-      header_theme: 'dark',
-      footer_theme: 'dark'
+      children: [
+        {
+          path: ':state?',
+          name: 'Spots tate',
+          component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
+          children: [
+            {
+              path: ':city?',
+              name: 'Spots City',
+              component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
+            }
+          ]
+        }
+      ]
     },
-    children: [
-      {
-        path: ':country?',
-        component: layoutSpots,
-        children: [
-          {
-            path: ':state?',
-            name: 'Spots tate',
-            component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
-            children: [
-              {
-                path: ':city?',
-                name: 'Spots City',
-                component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
-              }
-            ]
-          }
-        ]
+    {
+      path: ':_id/spots/create',
+      name: 'Spot Creation',
+      meta: {
+        title: 'Создание точки',
       },
-      {
-        path: ':_id/spots/create',
-        name: 'Spot Creation',
-        meta: {
-          title: 'Создание отдела',
-        },
-        beforeEnter: [
-          validationAuth.requiresAuth,
-        ],
-        component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/SpotEdit.vue'),
-      }, {
-        path: ':_id/spots/:deparment',
-        name: 'Spot',
-        meta: {
-          title: 'Отдел',
-        },
-        beforeEnter: [
-          validationAuth.requiresAuth,
-        ],
-        component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/Spot.vue'),
-      }, {
-        path: ':_id/spots/:spot/edit',
-        name: 'Spot Edit',
-        meta: {
-          title: 'Редактирование отдела',
-        },
-        beforeEnter: [
-          validationAuth.requiresAuth,
-        ],
-        component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/SpotEdit.vue'),
+      beforeEnter: [
+        validationAuth.requiresAuth,
+      ],
+      component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/SpotEdit.vue'),
+    }, {
+      path: ':_id/spots/:deparment',
+      name: 'Spot',
+      meta: {
+        title: 'Точка',
+      },
+      beforeEnter: [
+        validationAuth.requiresAuth,
+      ],
+      component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/Spot.vue'),
+    }, {
+      path: ':_id/spots/:spot/edit',
+      name: 'Spot Edit',
+      meta: {
+        title: 'Редактирование точки',
       },
-    ]
-  }
-];
+      beforeEnter: [
+        validationAuth.requiresAuth,
+      ],
+      component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/SpotEdit.vue'),
+    },
+  ]
+}
 
 export default spots;

package/src/modules/spots/spots.client.js

@@ -0,0 +1,43 @@
+// Store
+import * as storeSpots from './store/spots.js';
+// Router
+import routerSpots from './router/spots.js';
+// Views
+import Spots from './components/layouts/Spots.vue';
+import Spot from './components/pages/Spot.vue';
+import SpotEdit from './components/pages/SpotEdit.vue';
+import Map from './components/pages/Map.vue';
+// Importing blocks components
+import CardSpot from './components/blocks/CardSpot.vue';
+import SpotMemberModify from './components/blocks/SpotMemberModify.vue';
+import SpotSub from './components/blocks/SpotSub.vue';
+
+function initializeSpots(app, store, router) {
+  router.addRoute('Home', routerSpots);
+  store.addStore('spots', storeSpots);
+}
+
+const ModuleSpot = {
+  initialize: initializeSpots,
+  views: {
+    store: {
+      storeSpots
+    },
+    router: {
+      routerSpots
+    },
+    components: {
+      // Pages
+      Spots,
+      Spot,
+      SpotEdit,
+      Map,
+      // Blocks
+      CardSpot,
+      SpotMemberModify,
+      SpotSub,
+    }
+  }
+}
+
+export default ModuleSpot;

package/src/modules/spots/spots.server.js

@@ -0,0 +1,31 @@
+const ModelSpot = require('./models/spot.model.js');
+
+const RoutesSpot = require('./routes/spots.routes.js');
+
+const FactorySpot = require('./controllers/spots.controller.js');
+
+const CRUD = require('@pf/src/modules/globals/services/globals.crud');
+
+function initializeSpots(app, db, origins, publicPath) {
+  // Setup models in the database object
+  db.spot = ModelSpot(db);
+
+  // Setup routes if the app object is provided
+  if (app) {
+    RoutesSpot(app, db, origins, publicPath);
+  }
+}
+
+// Exporting controllers, routes, and models
+module.exports = {
+  initialize: initializeSpots,
+  models: {
+    ModelSpot,
+  },
+  routes: {
+    RoutesSpot,
+  },
+  controllers: {
+    FactorySpot
+  }
+};

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

@@ -3,6 +3,10 @@ const { BigNumber } = require('bignumber.js');
 
 const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
 
+BigNumber.config({
+  EXPONENTIAL_AT: [-1000, 2000],
+});
+
 const VIEWS_REWARD_COEFF = '0.1';
 const WDT_DECIMALS = 8;
 
@@ -23,13 +27,24 @@ const calculateRewardForPost = (snapshot, viewsCount, reactionsCount, commentsCo
     .plus(commentsCount);
 };
 
-const rewardsControllerFactory = (db, wdmClient) => {
+const rewardsControllerFactory = (db, wdmClient, wss) => {
   const Blogpost = db.blogpost;
   const Reaction = db.reaction;
   const Comment = db.comment;
   const Reward = db.reward;
+  const Wallet = db.wallet;
+
+  const lookup = {};
 
+  wss.on('connection', (ws, req) => {
+    if (req.userId) {
+      lookup[req.userId] = ws;
 
+      ws.on('close', () => {
+        delete lookup[req.userId];
+      });
+    }
+  });
 
   const listRewards = async (req, res) => {
 
@@ -176,7 +191,77 @@ const rewardsControllerFactory = (db, wdmClient) => {
     res.status(200).send();
   };
 
-  return { listRewards, collectTokens };
+  const requestDeposit = async (req, res) => {
+    const response = await wdmClient.createDepositRequest(
+      req.body.network,
+      req.body.amount,
+      req.body.token,
+      req.userId
+    );
+
+    res.status(200).send(response.data);
+  };
+
+  const cancelDeposit = async (req, res) => {
+    const response = await wdmClient.cancelDeposit(
+      req.body.id,
+      req.userId
+    );
+
+    res.status(200).send(response.data);
+  };
+
+  const getDepositConfig = async (req, res) => {
+    const response = await wdmClient.getDepositConfig();
+
+    res.status(200).send(response.data);
+  };
+
+  const handleDepositUpdate = async (req, res) => {
+    if (req.body.status === "TRANSFER_STATUS_COMPLETED") {
+      const userWallet = await Wallet.findOne({ owner: new ObjectId(req.body.user) });
+      const amount = new BigNumber(req.body.amount)
+        .shiftedBy(-WDT_DECIMALS)
+        .dividedBy(process.env.TOKEN_EXCHANGE_RATE)
+        .toString();
+
+      if (userWallet) {
+        const topupIndex = userWallet.balances.findIndex((b) => b.name === 'WDT');
+
+        if (topupIndex < 0) {
+          userWallet.balances.push({ name: 'WDT', amount: +amount, locked_amount: 0 });
+        } else {
+          userWallet.balances[topupIndex] = {
+            name: 'WDT',
+            amount: userWallet.balances[topupIndex].amount + +amount,
+            locked_amount: userWallet.balances[topupIndex].locked_amount
+          };
+        }
+
+        await userWallet.save();
+      } else {
+        await Wallet.create({
+          owner: new ObjectId(req.body.user),
+          balances: [{ name: 'WDT', amount: +amount, locked_amount: 0 }],
+        });
+      }
+    }
+
+    if (lookup[req.body.user]) {
+      lookup[req.body.user].send(JSON.stringify(req.body));
+    }
+
+    res.status(200).send();
+  }
+
+  return {
+    listRewards,
+    collectTokens,
+    requestDeposit,
+    getDepositConfig,
+    cancelDeposit,
+    handleDepositUpdate
+  };
 };
 
 module.exports = rewardsControllerFactory;

package/src/modules/wallet/controllers/routes/rewards.routes.js

@@ -5,10 +5,10 @@ const rewardsControllerFactory = require('../factories/rewards.factory');
 const middlewareFactory = require('@pf/src/modules/middlewares/server');
 
 // Routes
-module.exports = (app, db, wdmClient, origins) => {
-  const controller = rewardsControllerFactory(db, wdmClient);
+module.exports = (app, db, wss, wdmClient, origins) => {
+  const controller = rewardsControllerFactory(db, wdmClient, wss);
 
-  const { authJwt } = middlewareFactory(db);
+  const { authJwt, authSecret } = middlewareFactory(db);
 
   app.use((req, res, next) => {
     const origin = req.headers.origin;
@@ -33,4 +33,28 @@ module.exports = (app, db, wdmClient, origins) => {
     [authJwt.verifyToken],
     controller.collectTokens
   );
+
+  app.post(
+    "/api/crypto/deposit",
+    [authJwt.verifyToken],
+    controller.requestDeposit
+  );
+
+  app.post(
+    "/api/crypto/deposit/cancel",
+    [authJwt.verifyToken],
+    controller.cancelDeposit
+  );
+
+  app.post(
+    "/api/crypto/deposit/update",
+    [authSecret.verifySecret('POST', '/api/crypto/deposit/update', process.env.WDM_SECRET)],
+    controller.handleDepositUpdate
+  );
+
+  app.get(
+    "/api/crypto/deposit/config",
+    [],
+    controller.getDepositConfig
+  )
 };

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

@@ -9,11 +9,11 @@ module.exports = (db) => {
         },
         required: true,
       },
-      amount: {
-        type: Number,
-        required: true,
-        default: 0
-      },
+      balances: [{
+        name: String,  // Name of currency
+        amount: Number, // Amount
+        locked_amount: Number,
+      }]
     },
     {
       timestamps: {

package/src/modules/wallet/{components → views/components}/blocks/CardBalanceReplenished.vue

@@ -1,27 +1,30 @@
 <template>
-  <h2 class="mn-b-small t-center t-bold">{{ t('balanceReplenished') }}</h2>
+  <h2 class="mn-b-small t-center t-bold">{{ t('wallet.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') }}
+      {{ t('wallet.youReceived') }}
     </h3>
     <h3 class="t-semi">
-      500 WDT
+      {{ receiveAmount }} 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') }}
+    {{ t('wallet.backToWallet') }}
   </button>
 </template>
 
 <script setup>
-  import text from '@pf/src/modules/wallet/localization/Wallet.json'
   import { useI18n } from 'vue-i18n'
+  import { computed } from 'vue'
+  import { BigNumber } from 'bignumber.js'
+
+  import text from '@pf/src/modules/wallet/views/localization/wallet.json'
+  import { state } from '@pf/src/modules/wallet/views/store/wallet.store';
 
   const emits = defineEmits(['close'])
 
@@ -31,10 +34,17 @@
     ...text
   })
 
+  const receiveAmount = computed(() =>
+    new BigNumber(state.depositInfo.amount)
+      .shiftedBy(-8)
+      .dividedBy(process.env.TOKEN_EXCHANGE_RATE)
+      .toString()
+  )
+
   function close() {
     emits("close")
   }
 </script>
 
 <style scoped>
-</style>
+</style>

package/src/modules/wallet/{components/blocks/CardDeposite.vue → views/components/blocks/CardDeposit.vue}

@@ -3,7 +3,7 @@
 
   <div class="bg-grey radius-big mn-t-semi mn-b-semi flex flex-justify-between">
     <Field
-      :placeholder="t('enterAmount')"
+      :placeholder="t('wallet.enterAmount')"
       class="pd-medium radius-small"
     />
 
@@ -18,19 +18,19 @@
     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') }}
+    {{ t('wallet.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') }}
+    {{ t('wallet.backToSelection') }}
   </button>
 </template>
 
 <script setup>
-  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import text from '@pf/src/modules/wallet/views/localization/wallet.json'
   import Field from '@pf/src/components/Field/Field.vue'
   import { useI18n } from 'vue-i18n'