@coopenomics/desktop 2.2.9 → 2025.4.29

package/.env-example

@@ -1,3 +1,8 @@
-SITE_TITLE=Цифровой Кооператив
+NODE_ENV=development
+BACKEND_URL=http://127.0.0.1:2998
+CHAIN_URL=http://127.0.0.1:8888
+CHAIN_ID=f50256680336ee6daaeee93915b945c1166b5dfc98977adcb717403ae225c559
+CURRENCY=RUB
+COOP_SHORT_NAME=Локальный Кооператив
 SITE_DESCRIPTION=кооперативная экономика для сообществ и бизнеса
 SITE_IMAGE=https://ia.media-imdb.com/images/rock.jpg

package/.env-testnet

@@ -0,0 +1,8 @@
+NODE_ENV=development
+BACKEND_URL=https://testnet.coopenomics.world/backend
+CHAIN_URL=https://api-testnet.coopenomics.world
+CHAIN_ID=f0364a3f9fd913081f1c0b05c6f8f50a59b2ba60bb928cb321ba3a9a36316624
+CURRENCY=RUB
+COOP_SHORT_NAME=Цифровой Кооператив
+SITE_DESCRIPTION=кооперативная экономика для сообществ и бизнеса
+SITE_IMAGE=https://ia.media-imdb.com/images/rock.jpg

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.10](https://github.com/coopenomics/mono/compare/v2.2.9...v2.2.10) (2025-03-27)
+
+
+### Bug Fixes
+
+* add Zeus type ([7bcb6e3](https://github.com/coopenomics/mono/commit/7bcb6e30a77b0ab89c5293188b58f08f19c8761e))
+
+
+
+
+
 ## [2.2.9](https://github.com/coopenomics/mono/compare/v2.2.8...v2.2.9) (2025-03-12)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:20-slim AS base
+
+# Устанавливаем PNPM напрямую без Corepack
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
+RUN npm install -g pnpm@8.15.4
+
+WORKDIR /app
+
+COPY package.json ./
+RUN pnpm install

package/extensions/market/install.ts

@@ -0,0 +1,78 @@
+import { markRaw } from 'vue'
+import { ShowcasePage } from 'src/pages/Marketplace/Showcase'
+import { CreateParentOfferPage } from 'src/pages/Marketplace/CreateParentOffer'
+import { UserParentOffersPage } from 'src/pages/Marketplace/UserParentOffers'
+import { UserSuppliesListPage } from 'src/pages/Marketplace/UserSuppliesList'
+
+export default async function () {
+  return {
+    workspace: 'market',
+    routes: [
+      {
+        meta: {
+          title: 'Стол заказов',
+          icon: 'fa-solid fa-shop',
+          roles: [],
+        },
+        path: '/:coopname/market',
+        name: 'market',
+        children: [
+          {
+            path: 'showcase',
+            name: 'marketplace-showcase',
+            component: markRaw(ShowcasePage),
+            children: [
+              {
+                path: ':id',
+                name: 'marketplace-showcase-id',
+                component: markRaw(ShowcasePage),
+              },
+            ],
+            meta: {
+              title: 'Витрина',
+              icon: '',
+              roles: [],
+            },
+          },
+          {
+            path: 'create-offer',
+            name: 'marketplace-create-offer',
+            component: markRaw(CreateParentOfferPage),
+            meta: {
+              title: 'Создать объявление',
+              icon: '',
+              roles: [],
+            },
+          },
+          {
+            path: 'user-offers',
+            name: 'marketplace-user-offers',
+            component: markRaw(UserParentOffersPage),
+            children: [
+              {
+                path: ':id',
+                name: 'marketplace-user-offer-id',
+                component: markRaw(UserParentOffersPage),
+              },
+            ],
+            meta: {
+              title: 'Мои объявления',
+              icon: '',
+              roles: [],
+            },
+          },
+          {
+            path: 'user-supplies',
+            name: 'marketplace-user-supplies',
+            component: markRaw(UserSuppliesListPage),
+            meta: {
+              title: 'Мои заказы',
+              icon: '',
+              roles: [],
+            },
+          },
+        ]
+      }
+    ]
+  }
+}

package/extensions/market-admin/install.ts

@@ -0,0 +1,42 @@
+import { markRaw } from 'vue'
+import { ModerationPage } from 'src/pages/Marketplace/Moderation'
+import { SuppliesListPage } from 'src/pages/Marketplace/SuppliesList'
+
+export default async function () {
+  return {
+    workspace: 'market-admin',
+    routes: [
+      {
+        meta: {
+          title: 'Стол администратора',
+          icon: 'fa-solid fa-shop-lock',
+          roles: ['chairman', 'member'],
+        },
+        path: '/:coopname/market-admin',
+        name: 'market-admin',
+        children: [
+          {
+            path: 'moderation',
+            name: 'marketplace-moderation',
+            component: markRaw(ModerationPage),
+            meta: {
+              title: 'Модерация',
+              icon: '',
+              roles: ['member', 'chairman'],
+            },
+          },
+          {
+            path: 'supplies',
+            name: 'marketplace-supplies',
+            component: markRaw(SuppliesListPage),
+            meta: {
+              title: 'Все заказы',
+              icon: '',
+              roles: ['member', 'chairman'],
+            },
+          },
+        ]
+      }
+    ]
+  }
+}

package/extensions/participant/install.ts

@@ -0,0 +1,125 @@
+import { markRaw } from 'vue'
+import { ProfilePage } from 'src/pages/User/ProfilePage'
+import { WalletPage } from 'src/pages/User/WalletPage'
+import { ConnectionAgreementPage } from 'src/pages/Union/ConnectionAgreement'
+import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage'
+import { ContactsPage } from 'src/pages/Contacts'
+// import { ListOfMeetsPage } from 'src/pages/Cooperative/ListOfMeets'
+// import { MeetDetailsPage } from 'src/pages/Cooperative/MeetDetails'
+import { UserDocumentsPage } from 'src/pages/User/DocumentsPage'
+import { UserPaymentsPage } from 'src/pages/User/PaymentsPage'
+import { agreementsBase } from 'src/shared/lib/consts/workspaces'
+
+export default async function () {
+  return {
+    workspace: 'participant',
+    routes: [
+      {
+        meta: {
+          title: 'Стол пайщика',
+          icon: 'fa-solid fa-id-card',
+          roles: ['user', 'chairman', 'member'],
+        },
+        path: '/:coopname/user',
+        name: 'participant',
+        children: [
+          {
+            meta: {
+              title: 'Мой Профиль',
+              icon: 'fa-solid fa-user',
+              roles: [],
+              agreements: agreementsBase
+            },
+            path: 'profile',
+            name: 'profile',
+            component: markRaw(ProfilePage),
+            children: [],
+          },
+          {
+            meta: {
+              title: 'Мой Кошелёк',
+              icon: 'fa-solid fa-wallet',
+              roles: [],
+              agreements: agreementsBase
+            },
+            path: 'wallet',
+            name: 'wallet',
+            component: markRaw(WalletPage),
+            children: [],
+          },
+          {
+            meta: {
+              title: 'Моё Подключение',
+              icon: 'fas fa-link',
+              roles: ['user'],
+              conditions: 'isCoop === true && coopname === "voskhod"',
+            },
+            path: '/:coopname/connect',
+            name: 'connect',
+            component: markRaw(ConnectionAgreementPage),
+          },
+          {
+            meta: {
+              title: 'Мои Реквизиты',
+              icon: 'fas fa-link',
+              roles: ['user', 'member', 'chairman']
+            },
+            path: '/:coopname/connect',
+            name: 'payment-methods',
+            component: markRaw(UserPaymentMethodsPage),
+          },
+          {
+            meta: {
+              title: 'Мои Документы',
+              icon: 'fa-solid fa-file-invoice',
+              roles: ['user', 'member', 'chairman'],
+            },
+            path: 'documents',
+            name: 'user-documents',
+            component: markRaw(UserDocumentsPage),
+          },
+          {
+            meta: {
+              title: 'Мои Платежи',
+              icon: 'fa-solid fa-money-bill-transfer',
+              roles: ['user', 'member', 'chairman'],
+            },
+            path: 'payments',
+            name: 'user-payments',
+            component: markRaw(UserPaymentsPage),
+          },
+          // {
+          //   meta: {
+          //     title: 'Мои Собрания',
+          //     icon: 'fa-solid fa-users-between-lines',
+          //     roles: ['user', 'member', 'chairman'],
+          //   },
+          //   path: 'meets',
+          //   name: 'user-meets',
+          //   component: markRaw(ListOfMeetsPage),
+          //   children: [
+          //     {
+          //       path: ':hash',
+          //       name: 'user-meet-details',
+          //       component: markRaw(MeetDetailsPage),
+          //       meta: {
+          //         test: true
+          //       }
+          //     },
+          //   ],
+          // },
+          {
+            path: '/:coopname/contacts',
+            name: 'contacts',
+            component: markRaw(ContactsPage),
+            meta: {
+              title: 'Наши Контакты',
+              icon: 'fa-solid fa-info',
+              roles: [],
+            },
+          },
+        ]
+      }
+    ]
+  }
+}

package/extensions/powerup/install.ts

@@ -0,0 +1,20 @@
+import { markRaw } from 'vue'
+import Page from './src/Powerup.vue'
+
+export default async function () {
+  return {
+    workspace: 'powerup',
+    routes: [
+      {
+        path: '/powerup',
+        name: 'powerup',
+        component: markRaw(Page),
+        meta: {
+          title: 'Power Up',
+          icon: 'fa-bolt',
+          roles: []
+        }
+      }
+    ]
+  }
+}

package/extensions/soviet/install.ts

@@ -0,0 +1,83 @@
+import { markRaw } from 'vue'
+import { ListOfAgendaQuestions } from 'src/pages/Cooperative/ListOfAgenda'
+import { ListOfParticipantsPage } from 'src/pages/Cooperative/ListOfParticipants'
+import { ListOfDocumentsPage } from 'src/pages/Cooperative/ListOfDocuments'
+import { PaymentsPage } from 'src/pages/Cooperative/Payments'
+// import { ListOfMeetsPage } from 'src/pages/Cooperative/ListOfMeets'
+// import { MeetDetailsPage } from 'src/pages/Cooperative/MeetDetails'
+
+export default async function () {
+  return {
+    workspace: 'soviet',
+    routes: [
+      {
+        meta: {
+          title: 'Стол совета',
+          icon: 'fa-regular fa-circle',
+          roles: ['chairman', 'member'],
+        },
+        path: '/:coopname/soviet',
+        name: 'soviet',
+        children: [
+          {
+            path: 'agenda',
+            name: 'agenda',
+            component: markRaw(ListOfAgendaQuestions),
+            meta: {
+              title: 'Повестка',
+              icon: 'fa-solid fa-check-to-slot',
+              roles: ['chairman', 'member'],
+            },
+          },
+          {
+            path: 'participants',
+            name: 'participants',
+            component: markRaw(ListOfParticipantsPage),
+            meta: {
+              title: 'Пайщики',
+              icon: 'fa-solid fa-users',
+              roles: ['chairman', 'member'],
+            },
+          },
+          {
+            path: 'documents',
+            name: 'documents',
+            component: markRaw(ListOfDocumentsPage),
+            meta: {
+              title: 'Документы',
+              icon: 'fa-solid fa-file-invoice',
+              roles: ['chairman', 'member'],
+            },
+          },
+          {
+            path: 'payments/:username?',
+            name: 'payments',
+            component: markRaw(PaymentsPage),
+            meta: {
+              title: 'Платежи',
+              icon: 'fa-solid fa-file-invoice',
+              roles: ['chairman', 'member'],
+            },
+          },
+          // {
+          //   path: 'meets',
+          //   name: 'meets',
+          //   component: markRaw(ListOfMeetsPage),
+          //   meta: {
+          //     title: 'Собрания',
+          //     icon: 'fa-solid fa-users-between-lines',
+          //     roles: ['chairman', 'member'],
+          //   },
+          //   children: [
+          //     {
+          //       path: ':hash',
+          //       name: 'meet-details',
+          //       component: markRaw(MeetDetailsPage),
+          //     },
+          //   ],
+          // },
+        ]
+      }
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.9",
+  "version": "2025.4.29",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -15,13 +15,14 @@
     "format": "prettier --write \"**/*.{js,ts,vue,scss,html,md,json}\" --ignore-path .gitignore",
     "test": "echo \"No test specified\" && exit 0",
     "dev": "concurrently -n 'DESKTOP' -c 'bgRed.white' \"quasar dev\"",
+    "devnet": "quasar dev",
     "build:lib": "vite build",
     "build": "quasar build",
     "prepublishOnly": "npm run build:lib"
   },
   "dependencies": {
-    "@coopenomics/controller": "2.2.9",
-    "@coopenomics/sdk": "2.2.9",
+    "@coopenomics/controller": "2025.4.29",
+    "@coopenomics/sdk": "2025.4.29",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -45,7 +46,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2.2.9",
+    "cooptypes": "2025.4.29",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -94,5 +95,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "51d736eba49ce8aaea6e58c40772254c0c194f46"
+  "gitHead": "397670473ae57d53b0b48cd1c3bc6e2d531015fa"
 }

package/quasar.config.cjs

@@ -10,17 +10,12 @@
 require('dotenv').config();
 const { configure } = require('quasar/wrappers');
 const path = require('path');
-const glob = require('glob')
 
 module.exports = configure(function (/* ctx */) {
-  // Ищем все boot файлы в директории extensions
-  const extensionBootFiles = glob
-    .sync('extensions/**/boot.{ts,js}') // Ищем файлы с расширениями .ts и .js
-    .map(file => '../../' + file.replace(/\.(ts|js)$/, '')) // Добавляем ../../ и убираем расширение
 
   return {
     htmlVariables: {
-      SITE_TITLE: process.env.SITE_TITLE || 'Цифровой Кооператив',
+      SITE_TITLE: process.env.COOP_SHORT_NAME || 'Цифровой Кооператив',
       SITE_DESCRIPTION:
         process.env.SITE_DESCRIPTION ||
         'кооперативная экономика для сообществ и бизнеса',
@@ -34,11 +29,8 @@ module.exports = configure(function (/* ctx */) {
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli-vite/boot-files
     boot: [
-      'init-stores',
-      'navigation-guards',
-      'i18n', 'axios', 'sentry',
-      'branch-selector',
-      ...extensionBootFiles
+      'init',
+      'i18n', 'axios', 'sentry'
     ],
 
     // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
@@ -128,7 +120,8 @@ module.exports = configure(function (/* ctx */) {
       open: false, // opens browser window automatically
       port: 3005,
       hmr:{
-        overlay: false
+        clientPort: 3005,
+      //   overlay: false
       }
     },
 

package/src/app/App.vue

@@ -1,87 +1,58 @@
-<template lang='pug'>
+<template lang="pug">
 div(v-if="isLoaded").breable-text
   router-view
   RequireAgreements
   SelectBranchOverlay
 </template>
-<script setup lang="ts">
-import { onMounted, ref, watch } from 'vue'
-import { FailAlert } from 'src/shared/api/alerts'
-import { handleException } from 'src/shared/api';
-import { useRoute } from 'vue-router'
-import 'src/app/styles/quasar-variables.sass'
-import { useDesktopStore } from 'src/entities/Desktop/model';
-import { Cookies, LocalStorage, QSpinnerGears, useQuasar } from 'quasar';
 
-import { RequireAgreements } from 'src/widgets/Agreementer/RequireAgreements/ui';
-import { SelectBranchOverlay } from 'src/features/Branch/SelectBranch';
-import { useSystemStore } from 'src/entities/System/model';
-const { info } = useSystemStore()
-
-const $q = useQuasar()
-
-const route = useRoute()
-const desktop = useDesktopStore()
-
-const isLoaded = ref(false)
-
-const enableLoading = () => {
-  $q.loading.show({
-    spinner: QSpinnerGears,
-    message: 'Техническое обслуживание..',
-    spinnerSize: 50,
+  <script setup lang="ts">
+  import { onMounted, ref } from 'vue'
+  import { useRoute } from 'vue-router'
+  import { Cookies, LocalStorage } from 'quasar'
+  import { FailAlert } from 'src/shared/api/alerts'
+  import { handleException } from 'src/shared/api'
+  import { RequireAgreements } from 'src/widgets/RequireAgreements'
+  import { SelectBranchOverlay } from 'src/features/Branch/SelectBranch'
+  import { useSystemStore } from 'src/entities/System/model'
+  import { useDesktopHealthWatcherProcess } from 'src/processes/watch-desktop-health'
+
+  const { info } = useSystemStore()
+  const route = useRoute()
+  const isLoaded = ref(false)
+
+  // запускаем процесс мониторинга "технического обслуживания"
+  useDesktopHealthWatcherProcess()
+
+  onMounted(() => {
+    try {
+      removeLoader()
+      isLoaded.value = true
+
+      const ref = Cookies.get('referer') || String(route.query.r || '')
+      if (ref) {
+        LocalStorage.setItem(`${info.coopname}:referer`, ref)
+      }
+    } catch (e) {
+      console.error(e)
+      handleException(e)
+      isLoaded.value = true
+      removeLoader()
+    }
   })
-}
-
-const disableLoading = () => {
-  $q.loading.hide()
-}
-
-const onlineCheck = () => {
-  if (desktop.online === false) {
-    enableLoading()
-  } else {
-    disableLoading()
-  }
-}
 
-onlineCheck()
-
-// Watch the online status
-watch(() => desktop.online, () => onlineCheck())
-
-onMounted(async () => {
-  try {
-    removeLoader()
-    isLoaded.value = true
-
-    const ref = Cookies.get('referer') || String(route.query.r || '')
-
-    if (ref) {
-      LocalStorage.setItem(`${info.coopname}:referer`, ref)
+  function removeLoader() {
+    const loaderContainer = document.querySelector('.loader-container')
+    if (loaderContainer) {
+      loaderContainer.remove()
+    } else {
+      FailAlert('Возникла ошибка при загрузке сайта :(')
     }
-  } catch (e: unknown) {
-
-    console.error(e)
-    handleException(e)
-    // router.push({ name: 'somethingBad' })
-    isLoaded.value = true
-    removeLoader()
   }
-
-})
-
-function removeLoader() {
-  const loaderContainer = document.querySelector('.loader-container')
-  if (loaderContainer) {
-    loaderContainer.remove()
-  } else {
-    FailAlert('Возникла ошибка при загрузке сайта :(')
-  }
-}
 </script>
 <style>
 .q-loading__backdrop {
-  opacity: 1 !important
+  /* стиль полного оверлея технического обслуживания */
+  opacity: 1 !important;
 }
-</style>
+
+</style>

package/src/app/layouts/default.vue

@@ -0,0 +1,40 @@
+<template lang="pug">
+  q-layout(view="lHh LpR fff")
+    Header(:showDrawer="showDrawer" @toggle-left-drawer="toggleLeftDrawer")
+
+    q-drawer(v-if="showDrawer" v-model="leftDrawerOpen" side="left" bordered :width="200")
+      LeftDrawerMenu
+
+    q-footer(v-if="!loggedIn" :class="headerClass" bordered)
+      ContactsFooter(:text="footerText")
+
+    q-page-container
+      q-page
+        router-view
+  </template>
+
+  <script setup lang="ts">
+  import { Header } from 'src/widgets/Header/CommonHeader'
+  import { LeftDrawerMenu } from 'src/widgets/Desktop/LeftDrawerMenu'
+  import { ContactsFooter } from 'src/shared/ui/Footer'
+  import { useDefaultLayoutLogic} from './useDefaultLayoutLogic'
+
+  const {
+    leftDrawerOpen,
+    showDrawer,
+    headerClass,
+    footerText,
+    loggedIn,
+    toggleLeftDrawer,
+  } = useDefaultLayoutLogic()
+  </script>
+
+  <style lang="scss">
+  .drawer-right {
+    border-left: 1px solid #00800038 !important;
+  }
+
+  .drawer-left {
+    border-right: 1px solid #00800038 !important;
+  }
+  </style>