npm - @coopenomics/desktop - Versions diffs - 2025.5.13 → 2025.5.14-1 - Mend

@coopenomics/desktop 2025.5.13 → 2025.5.14-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/index.html CHANGED Viewed

@@ -20,6 +20,25 @@
     <meta property="og:image" content="<%- SITE_IMAGE %>" />
   </head>
   <body>
+    <script>
+      try {
+        var theme = localStorage.getItem('theme-mode');
+        if (theme === 'dark') {
+          document.body.style.background = '#121212';
+        } else if (theme === 'light') {
+          document.body.style.background = '#f5f5f5';
+        }
+      } catch (e) {
+        console.log('error on set theme', e);
+      }
+      // Показываем лоадер только после того, как DOM готов
+      document.addEventListener('DOMContentLoaded', function() {
+        try {
+          var loader = document.querySelector('.loader-container');
+          if (loader) loader.style.display = 'flex';
+        } catch (e) {}
+      });
+    </script>
     <style>
       body {
         margin: 0;
@@ -42,7 +61,7 @@
       }
       .loader-container {
-        display: flex;
+        display: none;
         justify-content: center;
         align-items: center;
         height: 100%;
@@ -57,7 +76,7 @@
         border-radius: 50%;
         position: relative;
         animation: rotate 2s linear infinite;
-        border-top: 3px solid black;
+        border-top: 3px solid rgb(131, 130, 130);
         border-right: 3px solid transparent;
       }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.5.13",
+  "version": "2025.5.14-1",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -24,8 +24,8 @@
     "start": "node -r ./alias-resolver.js dist/ssr/index.js"
   },
   "dependencies": {
-    "@coopenomics/controller": "2025.5.13",
-    "@coopenomics/sdk": "2025.5.13",
+    "@coopenomics/controller": "2025.5.14-1",
+    "@coopenomics/sdk": "2025.5.14-1",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -49,7 +49,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2025.5.13",
+    "cooptypes": "2025.5.14-1",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -101,5 +101,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "a09959d75164067d5a5a507a3554787d88ed45d3"
+  "gitHead": "9d204ba496638eb0ecf93d585273dbf57687f2ec"
 }

package/src/entities/Registrator/model/store.ts CHANGED Viewed

@@ -21,6 +21,7 @@ const initialAccountState: IGeneratedAccount = {
 const initialUserDataState: IRegisterAccount = {
   email: '',
   username: '',
+  public_key: '',
   type: AccountTypes.individual,
   individual_data: {
     first_name: '',

package/src/entities/Wallet/api/index.ts CHANGED Viewed

@@ -147,8 +147,9 @@ async function loadMethods(params: IGetPaymentMethods): Promise<IPaymentMethodDa
 }
 async function loadUserAgreements(coopname: string, username: string): Promise<SovietContract.Tables.Agreements.IAgreement[]> {
-  return (
-    await fetchTable(
+    console.log('coopname: ', coopname, 'username: ', username)
+    const result = await fetchTable(
       SovietContract.contractName.production,
       coopname,
       SovietContract.Tables.Agreements.tableName,
@@ -157,7 +158,8 @@ async function loadUserAgreements(coopname: string, username: string): Promise<S
       LimitsList.None,
       'secondary'
     )
-  ) as SovietContract.Tables.Agreements.IAgreement[];
+    console.log('result: ', result)
+    return result as SovietContract.Tables.Agreements.IAgreement[];
 }

package/src/processes/init-app/index.ts CHANGED Viewed

@@ -5,8 +5,10 @@ import type { Router } from 'vue-router'
 import { useBranchOverlayProcess } from '../watch-branch-overlay'
 import { setupNavigationGuard } from '../navigation-guard-setup'
 import { useInitExtensionsProcess } from 'src/processes/init-installed-extensions'
+import { applyThemeFromStorage } from 'src/shared/lib/utils'
 export async function useInitAppProcess(router: Router) {
+  applyThemeFromStorage()
   const system = useSystemStore()
   await system.loadSystemInfo()

package/src/shared/lib/utils/account.ts ADDED Viewed

@@ -0,0 +1,24 @@
+import {
+  AccountTypes,
+  type IAccount,
+} from 'src/entities/Account/types'
+/**
+ * Функция для получения отформатированного имени участника
+ * @param account - объект аккаунта пользователя
+ * @returns форматированное имя/наименование
+ */
+export const getName = (account: IAccount) => {
+  const d = account.private_account
+  if (!d) return ''
+  switch (d.type) {
+    case AccountTypes.individual:
+      return `${d.individual_data?.last_name} ${d.individual_data?.first_name} ${d.individual_data?.middle_name}`
+    case AccountTypes.entrepreneur:
+      return `ИП ${d.entrepreneur_data?.last_name} ${d.entrepreneur_data?.first_name} ${d.entrepreneur_data?.middle_name}`
+    case AccountTypes.organization:
+      return d.organization_data?.short_name
+    default:
+      return ''
+  }
+}

package/src/shared/lib/utils/index.ts CHANGED Viewed

@@ -4,3 +4,5 @@ export * from './notEmptyPhoneRule'
 export * from './notEmptyRule'
 export * from './isDomainRule'
 export * from './validatePersonalNameRule'
+export * from './account'
+export * from './theme'

package/src/shared/lib/utils/theme.ts ADDED Viewed

@@ -0,0 +1,30 @@
+import { LocalStorage } from 'quasar';
+import { Dark } from 'quasar';
+const THEME_KEY = 'theme-mode';
+export function saveThemeToStorage(isDark: boolean) {
+  if (process.env.CLIENT) {
+    LocalStorage.set(THEME_KEY, isDark ? 'dark' : 'light');
+  }
+}
+export function getThemeFromStorage(): 'dark' | 'light' | null {
+  if (process.env.CLIENT) {
+    const saved = LocalStorage.getItem(THEME_KEY);
+    if (saved === 'dark' || saved === 'light') return saved;
+    return null;
+  }
+  return null;
+}
+export function applyThemeFromStorage() {
+  if (process.env.CLIENT) {
+    const saved = getThemeFromStorage();
+    if (saved === 'dark') {
+      Dark.set(true);
+    } else if (saved === 'light') {
+      Dark.set(false);
+    }
+  }
+}

package/src/shared/ui/ToogleDarkLight/ToogleDarkLight.vue CHANGED Viewed

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-item(flat clickable @click="$q.dark.toggle()")
+q-item(flat clickable @click="toggleTheme")
   q-item-section
     q-item-label
       q-icon(:name="isDark ? 'brightness_7' : 'brightness_3'").q-mr-sm
@@ -11,9 +11,11 @@ q-item(flat clickable @click="$q.dark.toggle()")
 import { useQuasar } from 'quasar';
 import { computed } from 'vue';
+import { saveThemeToStorage } from 'src/shared/lib/utils';
 const $q = useQuasar()
 const isDark = computed(() => $q.dark.isActive)
 defineProps({
   isMobile: {
     type: Boolean,
@@ -26,6 +28,11 @@ defineProps({
     required: false
   }
 })
+function toggleTheme() {
+  $q.dark.toggle();
+  saveThemeToStorage($q.dark.isActive);
+}
 </script>
 <style scoped>
 .btn-font {

package/src/widgets/Cooperative/Documents/ListOfDocuments/ui/DocumentsTable.vue CHANGED Viewed

@@ -53,6 +53,7 @@ div.scroll-area(style="height: 90vh; overflow-y: auto;")
         q-td {{ getDocumentTitle(props.row) }}
       q-tr(
+        no-hover
         v-if="expanded.get(props.row?.id || props.row?.statement?.action?.global_sequence)"
         :key="`e_${props.row?.id || props.row?.statement?.action?.global_sequence}`"
         :props="props"

package/src/widgets/Cooperative/Payments/ListOfPayments/ui/ListOfPaymentsWidget.vue CHANGED Viewed

@@ -29,7 +29,6 @@
               :hideActions="hideActions"
               @toggle-expand="toggleExpand(props.row.id)"
             )
           template(#header="props")
             q-tr(:props="props")
               q-th(auto-width)
@@ -51,14 +50,12 @@
                   :icon="expanded.get(props.row.id) ? 'remove' : 'add'"
                   @click="toggleExpand(props.row.id)"
                 )
-              q-td {{props.row.id}}
-              q-td {{ props.row.amount }}
-              q-td
-                q-badge(v-if="props.row.type === 'registration'" color="teal") регистрационный
-                q-badge(v-else color="teal") паевой
-              q-td(style="max-width: 150px; word-wrap: break-word; white-space: normal;") {{props.row.username}}
+              q-td(style="max-width: 150px; word-wrap: break-word; white-space: normal;") {{ getName(props.row.account) }}
+              q-td {{ props.row.amount }} {{props.row.symbol}}
+              q-td
+                span(v-if="props.row.type === 'registration'") регистрационный
+                span(v-else) паевой
               q-td
                 q-badge(v-if="props.row.status ==='COMPLETED'" color="teal") обработан
@@ -88,6 +85,7 @@
   import { SetOrderPaidStatusButton } from 'src/features/Payment/SetStatus/ui/SetOrderPaidStatusButton';
   import PaymentCard from './PaymentCard.vue';
   import { useWindowSize } from 'src/shared/hooks';
+  import { getName } from 'src/shared/lib/utils';
   const paymentStore = usePaymentStore()
   const payments = computed(() => paymentStore.payments)
@@ -190,10 +188,11 @@
   const columns: any[] = [
-    { name: 'id', align: 'left', label: '№', field: 'id', sortable: true },
+    // { name: 'id', align: 'left', label: '№', field: 'id', sortable: true },
+    { name: 'account', align: 'left', label: 'От кого', field: 'account', sortable: true },
     { name: 'amount', align: 'left', label: 'Сумма', field: 'amount', sortable: true },
     { name: 'type', align: 'left', label: 'Тип платежа', field: '', sortable: false },
-    { name: 'username', align: 'left', label: 'От кого', field: 'username', sortable: true },
+    // { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
     { name: 'status', align: 'left', label: 'Статус', field: 'status', sortable: true },
     { name: 'actions', align: 'left', label: '', field: '', sortable: false, hide: props.hideActions },
   ] as any

package/src/widgets/Participants/ui/ParticipantCard.vue CHANGED Viewed

@@ -5,12 +5,20 @@ div.q-pa-xs.col-xs-12.col-sm-6.col-md-4.col-lg-3.q-mt-md
       div.text-h6 {{ getName(participant) }}
       q-separator.q-my-md
       div
-        div.text-caption Е-почта:
-        div.text-subtitle1.q-mb-xs {{ participant.provider_account?.email || 'Не указана' }}
-        div.text-caption Аккаунт:
-        div.text-subtitle1.q-mb-xs {{ participant.username }}
-        div.text-caption Зарегистрирован:
-        div.text-subtitle1 {{ formatDate(participant.blockchain_account?.created) }}
+        div.q-mb-md
+          div.text-caption Аккаунт:
+          div.text-subtitle1.q-mb-xs {{ participant.username }}
+        div.q-mb-md
+          div.text-caption Дата вступления:
+          div.text-subtitle1.q-mb-xs {{ formatDate(String(participant.participant_account?.created_at || '')) == '' ? 'отсутствует' : formatDate(String(participant.participant_account?.created_at || '')) }}
+        div
+          div.text-caption Активен:
+          q-checkbox(
+            :model-value="participant.participant_account?.status === 'accepted'"
+            disable
+            color="primary"
+            size="sm"
+          )
     q-card-actions(align="right")
       q-btn(
         color="primary"

package/src/widgets/Participants/ui/ParticipantDetails.vue CHANGED Viewed

@@ -12,6 +12,7 @@ div
   q-tab-panels.q-mt-sm.tab-panels-card(v-model="currentTab" animated)
     q-tab-panel.q-pa-none(name="info")
+      //приватные данные
       component(:is="useComponent(participant)" :participantData="usePrivateData(participant)" @update="onUpdate")
     q-tab-panel.q-pa-none(name="document")

package/src/widgets/Participants/ui/ParticipantsTable.vue CHANGED Viewed

@@ -31,17 +31,28 @@ q-table(
           :icon="expanded.get(props.row.username) ? 'remove' : 'add'"
           @click="onToggleExpand(props.row.username)"
         )
       q-td(style="max-width: 150px; word-wrap: break-word; white-space: normal;") {{ getName(props.row) }}
-      q-td {{ props.row.provider_account?.email }}
       q-td {{ props.row.username }}
-      q-td {{ formatDate(props.row.blockchain_account?.created) }}
+      q-td {{ formatDate(props.row.participant_account?.created_at) == '' ? 'отсутствует' : formatDate(props.row.participant_account?.created_at) }}
+      q-td
+        q-checkbox(
+          :model-value="props.row.participant_account?.status === 'accepted'"
+          disable
+          color="primary"
+          size="sm"
+        )
     q-tr(
+      no-hover
       v-if="expanded.get(props.row.username)"
       :key="`e_${props.row.username}`"
       :props="props"
       class="q-virtual-scroll--with-prev"
-    )
-      q-td(colspan="100%")
+    ).no-hover
+      q-td(colspan="100%").no-hover
         ParticipantDetails(
           :participant="props.row"
           :tab-name="currentTab[props.row.username]"
@@ -62,8 +73,8 @@ import { ref, reactive } from 'vue'
 import { useWindowSize } from 'src/shared/hooks'
 import moment from 'moment-with-locales-es6'
 import { ParticipantCard, ParticipantDetails } from '.'
+import { getName } from 'src/shared/lib/utils'
 import {
-  AccountTypes,
   type IAccount,
   type IIndividualData,
   type IOrganizationData,
@@ -91,27 +102,11 @@ const { isMobile } = useWindowSize()
 // Колонки таблицы
 const columns: any[] = [
   { name: 'name', align: 'left', label: 'ФИО / Наименование', field: 'name', sortable: true },
-  { name: 'email', align: 'left', label: 'Е-почта', field: 'email', sortable: true },
   { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
-  { name: 'created_at', align: 'left', label: 'Зарегистрирован', field: 'created_at', sortable: true },
+  { name: 'created_at', align: 'left', label: 'Дата вступления', field: 'created_at', sortable: true },
+  { name: 'status', align: 'left', label: 'Активен', field: 'status', sortable: true },
 ]
-// Функция для получения имени участника
-const getName = (account: IAccount) => {
-  const d = account.private_account
-  if (!d) return ''
-  switch (d.type) {
-    case AccountTypes.individual:
-      return `${d.individual_data?.last_name} ${d.individual_data?.first_name} ${d.individual_data?.middle_name}`
-    case AccountTypes.entrepreneur:
-      return `ИП ${d.entrepreneur_data?.last_name} ${d.entrepreneur_data?.first_name} ${d.entrepreneur_data?.middle_name}`
-    case AccountTypes.organization:
-      return d.organization_data?.short_name
-    default:
-      return ''
-  }
-}
 // Форматирование даты
 const formatDate = (date?: string) =>
   date ? moment(date).format('DD.MM.YY HH:mm:ss') : ''
@@ -127,3 +122,14 @@ const onUpdate = (account: IAccount, newData: IIndividualData | IOrganizationDat
   emit('update', account, newData)
 }
 </script>
+<style>
+.no-hover.q-tr--hover,
+.no-hover.q-table__tr--hover,
+.no-hover:hover,
+.no-hover:focus {
+  background: transparent !important;
+  box-shadow: none !important;
+  cursor: default !important;
+}
+</style>

package/src/widgets/RequireAgreements/ui/RequireAgreements.vue CHANGED Viewed

@@ -40,7 +40,7 @@ const required_agreements = computed(() => {
     if (required.value.includes(agreement.type)) {
       // Найти, если пользователь уже подписал это соглашение
       const userAgreement = userAgreements.value.find(ua => ua.type === agreement.type);
+      console.log('userAgreements: ', userAgreements.value)
       if (userAgreement) {
         // Найти соответствующий шаблон для соглашения
         const template = templates.value.find(t => t.registry_id === agreement.draft_id);