@coopenomics/desktop 2.2.10 → 2025.5.2

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>

package/src/app/layouts/useDefaultLayoutLogic.ts

@@ -0,0 +1,59 @@
+import { computed, ref, onMounted, watch } from 'vue'
+import { useQuasar } from 'quasar'
+import { useRoute } from 'vue-router'
+import { useWindowSize } from 'vue-window-size'
+import { useSystemStore } from 'src/entities/System/model'
+import { useSessionStore } from 'src/entities/Session'
+import { useCurrentUserStore } from 'src/entities/User'
+import { useCooperativeStore } from 'src/entities/Cooperative'
+
+export function useDefaultLayoutLogic() {
+  const $q = useQuasar()
+  const { width } = useWindowSize()
+  const route = useRoute()
+  const session = useSessionStore()
+  const currentUser = useCurrentUserStore()
+  const cooperativeStore = useCooperativeStore()
+  const system = useSystemStore()
+
+  cooperativeStore.loadContacts()
+
+  const leftDrawerOpen = ref(true)
+  const isMobile = computed(() => width.value < 768)
+  const isDark = computed(() => $q.dark.isActive)
+  const headerClass = computed(() => isDark.value ? 'text-white bg-dark' : 'text-black bg-light')
+  const loggedIn = computed(() => currentUser.isRegistrationComplete && session.isAuth)
+  const showDrawer = computed(() => route.params.coopname === system.info.coopname)
+
+  const footerText = computed(() => {
+    const c = cooperativeStore.contacts
+    const d = c?.details
+    return d
+      ? `${c.full_name}, ИНН: ${d.inn}, ОГРН: ${d.ogrn}, телефон: ${c.phone}, почта: ${c.email}`
+      : ''
+  })
+
+  onMounted(() => {
+    if (isMobile.value || !loggedIn.value) {
+      leftDrawerOpen.value = false
+    }
+  })
+
+  watch(loggedIn, (v) => {
+    leftDrawerOpen.value = v
+  })
+
+  const toggleLeftDrawer = () => {
+    leftDrawerOpen.value = !leftDrawerOpen.value
+  }
+
+  return {
+    leftDrawerOpen,
+    isMobile,
+    loggedIn,
+    showDrawer,
+    headerClass,
+    footerText,
+    toggleLeftDrawer,
+  }
+}

package/src/app/providers/router.ts

@@ -7,17 +7,18 @@ import {
   createWebHistory,
 } from 'vue-router';
 import { routes } from 'src/app/providers/routes';
+import { env } from 'src/shared/config';
 
 // Helper function to determine router history mode
 function getHistoryMode() {
-  if (process.env.SERVER) return createMemoryHistory;
-  return process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory;
+  if (env.SERVER) return createMemoryHistory;
+  return env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory;
 }
 
 // Main route export
 export default route(function () {
   const Router = createRouter({
-    history: getHistoryMode()(process.env.VUE_ROUTER_BASE),
+    history: getHistoryMode()(env.VUE_ROUTER_BASE),
     routes, // Базовые маршруты
     scrollBehavior(to, from, savedPosition) {
       return savedPosition || { top: 0 };

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

@@ -1,25 +1,23 @@
-import layout from 'src/pages/_layouts/default.vue';
+import layout from 'src/app/layouts/default.vue';
 import index from 'src/pages/index.vue';
-import blank from 'src/pages/blank/blank.vue';
-import permissionDenied from 'src/pages/_layouts/permissionDenied.vue';
+import { BlankPage } from 'src/pages/Blank';
+import { PermissionDenied } from 'src/pages/PermissionDenied';
 import { SignUpPage } from 'src/pages/Registrator/SignUp';
 import { SignInPage } from 'src/pages/Registrator/SignIn';
 import { RouteRecordRaw } from 'vue-router';
-import { InstallCooperativePage } from 'src/pages/Installer';
+import { InstallCooperativePage } from 'src/pages/Union/InstallCooperative';
 import { LostKeyPage } from 'src/pages/Registrator/LostKey/ui';
 import { ResetKeyPage } from 'src/pages/Registrator/ResetKey';
-import { UserSettingsPage } from 'src/pages/User/SettingsPage';
 import CooperativeSettingsPage from 'src/pages/Cooperative/SettingsPage/CooperativeSettingsPage.vue';
-import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
 import { AccumulationFunds, ExpenseFunds } from 'src/widgets/Cooperative/Funds';
-import { ChangeCooperativeContributions } from 'src/widgets/Cooperative/Contributions';
-import { ChangeCooperativeContacts } from 'src/widgets/Cooperative/Contacts';
+import { ChangeRegisterPaymentsPage } from 'src/pages/Cooperative/ChangeRegisterPayments';
+import { ChangeCooperativeContacts } from 'src/pages/Cooperative/ChangeContacts';
 import { MembersPage } from 'src/pages/Cooperative/MembersPage';
-import { InstalledExtensions } from 'src/pages/ExtStore/InstalledExtensions';
-import { ExtensionsShowcase } from 'src/pages/ExtStore/ExtensionsShowcase';
-import { ExtensionStoreBase } from 'src/pages/ExtStore/BaseRoute';
-import { ExtensionPage } from 'src/pages/ExtStore/ExtensionPage';
-import { ListOfBranchesPage } from 'src/pages/Cooperative/ListOfBranches';
+import { InstalledExtensions } from 'src/pages/ExtensionStore/InstalledExtensions';
+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';
 
 
 const baseRoutes = [
@@ -36,12 +34,12 @@ const baseRoutes = [
       {
         path: '/something-bad',
         name: 'somethingBad',
-        component: blank,
+        component: BlankPage,
       },
       {
         path: '/permission-denied',
         name: 'permissionDenied',
-        component: permissionDenied,
+        component: PermissionDenied,
       },
       {
         path: ':coopname/install',
@@ -73,19 +71,6 @@ const baseRoutes = [
         component: SignUpPage,
         children: [],
       },
-      {
-        path: 'settings/user',
-        name: 'user-settings',
-        component: UserSettingsPage,
-        children: [
-          {
-            path: 'payment-methods',
-            name: 'user-payment-methods',
-            component: UserPaymentMethodsPage,
-            children: [],
-          },
-        ],
-      },
       {
         path: 'settings/cooperative',
         name: 'cooperative-settings',
@@ -100,7 +85,7 @@ const baseRoutes = [
           {
             path: 'branches',
             name: 'branches',
-            component: ListOfBranchesPage,
+            component: MemberBranchList,
             children: [],
           },
           {
@@ -118,7 +103,7 @@ const baseRoutes = [
           {
             path: 'initial-contributions',
             name: 'initial-contributions',
-            component: ChangeCooperativeContributions,
+            component: ChangeRegisterPaymentsPage,
             children: [],
           },
           {
@@ -174,7 +159,7 @@ const baseRoutes = [
       {
         path: '/:pathMatch(.*)*',
         name: 'NotFound',
-        component: blank,
+        component: BlankPage,
       },
     ],
   },
@@ -267,17 +252,17 @@ const baseRoutes = [
 //       {
 //         path: '/something-bad',
 //         name: 'somethingBad',
-//         component: blank,
+//         component: BlankPage,
 //       },
 //       {
 //         path: '/permission-denied',
 //         name: 'permissionDenied',
-//         component: permissionDenied,
+//         component: PermissionDenied,
 //       },
 //       {
 //         path: '/:pathMatch(.*)*',
 //         name: 'NotFound',
-//         component: blank,
+//         component: BlankPage,
 //       },
 //     ],
 //   },

package/src/app/styles/style.css

@@ -4,6 +4,7 @@
 @tailwind components;
 @tailwind utilities;
 
+
 /* Стили для полосы прокрутки содержимого drawer */
 .q-drawer__content::-webkit-scrollbar {
   width: 0px;
@@ -57,6 +58,9 @@
 .selected {
   border: 0.1px solid grey;
 }
+.no-padding {
+  padding: 0px !important;
+}
 
 .no-select {
   -webkit-touch-callout: none; /* iOS Safari */

package/src/boot/init.ts

@@ -0,0 +1,6 @@
+import { boot } from 'quasar/wrappers'
+import { useInitAppProcess } from 'src/processes/init-app'
+
+export default boot(async ({ router }) => {
+  await useInitAppProcess(router)
+})

package/src/boot/sentry.ts

@@ -1,26 +1,26 @@
 import { boot } from 'quasar/wrappers';
 import { App } from 'vue';
 import { Router } from 'vue-router';
-import { NODE_ENV } from 'src/shared/config';
-import Tracker from '@openreplay/tracker';
-import trackerAssist from '@openreplay/tracker-assist'
-import { useSessionStore } from 'src/entities/Session';
+import { env } from 'src/shared/config';
+// import Tracker from '@openreplay/tracker';
+// import trackerAssist from '@openreplay/tracker-assist'
+// import { useSessionStore } from 'src/entities/Session';
 export default boot(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ({ app, router }: { app: App<Element>; router: Router }) => {
-    if ((NODE_ENV as string) === 'production') {
-      const session = useSessionStore()
+    if ((env.NODE_ENV as string) === 'production') {
+      // const session = useSessionStore()
 
-      const tracker = new Tracker({
-        projectKey: 'mgaCVSShnDNbPRFDZehd',
-      });
+      // const tracker = new Tracker({
+      //   projectKey: 'mgaCVSShnDNbPRFDZehd',
+      // });
 
-      if (session.username)
-        tracker.setUserID(session.username)
+      // if (session.username)
+      //   tracker.setUserID(session.username)
 
-      // .start() returns a promise
-      tracker.start().then(sessionData => console.log(sessionData) ).catch(e => console.error('on tracker: ', e) )
-      tracker.use(trackerAssist({}));
+      // // .start() returns a promise
+      // tracker.start().then(sessionData => console.log(sessionData) ).catch(e => console.error('on tracker: ', e) )
+      // tracker.use(trackerAssist({}));
     }
   }
 );

package/src/desktops/index.ts

@@ -1,9 +1,3 @@
 export * from './Chairman'
 export * from './Member'
-export * from './User'
 export * from './Setup'
-
-// export desktopsMap {
-//   Chairman: ChairmanDesktop,
-
-// }

package/src/entities/Account/model/index.ts

@@ -1 +1 @@
-export * from './store'
+export * from './store'

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

@@ -0,0 +1,20 @@
+import { client } from 'src/shared/api/client';
+import { Queries } from '@coopenomics/sdk';
+import type { IAgenda, IGetAgendaInput } from '../model';
+
+async function loadAgenda(data: IGetAgendaInput): Promise<IAgenda[]> {
+  const { [Queries.Agenda.GetAgenda.name]: output } = await client.Query(
+    Queries.Agenda.GetAgenda.query,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  
+  return output;
+}
+
+export const api = {
+  loadAgenda
+} 

package/src/entities/Agenda/index.ts

@@ -0,0 +1,2 @@
+export * as AgendaModel from './model'
+export * from './api' 

package/src/entities/Agenda/model/index.ts

@@ -0,0 +1,2 @@
+export * from './types'
+export * from './store' 

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

@@ -0,0 +1,36 @@
+import { defineStore } from 'pinia'
+import { ref, Ref } from 'vue'
+import { api } from '../api'
+import type { IAgenda, IGetAgendaInput } from './types';
+
+const namespace = 'agendaStore';
+
+interface IAgendaStore {
+  agenda: Ref<IAgenda[]>
+  loading: Ref<boolean>
+  loadAgenda: (data: IGetAgendaInput, hidden?: boolean) => Promise<IAgenda[]>;
+}
+
+export const useAgendaStore = defineStore(namespace, (): IAgendaStore => {
+  const agenda = ref<IAgenda[]>([])
+  const loading = ref(false)
+
+  const loadAgenda = async (data: IGetAgendaInput, hidden = false): Promise<IAgenda[]> => {
+    try {
+      loading.value = hidden ? false : true
+      const loadedData = await api.loadAgenda(data);
+      agenda.value = loadedData;
+      loading.value = false
+      return loadedData;
+    } catch (error) {
+      loading.value = false
+      throw error;
+    }
+  };
+
+  return {
+    agenda,
+    loading,
+    loadAgenda
+  }
+}) 

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

@@ -0,0 +1,4 @@
+import type { Queries } from '@coopenomics/sdk';
+
+export type IAgenda = Queries.Agenda.GetAgenda.IOutput[typeof Queries.Agenda.GetAgenda.name][number]
+export type IGetAgendaInput = Queries.Agenda.GetAgenda.IInput

package/src/entities/Branch/model/index.ts

@@ -1,2 +1,2 @@
-export * from './store'
 export * from './types'
+export * from './store'

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

@@ -1,10 +1,25 @@
 import type { IHealthResponse } from '@coopenomics/controller';
+import { Queries } from '@coopenomics/sdk';
 import { sendGET } from 'src/shared/api';
+import type { IDesktop } from '../model/types';
+import { client } from 'src/shared/api/client';
 
 async function healthCheck(): Promise<IHealthResponse> {
   return (await sendGET('/v1/system/health', {}, true)) as IHealthResponse;
 }
 
+async function getDesktop(): Promise<IDesktop> {
+  const { [Queries.Desktop.GetDesktop.name]: output } = await client.Query(Queries.Desktop.GetDesktop.query, {
+    variables: {
+      data: {}
+    }
+  });
+
+  return output;
+}
+
+
 export const api ={
-  healthCheck
+  healthCheck,
+  getDesktop
 }