@coopenomics/desktop 2.2.7 → 2.2.8

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.8](https://github.com/coopenomics/monocoop/compare/v2.2.7...v2.2.8) (2025-02-10)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
 ## [2.2.7](https://github.com/coopenomics/monocoop/compare/v2.2.6...v2.2.7) (2025-02-07)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -20,8 +20,8 @@
     "prepublishOnly": "npm run build:lib"
   },
   "dependencies": {
-    "@coopenomics/controller": "2.2.7",
-    "@coopenomics/sdk": "2.2.7",
+    "@coopenomics/controller": "2.2.8",
+    "@coopenomics/sdk": "2.2.8",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -45,7 +45,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2.2.7",
+    "cooptypes": "2.2.8",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -94,5 +94,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "3be56ba462561e4dd9e7225bb95b254b20f89042"
+  "gitHead": "973590281c916620f866b9e39253c6b5bf85f9d4"
 }

package/src/desktops/Chairman/model/index.ts

@@ -1,6 +1,4 @@
-import { UserIdentityPage } from 'src/pages/User/IdentityPage';
 import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
-import { UserWalletPage } from 'src/pages/User/WalletPage';
 import { markRaw } from 'vue';
 
 export const manifest = {
@@ -18,27 +16,6 @@ export const manifest = {
       path: '/:coopname/user',
       name: 'home',
       children: [{
-        meta: {
-          title: 'Удостоверение',
-          icon: '',
-          roles: [],
-        },
-        path: 'identity',
-        name: 'user-identity',
-        component: markRaw(UserIdentityPage),
-        children: [],
-        },{
-          meta: {
-            title: 'Кошелёк',
-            icon: '',
-            roles: [],
-          },
-          path: 'wallet',
-          name: 'user-wallet',
-          component: markRaw(UserWalletPage),
-          children: [],
-        },
-        {
           meta: {
             title: 'Реквизиты',
             icon: '',

package/src/desktops/Member/model/index.ts

@@ -1,6 +1,4 @@
-import { UserIdentityPage } from 'src/pages/User/IdentityPage';
 import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
-import { UserWalletPage } from 'src/pages/User/WalletPage';
 import { markRaw } from 'vue';
 
 export const manifest = {
@@ -18,27 +16,6 @@ export const manifest = {
       path: '/:coopname/user',
       name: 'home',
       children: [{
-        meta: {
-          title: 'Удостоверение',
-          icon: '',
-          roles: [],
-        },
-        path: 'identity',
-        name: 'user-identity',
-        component: markRaw(UserIdentityPage),
-        children: [],
-        },{
-          meta: {
-            title: 'Кошелёк',
-            icon: '',
-            roles: [],
-          },
-          path: 'wallet',
-          name: 'user-wallet',
-          component: markRaw(UserWalletPage),
-          children: [],
-        },
-        {
           meta: {
             title: 'Реквизиты',
             icon: '',

package/src/desktops/Setup/model/index.ts

@@ -1,6 +1,4 @@
-import { UserIdentityPage } from 'src/pages/User/IdentityPage';
 import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
-import { UserWalletPage } from 'src/pages/User/WalletPage';
 import { markRaw } from 'vue';
 
 export const manifest = {
@@ -18,27 +16,6 @@ export const manifest = {
       path: '/:coopname/user',
       name: 'home',
       children: [{
-        meta: {
-          title: 'Удостоверение',
-          icon: '',
-          roles: [],
-        },
-        path: 'identity',
-        name: 'user-identity',
-        component: markRaw(UserIdentityPage),
-        children: [],
-        },{
-          meta: {
-            title: 'Кошелёк',
-            icon: '',
-            roles: [],
-          },
-          path: 'wallet',
-          name: 'user-wallet',
-          component: markRaw(UserWalletPage),
-          children: [],
-        },
-        {
           meta: {
             title: 'Реквизиты',
             icon: '',

package/src/entities/Wallet/model/stores.ts

@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia';
 import { api } from '../api';
 import {
-  IWalletData,
   IDepositData,
   IWithdrawData,
   ExtendedProgramWalletData,
@@ -13,14 +12,13 @@ import { ILoadUserWallet } from './types';
 import { ICreateDeposit } from 'src/shared/lib/types/payments';
 import { Ref, ref } from 'vue';
 import { sendPOST } from 'src/shared/api';
-import { CURRENCY } from 'src/shared/config';
 import type { SovietContract } from 'cooptypes';
 
 const namespace = 'wallet';
 
 interface IWalletStore {
   /*  доменный интерфейс кошелька пользователя */
-  wallet: Ref<IWalletData>;
+  // wallet: Ref<IWalletData>;
   program_wallets: Ref<ExtendedProgramWalletData[]>;
   deposits: Ref<IDepositData[]>;
   withdraws: Ref<IWithdrawData[]>;
@@ -35,14 +33,14 @@ interface IWalletStore {
 }
 
 export const useWalletStore = defineStore(namespace, (): IWalletStore => {
-  const wallet = ref<IWalletData>({
-    username: '',
-    coopname: '',
-    available: `0.0000 ${CURRENCY}`,
-    blocked: `0.0000 ${CURRENCY}`,
-    minimum: `0.0000 ${CURRENCY}`,
-    initial: `0.0000 ${CURRENCY}`,
-  });
+  // const wallet = ref<IWalletData>({
+  //   username: '',
+  //   coopname: '',
+  //   available: `0.0000 ${CURRENCY}`,
+  //   blocked: `0.0000 ${CURRENCY}`,
+  //   minimum: `0.0000 ${CURRENCY}`,
+  //   initial: `0.0000 ${CURRENCY}`,
+  // });
 
   const deposits = ref<IDepositData[]>([]);
   const withdraws = ref<IWithdrawData[]>([]);
@@ -53,18 +51,18 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
 
   const loadUserWalet = async (params: ILoadUserWallet) => {
 
-    const createEmptyWallet = (): IWalletData => ({
-      username: '',
-      coopname: '',
-      available: `0.0000 ${CURRENCY}`,
-      blocked: `0.0000 ${CURRENCY}`,
-      minimum: `0.0000 ${CURRENCY}`,
-      initial: `0.0000 ${CURRENCY}`,
-    });
+    // const createEmptyWallet = (): IWalletData => ({
+    //   username: '',
+    //   coopname: '',
+    //   available: `0.0000 ${CURRENCY}`,
+    //   blocked: `0.0000 ${CURRENCY}`,
+    //   minimum: `0.0000 ${CURRENCY}`,
+    //   initial: `0.0000 ${CURRENCY}`,
+    // });
 
     try {
       const data = await Promise.all([
-        api.loadSingleUserWalletData(params),
+        // api.loadSingleUserWalletData(params),
         api.loadUserDepositsData(params),
         api.loadUserWithdrawsData(params),
         api.loadUserProgramWalletsData(params),
@@ -72,12 +70,12 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
         api.loadUserAgreements(params.coopname, params.username)
       ]);
 
-      wallet.value = data[0] ?? createEmptyWallet();
-      deposits.value = data[1] ?? [];
-      withdraws.value = data[2] ?? [];
-      program_wallets.value = data[3] ?? [];
-      methods.value = data[4] ?? [];
-      agreements.value = data[5] ?? [];
+      // wallet.value = data[0] ?? createEmptyWallet();
+      deposits.value = data[0] ?? [];
+      withdraws.value = data[1] ?? [];
+      program_wallets.value = data[2] ?? [];
+      methods.value = data[3] ?? [];
+      agreements.value = data[4] ?? [];
 
     } catch (e: any) {
       console.log(e);
@@ -95,7 +93,7 @@ export const useWalletStore = defineStore(namespace, (): IWalletStore => {
   };
 
   return {
-    wallet,
+    // wallet,
     program_wallets,
     deposits,
     withdraws,

package/src/entities/Wallet/ui/index.ts

@@ -1,2 +1 @@
-export * from './WalletBalance'
 export * from './WalletProgramsList'

package/src/widgets/User/CoopCard/ui/CoopCard.vue

@@ -15,7 +15,38 @@ div.q-pa-md
           DepositButton.col-6.border-left-radius-buttons
           WithdrawButton.col-6.border-right-radius-buttons
 
-      WalletBalance.q-mt-lg
+          div.col-md-4.col-xs-12
+
+
+      q-list(flat).q-gutter-sm
+        q-item
+          q-item-section
+            q-item-label(caption) Имя аккаунта
+            q-item-label(style="font-size: 20px;").text-bold {{ currentUser.username }}
+
+        //- q-item
+        //-   q-item-section
+        //-     q-item-label(caption) Паевый счёт
+        //-     q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.available }}
+
+        q-item
+          q-item-section
+            q-item-label(caption) Минимальный паевый счёт
+            q-item-label(style="font-size: 20px;").text-bold {{ currentUser.participantAccount?.minimum_amount }}
+
+        //- q-item
+        //-   q-item-section
+        //-     q-item-label(caption) Заблокировано в целевых программах
+        //-     q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.blocked }}
+
+
+        q-item(v-for="program_wallet of walletStore.program_wallets" :key="program_wallet.id")
+          q-item-section
+            q-item-label(caption) {{ program_wallet.program_details.title }}
+
+            q-item-label(style="font-size: 20px;").text-bold {{program_wallet.available}}
+
+
 
 
     //- div.col-md-6.col-xs-12.q-mt-lg
@@ -24,10 +55,12 @@ div.q-pa-md
 </template>
 
 <script lang="ts" setup>
-import { WalletBalance } from 'src/entities/Wallet/ui'
+
 import { DepositButton } from 'src/features/Wallet/DepositToWallet'
 import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet'
 import { AutoAvatar } from 'src/shared/ui/AutoAvatar';
+import { useWalletStore } from 'src/entities/Wallet';
+const walletStore = useWalletStore()
 
 import { useCurrentUserStore } from 'src/entities/User'
 import type { IEntrepreneurData, IIndividualData, IOrganizationData } from 'src/shared/lib/types/user/IUserData';
@@ -38,6 +71,7 @@ const userType = computed(() => currentUser.userAccount?.type)
 
 const isIP = computed(() => currentUser.userAccount?.type === 'entrepreneur')
 
+
 const role = computed(() => {
   if (currentUser.userAccount?.role === 'user')
     return 'Пайщик'

package/src/entities/Wallet/ui/WalletBalance/WalletBalance.vue

@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import { useWalletStore } from '../../model'
-const walletStore = useWalletStore()
-</script>
-
-<template lang="pug">
-q-list(flat).q-gutter-sm
-  q-item
-    q-item-section
-      q-item-label(caption) Имя аккаунта
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.username }}
-
-  q-item
-    q-item-section
-      q-item-label(caption) Паевый счёт
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.available }}
-
-  q-item
-    q-item-section
-      q-item-label(caption) Минимальный паевый счёт
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.minimum }}
-
-  q-item
-    q-item-section
-      q-item-label(caption) Заблокировано в целевых программах
-      q-item-label(style="font-size: 20px;").text-bold {{ walletStore.wallet.blocked }}
-
-
-  q-item(v-for="program_wallet of walletStore.program_wallets" :key="program_wallet.id")
-    q-item-section
-      q-item-label(caption) {{ program_wallet.program_details.title }}
-
-      q-item-label(style="font-size: 20px;").text-bold {{program_wallet.available}}
-
-</template>

package/src/entities/Wallet/ui/WalletBalance/index.ts

@@ -1 +0,0 @@
-export { default as WalletBalance } from './WalletBalance.vue'

package/src/pages/User/IdentityPage/index.ts

@@ -1 +0,0 @@
-export * from './ui'

package/src/pages/User/IdentityPage/ui/IdentityPage.vue

@@ -1,15 +0,0 @@
-<template lang="pug">
-PersonalCard(:username="username")
-
-</template>
-<script lang="ts" setup>
-import { PersonalCard } from 'src/widgets/User/PersonalCard/ui'
-
-import { computed } from 'vue';
-import { useCurrentUserStore } from 'src/entities/User';
-
-const currentUser = useCurrentUserStore()
-
-const username = computed(() => currentUser.username)
-
-</script>

package/src/pages/User/IdentityPage/ui/index.ts

@@ -1 +0,0 @@
-export {default as UserIdentityPage} from './IdentityPage.vue'

package/src/pages/User/WalletPage/index.ts

@@ -1 +0,0 @@
-export * from './ui'

package/src/pages/User/WalletPage/ui/WalletPage.vue

@@ -1,14 +0,0 @@
-<template lang="pug">
-WalletCard(:username="username")
-</template>
-<script lang="ts" setup>
-import { WalletCard } from 'src/widgets/User/WalletCard'
-
-import { computed } from 'vue';
-import { useCurrentUserStore } from 'src/entities/User';
-
-const currentUser = useCurrentUserStore()
-
-const username = computed(() => currentUser.username)
-
-</script>

package/src/pages/User/WalletPage/ui/index.ts

@@ -1 +0,0 @@
-export {default as UserWalletPage} from './WalletPage.vue'

package/src/widgets/User/PersonalCard/index.ts

@@ -1 +0,0 @@
-export * from './ui'

package/src/widgets/User/PersonalCard/ui/PersonalCard.vue

@@ -1,109 +0,0 @@
-<template lang="pug">
-div(v-if="currentUser?.username" flat bordered).q-pa-md
-  div.row
-    div.col-md-4.col-xs-12
-      div(style="flex-grow: 1; display: flex; justify-content: center;")
-        //- UserQR
-
-        AutoAvatar(style="width: 125px;" :username="currentUser.username").q-pa-sm.q-pt-lg
-
-    div.col-md-8.col-xs-12
-      div
-        div
-          q-item
-            q-item-section
-              q-item-label(caption) Пайщик
-              q-item-label {{ displayName }}
-
-
-          q-item
-            q-item-section
-              q-item-label(caption) Зарегистрирован как
-              q-item-label(v-if="userType === 'individual'") физическое лицо
-              q-item-label(v-if="userType === 'entrepreneur'") индивидуальный предприниматель
-              q-item-label(v-if="userType === 'organization'") юридическое лицо
-
-          q-item
-            q-item-section
-              q-item-label(caption) Имя аккаунта
-              q-item-label {{ currentUser.username }}
-
-          q-item(v-if="userType === 'individual' && individualProfile")
-            q-item-section
-              q-item-label(caption) Дата рождения
-              q-item-label {{ individualProfile.birthdate }}
-
-          q-item(v-if="userType === 'organization' && organizationProfile")
-            q-item-section
-              q-item-label(caption) ИНН / ОГРН
-              q-item-label {{ inn_ogrn }}
-
-          q-item(v-if="userProfile")
-            q-item-section
-              q-item-label(caption) Телефон
-              q-item-label {{ userProfile.phone }}
-
-          q-item(v-if="userProfile")
-            q-item-section
-              q-item-label(caption) Почта
-              q-item-label {{ userProfile.email }}
-
-  </template>
-
-<script lang="ts" setup>
-import { AutoAvatar } from 'src/shared/ui/AutoAvatar';
-import { useCurrentUserStore } from 'src/entities/User'
-import type { IEntrepreneurData, IIndividualData, IOrganizationData } from 'src/shared/lib/types/user/IUserData';
-import { computed } from 'vue';
-const currentUser = useCurrentUserStore()
-
-const userType = computed(() => currentUser.userAccount?.type)
-
-const individualProfile = computed(() => {
-  if (userType.value === 'individual') {
-    return currentUser.userAccount?.private_data as IIndividualData
-  }
-  return null
-})
-
-const entrepreneurProfile = computed(() => {
-  if (userType.value === 'entrepreneur') {
-    return currentUser.userAccount?.private_data as IEntrepreneurData
-  }
-  return null
-})
-
-const organizationProfile = computed(() => {
-  if (userType.value === 'organization') {
-    return currentUser.userAccount?.private_data as IOrganizationData
-  }
-  return null
-})
-
-const userProfile = computed(() => {
-  if (userType.value === 'individual' || userType.value === 'entrepreneur') {
-    return individualProfile?.value || entrepreneurProfile?.value
-  }
-  return organizationProfile?.value
-})
-
-const displayName = computed(() => {
-  if (userType.value === 'individual') {
-    return `${individualProfile.value?.last_name} ${individualProfile.value?.first_name} ${individualProfile.value?.middle_name}`
-  } else if (userType.value === 'entrepreneur') {
-    return `${entrepreneurProfile.value?.last_name} ${entrepreneurProfile.value?.first_name} ${entrepreneurProfile.value?.middle_name}`
-  } else {
-    return organizationProfile.value?.short_name
-  }
-})
-
-const inn_ogrn = computed(() => {
-  if (organizationProfile.value)
-    return `${organizationProfile.value.details.inn} / ${organizationProfile.value.details.ogrn}`
-  else return ''
-})
-
-</script>
-<style>
-
-</style>

package/src/widgets/User/PersonalCard/ui/UserQR.vue

@@ -1,5 +0,0 @@
-<template lang="pug">
-div qr
-</template>
-<script lang="ts" setup>
-</script>

package/src/widgets/User/PersonalCard/ui/index.ts

@@ -1,2 +0,0 @@
-export { default as PersonalCard } from './PersonalCard.vue'
-export { default as UserQR } from './UserQR.vue'

package/src/widgets/User/WalletCard/index.ts

@@ -1 +0,0 @@
-export * from './ui'

package/src/widgets/User/WalletCard/ui/WalletCard.vue

@@ -1,26 +0,0 @@
-<template lang="pug">
-div.q-pa-md
-  div.flex
-    DepositButton.q-ma-sm
-    WithdrawButton.q-ma-sm
-
-  div.row.justify-between.q-mt-lg
-    div.col-md-4.col-xs-12
-      WalletBalance
-    div.col-md-4.col-xs-12.q-mt-lg
-
-</template>
-
-<script lang="ts" setup>
-import { WalletBalance } from 'src/entities/Wallet/ui'
-import { DepositButton } from 'src/features/Wallet/DepositToWallet'
-import { WithdrawButton } from 'src/features/Wallet/WithdrawFromWallet'
-
-defineProps({
-  username: {
-    type: String,
-    required: true,
-  },
-})
-
-</script>

package/src/widgets/User/WalletCard/ui/index.ts

@@ -1 +0,0 @@
-export { default as WalletCard } from './WalletCard.vue'