@coopenomics/desktop 2.2.2 → 2.2.4

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.4](https://github.com/coopenomics/monocoop/compare/v2.2.0...v2.2.4) (2025-01-17)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
+## [2.2.3](https://github.com/coopenomics/monocoop/compare/v2.2.0...v2.2.3) (2025-01-16)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
 ## [2.2.1](https://github.com/coopenomics/monocoop/compare/v2.2.0...v2.2.1) (2025-01-14)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "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.2",
-    "@coopenomics/sdk": "2.2.2",
+    "@coopenomics/controller": "2.2.4",
+    "@coopenomics/sdk": "2.2.4",
     "@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.2",
+    "cooptypes": "2.2.4",
     "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": "88352202b02fd190abd2c892290cb668ba137cb8"
+  "gitHead": "cbfe37dbba00574ec4f1ca354ecf5a4438d72bc1"
 }

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

@@ -24,6 +24,17 @@ export const manifest = {
       path: '/:coopname/user',
       name: 'home',
       children: [
+        {
+          meta: {
+            title: 'Подключение',
+            icon: 'fas fa-link',
+            roles: ['user'],
+            conditions: 'isCoop === true && coopname === "voskhod"',
+          },
+          path: '/:coopname/connect',
+          name: 'connect',
+          component: markRaw(ConnectionPage),
+        },
         {
           meta: {
             title: 'Карта пайщика',
@@ -141,17 +152,7 @@ export const manifest = {
           component: markRaw(UnionPageListOfCooperatives),
 
         },
-        {
-          // meta: {
-            // title: 'Подключения',
-            // icon: 'fas fa-link',
-            // roles: ['chairman', 'member'],
-          // },
-          path: '/:coopname/connect',
-          name: 'connect',
-          component: markRaw(ConnectionPage),
 
-        },
         {
           path: '/:coopname/contacts',
           name: 'contacts',

package/src/entities/Desktop/model/types.ts

@@ -16,6 +16,7 @@ interface RouteMeta {
   title: string;
   icon: string;
   roles: string[];
+  conditions: string;
 }
 
 export interface IRoute {

package/src/env.d.ts

@@ -21,6 +21,7 @@ declare module 'vue-router' {
   // Расширяем интерфейс RouteMeta, добавляя новые свойства
   interface RouteMeta {
     roles?: string[];
+    conditions?: string;
     agreements?: string[]
     title: string
     icon: string

package/src/features/User/LoginUser/model/index.ts

@@ -5,6 +5,7 @@ import {client} from 'src/shared/api/client'
 import { useCurrentUserStore } from 'src/entities/User'
 import { useSystemStore } from 'src/entities/System/model'
 import { useRegistratorStore } from 'src/entities/Registrator'
+import type { ITokens } from 'src/shared/lib/types/user'
 
 export function useLoginUser() {
   const globalStore = useGlobalStore()
@@ -12,10 +13,23 @@ export function useLoginUser() {
   const system = useSystemStore()
 
   async function login(email: string, wif: string): Promise<void> {
-    const auth = await api.loginUser(email, wif)
+    const auth = await api.loginUser(email, wif);
+    const { tokens, account } = await client.login(email, wif);
 
-    await globalStore.setWif(auth.user.username, wif)
-    await globalStore.setTokens(auth.tokens)
+    // Создаём объект tokens с правильными типами
+    const adaptedTokens: ITokens = {
+      access: {
+        token: tokens.access.token,
+        expires: new Date(tokens.access.expires as string),
+      },
+      refresh: {
+        token: tokens.refresh.token,
+        expires: new Date(tokens.refresh.expires as string),
+      },
+    };
+
+    await globalStore.setWif(account.username, wif);
+    await globalStore.setTokens(adaptedTokens);
 
     const session = useSessionStore()
     await session.init()

package/src/pages/Registrator/SignUp/GenerateAccount.vue

@@ -34,6 +34,8 @@ import { ref, computed } from 'vue'
 import { useCreateUser } from 'src/features/User/CreateUser'
 import { Notify, copyToClipboard } from 'quasar'
 import { useRegistratorStore } from 'src/entities/Registrator'
+import { Classes } from '@coopenomics/sdk'
+
 const store = useRegistratorStore()
 
 import { FailAlert } from 'src/shared/api'
@@ -43,7 +45,7 @@ const i_save = ref(false)
 const account = ref(store.state.account)
 
 if (!account.value.private_key || !account.value.public_key || !account.value.username)
-  account.value = api.generateAccount()
+  account.value = new Classes.Account()
 
 const email = computed(() => store.state.email)
 const userData = computed(() => store.state.userData)

package/src/pages/Registrator/SignUp/SignStatement.vue

@@ -1,189 +1,153 @@
-<template lang='pug'>
-div
-  q-step(:name='store.steps.SignStatement', title='Подпишите заявление на вступление', :done='store.isStepDone("SignStatement")')
-    div(v-if='onSign')
-      Loader(:text='loadingText')
-    div(v-else)
-      .bg-grey-2(v-if='!onSign' ref='around', style='border: 0.1px solid grey; min-height: 300px;')
-        canvas(
-          ref='canvas',
-          @touchstart='startDrawing',
-          @touchmove='draw',
-          @touchend='endDrawing',
-          @mousedown='startDrawing',
-          @mousemove='draw',
-          @mouseup='endDrawing'
+<template lang="pug">
+  div
+    q-step(
+      :name="store.steps.SignStatement"
+      title="Подпишите заявление на вступление"
+      :done="store.isStepDone('SignStatement')"
+    )
+      div(v-if="onSign")
+        Loader(:text="loadingText")
+
+      div(v-else)
+        // Контейнер, внутри которого класс Canvas создаёт <canvas>
+        .bg-grey-2(
+          v-if="!onSign"
+          ref="around"
+          style="border: 0.1px solid grey; min-height: 300px;"
         )
-      p.text-center.full-width Оставьте собственноручную подпись в рамке
-      .q-mt-lg.q-mb-lg
-        q-btn.col-md-4.col-xs-12(flat, @click='store.prev()')
-          i.fa.fa-arrow-left
-          span.q-ml-md назад
-        q-btn.col-md-4.col-xs-12(flat, @click='clearCanvas')
-          span.q-ml-md очистить
-        q-btn.col-md-4.col-xs-12(color='primary', label='Продолжить', @click='setSignature')
-
-</template>
-<script lang="ts" setup>
-import { ref, watch, onBeforeMount, nextTick, onMounted } from 'vue'
-import { useCreateUser } from 'src/features/User/CreateUser'
-import { Notify } from 'quasar'
-import { FailAlert } from 'src/shared/api';
-import { Loader } from 'src/shared/ui/Loader';
-
-import { useRegistratorStore } from 'src/entities/Registrator'
-const store = useRegistratorStore()
-
-const createUser = useCreateUser()
-
-const around = ref()
-const onSign = ref(false)
-const loadingText = ref('')
-
-const canvas = ref<HTMLCanvasElement | null>(null)
-const drawing = ref<boolean>(false)
-let context: CanvasRenderingContext2D | null = null
-let lastX = 0
-let lastY = 0
-
-const windowWidth = ref<number>()
-const windowHeight = ref<number>()
-
-const setSignature = async (): Promise<void> => {
-  if (!context || !canvas.value) {
-    Notify.create({
-      message: 'Пожалуйста, оставьте собственноручную подпись в окне',
-      color: 'negative',
-    })
-    return
+        p.text-center.full-width Оставьте собственноручную подпись в рамке
+        .q-mt-lg.q-mb-lg
+          q-btn.col-md-4.col-xs-12(flat @click="store.prev()")
+            i.fa.fa-arrow-left
+            span.q-ml-md назад
+          q-btn.col-md-4.col-xs-12(flat @click="clearCanvas")
+            span.q-ml-md очистить
+          q-btn.col-md-4.col-xs-12(color="primary" label="Продолжить" @click="setSignature")
+  </template>
+
+  <script lang="ts" setup>
+  import { ref, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
+  import { Notify } from 'quasar'
+  import { FailAlert } from 'src/shared/api'
+  import { Loader } from 'src/shared/ui/Loader'
+  import { useRegistratorStore } from 'src/entities/Registrator'
+  import { useCreateUser } from 'src/features/User/CreateUser'
+
+  // Импортируем класс
+  import { Classes } from '@coopenomics/sdk'
+
+  const store = useRegistratorStore()
+  const createUser = useCreateUser()
+
+  const around = ref<HTMLElement | null>(null)
+  const onSign = ref(false)
+  const loadingText = ref('')
+
+  // Экземпляр Canvas
+  let canvasClass: Classes.Canvas | null = null
+
+  /**
+   * Инициализация Canvas с задержкой
+   */
+  const initCanvas = () => {
+
+    // Ждём 200ms, чтобы Quasar завершил рендеринг
+    setTimeout(() => {
+      if (around.value)
+        canvasClass = new Classes.Canvas(around.value, {
+          lineWidth: 5,
+          strokeStyle: '#000',
+        })
+    }, 200)
   }
 
+  /**
+   * Следим за текущим шагом
+   */
+  watch(
+    () => store.state.step,
+    (newStep) => {
+      if (newStep === store.steps.SignStatement) {
+        nextTick(() => initCanvas())
+      }
+    }
+  )
+
+  /**
+   * Если при загрузке уже SignStatement — инициализируем
+   */
+  onMounted(() => {
+    if (store.state.step === store.steps.SignStatement) {
+      nextTick(() => initCanvas())
+    }
+  })
 
-  const imgData = context.getImageData(0, 0, canvas.value.width, canvas.value.height).data
-  const isEmpty = !imgData.some((channel) => channel !== 0)
-  const sign = canvas.value.toDataURL('image/png')
+  /**
+   * При размонтировании снимаем слушатели
+   */
+  onBeforeUnmount(() => {
+    canvasClass?.destroy()
+  })
 
-  if (!sign || isEmpty) {
-    FailAlert('Пожалуйста, оставьте собственноручную подпись в окне')
-    return
+  /**
+   * Очистка холста
+   */
+  const clearCanvas = () => {
+    canvasClass?.clearCanvas()
   }
 
-  try {
-    onSign.value = true
-    store.state.signature = sign
-
-    loadingText.value = 'Подписываем положение о ЦПП "Цифровой Кошелёк"'
-
-    await createUser.signWalletAgreement()
-
-    loadingText.value = 'Подписываем соглашение о политике конфиденциальности'
-
-    await createUser.signPrivacyAgreement()
-
-    loadingText.value = 'Подписываем соглашение о порядке и правилах использования ЭЦП'
-
-    await createUser.signSignatureAgreement()
-
-    loadingText.value = 'Подписываем пользовательское соглашение'
-
-    await createUser.signUserAgreement()
-
-    loadingText.value = 'Подписываем заявление'
-
-    await createUser.signStatement()
-
-    //посылаем
-    await createUser.sendStatementAndAgreements()
-    loadingText.value = ''
-
-    onSign.value = false
-    store.next()
-  } catch (e: any) {
-    onSign.value = false
-    FailAlert(e.message)
-  }
+  /**
+   * Получение подписи + проверка пустоты
+   */
+  const setSignature = async () => {
+    if (!canvasClass) {
+      Notify.create({
+        message: 'Пожалуйста, оставьте собственноручную подпись в окне',
+        color: 'negative',
+      })
+      return
+    }
 
+    const sign = canvasClass.getSignature()
+    // Проверим, есть ли хоть один ненулевой пиксель
+    const ctx = canvasClass.ctx
+    const { width, height } = canvasClass.canvas
+    const data = ctx.getImageData(0, 0, width, height).data
+    const isEmpty = !data.some((channel) => channel !== 0)
 
-}
+    if (!sign || isEmpty) {
+      FailAlert('Пожалуйста, оставьте собственноручную подпись в окне')
+      return
+    }
 
-const init = (): void => {
-  prepareCanvas()
-}
+    try {
+      onSign.value = true
+      store.state.signature = sign
 
-watch(() => store.state.step, (newStep) => {
-  if (newStep == store.steps.SignStatement) {
-    init()
-  }
-})
+      loadingText.value = 'Подписываем положение о ЦПП "Цифровой Кошелёк"'
+      await createUser.signWalletAgreement()
 
-window.addEventListener('resize', () => {
-  prepareCanvas()
-})
+      loadingText.value = 'Подписываем соглашение о политике конфиденциальности'
+      await createUser.signPrivacyAgreement()
 
-onBeforeMount(() => {
-  window.removeEventListener('resize', prepareCanvas)
-})
+      loadingText.value = 'Подписываем соглашение о порядке и правилах использования ЭЦП'
+      await createUser.signSignatureAgreement()
 
-onMounted(() => {
-  init()
-})
+      loadingText.value = 'Подписываем пользовательское соглашение'
+      await createUser.signUserAgreement()
 
-const prepareCanvas = (): void => {
-  nextTick(() => {
-    windowWidth.value = around.value?.offsetWidth || 0
-    windowHeight.value = around.value?.offsetHeight || 0
+      loadingText.value = 'Подписываем заявление'
+      await createUser.signStatement()
 
-    context = canvas.value?.getContext('2d') ?? null
+      // Отправка
+      await createUser.sendStatementAndAgreements()
 
-    if (context) {
-      if (canvas.value) {
-        canvas.value.width = windowWidth.value || 0
-        canvas.value.height = windowHeight.value || 0
-      }
-      context.strokeStyle = 'grey'
-      context.lineWidth = 5
-      context.lineJoin = 'round'
-      context.lineCap = 'round'
-      context.strokeStyle = '#000'
+      loadingText.value = ''
+      onSign.value = false
+      store.next()
+    } catch (err: any) {
+      onSign.value = false
+      FailAlert(err.message)
     }
-  })
-}
-
-const clearCanvas = (): void => {
-  context?.clearRect(0, 0, canvas.value?.width || 0, canvas.value?.height || 0)
-}
-
-const startDrawing = (e: MouseEvent | TouchEvent): void => {
-  e.preventDefault()
-  drawing.value = true
-  const rect = canvas.value?.getBoundingClientRect()
-  lastX =
-    e instanceof MouseEvent
-      ? e.clientX - (rect?.left || 0)
-      : e.touches[0].clientX - (rect?.left || 0)
-  lastY =
-    e instanceof MouseEvent ? e.clientY - (rect?.top || 0) : e.touches[0].clientY - (rect?.top || 0)
-}
-
-const endDrawing = (): void => {
-  drawing.value = false
-}
-
-const draw = (e: MouseEvent | TouchEvent): void => {
-  e.preventDefault()
-  if (!drawing.value) return
-  context?.beginPath()
-  context?.moveTo(lastX, lastY)
-  const rect = canvas.value?.getBoundingClientRect()
-  const x =
-    e instanceof MouseEvent
-      ? e.clientX - (rect?.left || 0)
-      : e.touches[0].clientX - (rect?.left || 0)
-  const y =
-    e instanceof MouseEvent ? e.clientY - (rect?.top || 0) : e.touches[0].clientY - (rect?.top || 0)
-  context?.lineTo(x, y)
-  context?.stroke()
-  lastX = x
-  lastY = y
-}
-</script>
+  }
+  </script>

package/src/widgets/Desktop/SecondLevelMenuList/SecondLevelMenuList.vue

@@ -25,7 +25,7 @@ q-list(
   import { useRoute, useRouter } from 'vue-router';
   import { useDesktopStore } from 'src/entities/Desktop/model';
   import { type IRoute } from 'src/entities/Desktop/model/types';
-import { COOPNAME } from 'src/shared/config';
+  import { COOPNAME } from 'src/shared/config';
 
   const desktop = useDesktopStore()
   const routes = ref<IRoute[]>([])
@@ -33,11 +33,41 @@ import { COOPNAME } from 'src/shared/config';
   const router = useRouter()
   const user = useCurrentUserStore()
 
+  const evaluateCondition = (condition: string, context: Record<string, any>): boolean => {
+    try {
+      const func = new Function(...Object.keys(context), `return ${condition};`);
+      return func(...Object.values(context));
+    } catch (error) {
+      console.error('Error evaluating condition:', error);
+      return false;
+    }
+  };
+
   const init = () => {
+    const isCoop = user.userAccount?.type === 'organization' &&
+      user.userAccount?.private_data &&
+      'type' in user.userAccount.private_data &&
+      user.userAccount.private_data.type === 'coop';
+
     const userRole = user.userAccount?.role || 'user';
+
+    const context = {
+      isCoop,
+      userRole,
+      userAccount: user.userAccount,
+      coopname: COOPNAME,
+      // любые другие свойства, которые нужно использовать в условиях
+    };
+
     routes.value = (desktop.getSecondLevel(route) as unknown as IRoute[]).filter(
-      (route) => route.meta?.roles?.includes(userRole) || route.meta?.roles?.length === 0
-    );
+    (route) => {
+      const rolesMatch = route.meta?.roles?.includes(userRole) || route.meta?.roles?.length === 0;
+      const conditionMatch = route.meta?.conditions
+        ? evaluateCondition(route.meta.conditions, context)
+        : true; // Если условия нет, пропускаем проверку
+      return rolesMatch && conditionMatch;
+    }
+  );
   }
 
   // Функция проверки активного маршрута

package/src/widgets/Header/SettingsDropdown/SettingsDropdown.vue

@@ -9,7 +9,7 @@ q-btn-dropdown(flat :size="isMobile ? 'sm' : 'md'" :dense="isMobile" stretch ico
           q-icon(name="fa-solid fa-wrench").q-mr-sm
           span.font10px НАСТРОЙКИ ПАЙЩИКА
 
-    q-item(v-if="loggedIn && isChairman" flat clickable v-close-popup @click="open('members')")
+    q-item(v-if="loggedIn && (isChairman || isMember)" flat clickable v-close-popup @click="open('members')")
       q-item-section
         q-item-label
           q-icon(name="fa-solid fa-hammer").q-mr-sm