@coopenomics/desktop 2025.5.14 → 2025.6.14

package/.env-example

@@ -6,3 +6,7 @@ CURRENCY=RUB
 COOP_SHORT_NAME=Локальный Кооператив
 SITE_DESCRIPTION=кооперативная экономика для сообществ и бизнеса
 SITE_IMAGE=https://ia.media-imdb.com/images/rock.jpg
+TIMEZONE=Europe/Moscow
+NOVU_APP_ID=BTaPV0bRL0dz
+NOVU_BACKEND_URL=https://novu.coopenomics.world/api
+NOVU_SOCKET_URL=https://novu.coopenomics.world/ws

package/extensions/participant/install.ts

@@ -4,15 +4,18 @@ 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 { 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'
+import type { IWorkspaceConfig } from 'src/shared/lib/types/workspace'
 
-export default async function () {
+export default async function (): Promise<IWorkspaceConfig> {
   return {
     workspace: 'participant',
+    title: 'Стол пайщика',
+    defaultRoute: 'profile', // Маршрут по умолчанию для рабочего стола пайщика
     routes: [
       {
         meta: {
@@ -40,7 +43,8 @@ export default async function () {
               title: 'Мой Кошелёк',
               icon: 'fa-solid fa-wallet',
               roles: [],
-              agreements: agreementsBase
+              agreements: agreementsBase,
+              requiresAuth: true
             },
             path: 'wallet',
             name: 'wallet',
@@ -53,6 +57,7 @@ export default async function () {
               icon: 'fas fa-link',
               roles: ['user'],
               conditions: 'isCoop === true && coopname === "voskhod"',
+              requiresAuth: true
             },
             path: '/:coopname/connect',
             name: 'connect',
@@ -62,7 +67,8 @@ export default async function () {
             meta: {
               title: 'Мои Реквизиты',
               icon: 'fas fa-link',
-              roles: ['user', 'member', 'chairman']
+              roles: ['user', 'member', 'chairman'],
+              requiresAuth: true
             },
             path: '/:coopname/connect',
             name: 'payment-methods',
@@ -73,6 +79,7 @@ export default async function () {
               title: 'Мои Документы',
               icon: 'fa-solid fa-file-invoice',
               roles: ['user', 'member', 'chairman'],
+              requiresAuth: true
             },
             path: 'documents',
             name: 'user-documents',
@@ -83,31 +90,36 @@ export default async function () {
               title: 'Мои Платежи',
               icon: 'fa-solid fa-money-bill-transfer',
               roles: ['user', 'member', 'chairman'],
+              requiresAuth: true
             },
             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
-          //       }
-          //     },
-          //   ],
-          // },
+          {
+            meta: {
+              title: 'Мои Собрания',
+              icon: 'fa-solid fa-users-between-lines',
+              roles: ['user', 'member', 'chairman'],
+              requiresAuth: true
+            },
+            path: 'meets',
+            name: 'user-meets',
+            component: markRaw(ListOfMeetsPage),
+            children: [
+              {
+                path: ':hash',
+                name: 'user-meet-details',
+                component: markRaw(MeetDetailsPage),
+                meta: {
+                  title: 'Детали собрания',
+                  icon: 'fa-solid fa-users-between-lines',
+                  roles: ['user', 'member', 'chairman'],
+                  requiresAuth: true
+                }
+              },
+            ],
+          },
           {
             path: '/:coopname/contacts',
             name: 'contacts',

package/extensions/soviet/install.ts

@@ -3,12 +3,15 @@ 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'
+import { ListOfMeetsPage } from 'src/pages/Cooperative/ListOfMeets'
+import { MeetDetailsPage } from 'src/pages/Cooperative/MeetDetails'
+import type { IWorkspaceConfig } from 'src/shared/lib/types/workspace'
 
-export default async function () {
+export default async function (): Promise<IWorkspaceConfig> {
   return {
     workspace: 'soviet',
+    title: 'Стол совета',
+    defaultRoute: 'agenda', // Маршрут по умолчанию для рабочего стола совета
     routes: [
       {
         meta: {
@@ -59,23 +62,23 @@ export default async function () {
               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),
-          //     },
-          //   ],
-          // },
+          {
+            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": "2025.5.14",
+  "version": "2025.6.14",
   "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.14",
-    "@coopenomics/sdk": "2025.5.14",
+    "@coopenomics/controller": "2025.6.14",
+    "@coopenomics/sdk": "2025.6.14",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -34,6 +34,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/vue-fontawesome": "^3.0.8",
     "@headlessui/vue": "^1.7.22",
+    "@novu/js": "^3.5.0",
     "@openreplay/tracker": "^14.0.9",
     "@openreplay/tracker-assist": "^9.0.1",
     "@productdevbook/chatwoot": "^1.5.0",
@@ -49,7 +50,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2025.5.14",
+    "cooptypes": "2025.6.14",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -59,6 +60,7 @@
     "idb": "^8.0.0",
     "isomorphic-ws": "^5.0.0",
     "lodash": "^4.17.21",
+    "moment-timezone": "^0.5.45",
     "moment-with-locales-es6": "^1.0.1",
     "pinia": "^2.0.11",
     "pinia-plugin-persistedstate": "^3.2.1",
@@ -101,5 +103,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "515a374f86b8c38fa9e725072b3816782e5c734c"
+  "gitHead": "1c376c003ab7d30e5fa11e13152795ac4823885a"
 }

package/src/app/App.vue

@@ -15,6 +15,7 @@ div(v-if="isLoaded").breable-text
   import { SelectBranchOverlay } from 'src/features/Branch/SelectBranch'
   import { useSystemStore } from 'src/entities/System/model'
   import { useDesktopHealthWatcherProcess } from 'src/processes/watch-desktop-health'
+  import 'src/shared/ui/CardStyles/index.scss';
 
   const { info } = useSystemStore()
   const route = useRoute()

package/src/app/providers/routes/index.ts

@@ -18,6 +18,7 @@ import { ExtensionsShowcase } from 'src/pages/ExtensionStore/ExtensionsShowcase'
 import { ExtensionPage } from 'src/pages/ExtensionStore/ExtensionPage';
 import { MemberBranchList } from 'src/pages/Cooperative/MemberBranchList';
 import { ExtensionStoreBase } from 'src/pages/ExtensionStore/BaseRoute';
+import { LoginRedirectPage } from 'src/features/User/LoginRedirect'
 
 
 const baseRoutes = [
@@ -71,6 +72,17 @@ const baseRoutes = [
         component: SignUpPage,
         children: [],
       },
+      {
+        path: ':coopname/auth/login-redirect',
+        name: 'login-redirect',
+        component: LoginRedirectPage,
+        meta: {
+          layout: 'default',
+          title: 'Вход для доступа к содержимому',
+          icon: 'fa-solid fa-lock',
+          roles: []
+        },
+      },
       {
         path: 'settings/cooperative',
         name: 'cooperative-settings',

package/src/app/styles/app.scss

@@ -23,7 +23,7 @@ p {
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
 
   &:hover {
-    transform: scale(1.03);
+    transform: scale(1.015);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
   }
 }

package/src/app/styles/style.css

@@ -390,3 +390,14 @@ pre {
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
   }
 }
+
+/* Глобальный стиль ссылок для светлой и тёмной темы */
+a {
+  color: #1c64f2;
+  text-decoration: underline;
+  transition: color 0.2s;
+}
+.body--dark a,
+.q-dark a {
+  color: #90caf9;
+}

package/src/css/quasar.variables.scss

@@ -25,7 +25,7 @@
 // $warning   : #F2C037;
 
 $primary: teal !default;
-$secondary: grey !default;
+$secondary: lime !default;
 $accent: orange !default;
 
 $h1: (

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

@@ -3,6 +3,8 @@ import { computed, ref } from 'vue'
 import { RouteRecordRaw, type RouteMeta, type Router } from 'vue-router'
 import type { IHealthResponse, IBackNavigationButton, IDesktopWithNavigation } from './types'
 import { api } from '../api'
+import { useCurrentUserStore } from 'src/entities/User/model'
+import { useSystemStore } from 'src/entities/System/model'
 
 interface WorkspaceMenuItem {
   workspaceName: string
@@ -13,6 +15,7 @@ interface WorkspaceMenuItem {
 }
 
 const namespace = 'desktops'
+const STORAGE_KEY_WORKSPACE = 'monocoop-active-workspace'
 
 export const useDesktopStore = defineStore(namespace, () => {
   const currentDesktop = ref<IDesktopWithNavigation>()
@@ -75,8 +78,37 @@ export const useDesktopStore = defineStore(namespace, () => {
 
   // Храним название активного workspace
   const activeWorkspaceName = ref<string | null>(null);
+
   function selectWorkspace(name: string) {
     activeWorkspaceName.value = name;
+    // Сохраняем выбранный рабочий стол в localStorage
+    localStorage.setItem(STORAGE_KEY_WORKSPACE, name);
+  }
+
+  // Функция для определения и выбора дефолтного рабочего стола
+  function selectDefaultWorkspace() {
+    // Проверяем, был ли ранее сохранен рабочий стол
+    const savedWorkspace = localStorage.getItem(STORAGE_KEY_WORKSPACE);
+
+    if (savedWorkspace && currentDesktop.value?.workspaces.some(ws => ws.name === savedWorkspace)) {
+      selectWorkspace(savedWorkspace);
+      return;
+    }
+
+    // Если нет сохраненного рабочего стола, определяем по правам пользователя
+    const userStore = useCurrentUserStore();
+
+    if (userStore.isMember || userStore.isChairman) {
+      // Для членов совета или председателя устанавливаем soviet
+      const hasSoviet = currentDesktop.value?.workspaces.some(ws => ws.name === 'soviet');
+      if (hasSoviet) {
+        selectWorkspace('soviet');
+        return;
+      }
+    }
+
+    // В остальных случаях устанавливаем participant
+    selectWorkspace('participant');
   }
 
   const activeSecondLevelRoutes = computed((): RouteRecordRaw[] => {
@@ -120,6 +152,40 @@ export const useDesktopStore = defineStore(namespace, () => {
 
   const backNavigationButton = computed(() => currentDesktop.value?.backNavigationButton)
 
+  // Новый метод: перейти на маршрут по умолчанию для текущего рабочего стола
+  function goToDefaultPage(router: Router): void {
+    const { info } = useSystemStore()
+
+    if (!currentDesktop.value || !activeWorkspaceName.value) return
+
+    // Найти текущий рабочий стол
+    const currentWorkspace = currentDesktop.value.workspaces.find(
+      ws => ws.name === activeWorkspaceName.value
+    )
+
+    if (!currentWorkspace) return
+
+    // Проверяем наличие defaultRoute
+    if ((currentWorkspace as any).defaultRoute) {
+      // Если есть defaultRoute, переходим на него
+      router.push({
+        name: (currentWorkspace as any).defaultRoute,
+        params: { coopname: info.coopname }
+      })
+      return
+    }
+
+    // Если нет defaultRoute, ищем первый маршрут в детях основного маршрута
+    const ws = workspaceMenus.value.find(menu => menu.workspaceName === activeWorkspaceName.value)
+    if (ws && ws.mainRoute && ws.mainRoute.children && ws.mainRoute.children.length > 0) {
+      const firstChild = ws.mainRoute.children[0]
+      router.push({
+        name: firstChild.name as string,
+        params: { coopname: info.coopname }
+      })
+    }
+  }
+
   return {
     currentDesktop,
     health,
@@ -130,9 +196,11 @@ export const useDesktopStore = defineStore(namespace, () => {
     workspaceMenus,
     activeWorkspaceName,
     selectWorkspace,
+    selectDefaultWorkspace,
     activeSecondLevelRoutes,
     registerWorkspaceMenus,
     removeWorkspace,
+    goToDefaultPage,
     // Новые методы
     setBackNavigationButton,
     removeBackNavigationButton,

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

@@ -1,6 +1,13 @@
 import type { Queries } from '@coopenomics/sdk';
 
 export type IDesktop = Queries.Desktop.GetDesktop.IOutput[typeof Queries.Desktop.GetDesktop.name]
+
+export interface IWorkspace {
+  name: string;
+  title: string;
+  defaultRoute?: string; // Маршрут по умолчанию для этого рабочего стола
+}
+
 export interface ILegacyDesktop {
   name: string;
   hash: string;

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

@@ -4,7 +4,7 @@ export type IDocumentPackageAggregate = Zeus.ModelTypes['DocumentPackageAggregat
 export type IDocumentAggregate = Zeus.ModelTypes['DocumentAggregate'];
 export type ZGetDocumentsResult = Queries.Documents.GetDocuments.IOutput[typeof Queries.Documents.GetDocuments.name];
 export type IGetDocuments = Queries.Documents.GetDocuments.IInput['data']
-
+export type ISignedDocument2 = Zeus.ModelTypes['SignedDigitalDocument']
 // Информация о пагинации
 export interface IPagination {
   totalCount: number;

package/src/entities/Meet/api/index.ts

@@ -1,6 +1,6 @@
 import { client } from 'src/shared/api/client';
-import { Queries, Mutations } from '@coopenomics/sdk';
-import type { IGetMeetsInput, IGetMeetInput, ICloseMeetInput, IRestartMeetInput } from '../types';
+import { Queries } from '@coopenomics/sdk';
+import type { IGetMeetsInput, IGetMeetInput } from '../types';
 
 async function loadMeets(data: IGetMeetsInput) {
   const { [Queries.Meet.GetMeets.name]: output } = await client.Query(
@@ -26,33 +26,7 @@ async function loadMeet(data: IGetMeetInput) {
   return output;
 }
 
-async function closeMeet(data: ICloseMeetInput) {
-  const { [Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.name]: output } = await client.Mutation(
-    Mutations.Meet.SignByPresiderOnAnnualGeneralMeet.mutation,
-    {
-      variables: {
-        data
-      }
-    }
-  );
-  return output;
-}
-
-async function restartMeet(data: IRestartMeetInput) {
-  const { [Mutations.Meet.RestartAnnualGeneralMeet.name]: output } = await client.Mutation(
-    Mutations.Meet.RestartAnnualGeneralMeet.mutation,
-    {
-      variables: {
-        data
-      }
-    }
-  );
-  return output;
-}
-
 export const api = {
   loadMeets,
   loadMeet,
-  closeMeet,
-  restartMeet
 }

package/src/entities/Meet/model/store.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref, Ref } from 'vue'
 import { api } from '../api'
-import type { IMeet, IGetMeetsInput, IGetMeetInput, ICloseMeetInput, IRestartMeetInput } from '../types';
+import type { IMeet, IGetMeetsInput, IGetMeetInput } from '../types';
 
 const namespace = 'meetStore';
 
@@ -11,8 +11,7 @@ interface IMeetStore {
   loading: Ref<boolean>
   loadMeets: (data: IGetMeetsInput) => Promise<IMeet[]>;
   loadMeet: (data: IGetMeetInput) => Promise<IMeet>;
-  closeMeet: (data: ICloseMeetInput) => Promise<IMeet>;
-  restartMeet: (data: IRestartMeetInput) => Promise<IMeet>;
+  setCurrentMeet: (meet: IMeet) => void;
 }
 
 export const useMeetStore = defineStore(namespace, (): IMeetStore => {
@@ -24,7 +23,7 @@ export const useMeetStore = defineStore(namespace, (): IMeetStore => {
     loading.value = true
     try {
       const result = await api.loadMeets(data);
-      meets.value = result;
+      meets.value = result.slice().sort((a, b) => new Date(b.processing?.meet.created_at as string).getTime() - new Date(a.processing?.meet.created_at as string).getTime());
       return result;
     } finally {
       loading.value = false
@@ -36,28 +35,15 @@ export const useMeetStore = defineStore(namespace, (): IMeetStore => {
     try {
       const result = await api.loadMeet(data);
       currentMeet.value = result;
+      console.log('result: ',result)
       return result;
     } finally {
       loading.value = false
     }
   };
 
-  const closeMeet = async (data: ICloseMeetInput) => {
-    loading.value = true
-    try {
-      return await api.closeMeet(data);
-    } finally {
-      loading.value = false
-    }
-  };
-
-  const restartMeet = async (data: IRestartMeetInput) => {
-    loading.value = true
-    try {
-      return await api.restartMeet(data);
-    } finally {
-      loading.value = false
-    }
+  const setCurrentMeet = (meet: IMeet) => {
+    currentMeet.value = meet;
   };
 
   return {
@@ -66,7 +52,6 @@ export const useMeetStore = defineStore(namespace, (): IMeetStore => {
     loading,
     loadMeets,
     loadMeet,
-    closeMeet,
-    restartMeet
+    setCurrentMeet,
   }
 })

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

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

package/src/env.d.ts

@@ -27,5 +27,6 @@ declare module 'vue-router' {
     agreements?: string[]
     title: string
     icon: string
+    requiresAuth?: boolean
   }
 }