@coopenomics/desktop 2.2.10 → 2025.5.2

package/src/features/Meet/RestartMeet/ui/RestartMeet.vue

@@ -0,0 +1,46 @@
+<template lang="pug">
+div
+  q-btn(
+    v-if="showButton"
+    color="primary"
+    icon="fa-solid fa-rotate"
+    label="Перезапустить собрание"
+    @click="showRestartDialog = true"
+    :loading="isProcessing"
+  )
+
+  RestartMeetForm(
+    v-model="showRestartDialog"
+    :meet="meet"
+    :loading="isProcessing"
+    @restart="handleRestart"
+  )
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { RestartMeetForm } from '.';
+import type { IMeet } from 'src/entities/Meet'
+
+defineProps<{
+  meet: IMeet
+  showButton?: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'restart', data: any): void
+}>()
+
+const showRestartDialog = ref(false)
+const isProcessing = ref(false)
+
+const handleRestart = async (data: any) => {
+  isProcessing.value = true
+  try {
+    await emit('restart', data)
+    showRestartDialog.value = false
+  } finally {
+    isProcessing.value = false
+  }
+}
+</script> 

package/src/features/Meet/RestartMeet/ui/RestartMeetForm.vue

@@ -0,0 +1,92 @@
+<template lang="pug">
+q-dialog(:model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)" persistent)
+  q-card(style="min-width: 500px")
+    q-card-section.row.items-center
+      div.text-h6 Перезапустить собрание
+      q-space
+      q-btn(icon="close" flat round dense v-close-popup @click="$emit('update:modelValue', false)")
+    q-card-section
+      q-form(@submit="handleSubmit")
+        div.text-subtitle1.q-mb-sm Выберите новые даты для собрания
+        q-input(
+          v-model="formData.new_open_at"
+          label="Новая дата и время открытия, UTC"
+          type="datetime-local"
+          :rules="[val => !!val || 'Обязательное поле']"
+          dense
+          class="q-mb-md"
+        )
+        q-input(
+          v-model="formData.new_close_at"
+          label="Новая дата и время закрытия, UTC"
+          type="datetime-local"
+          :rules="[val => !!val || 'Обязательное поле']"
+          dense
+          class="q-mb-md"
+        )
+
+        div.text-subtitle1.q-mb-sm При перезапуске собрания будут использованы существующие пункты повестки:
+
+        div.q-pa-sm.q-my-sm.bg-grey-2.rounded-borders(v-if="meet?.processing?.questions?.length")
+          div.q-mb-md(v-for="(question, index) in meet.processing.questions" :key="index")
+            div.text-weight-bold {{ question.title }}
+            div.text-caption {{ question.context }}
+        
+        div.q-pa-sm.q-my-sm.bg-red-1.text-red-8.rounded-borders(v-else)
+          div.text-center Вопросы повестки не найдены
+
+    q-card-actions(align="right")
+      q-btn(flat label="Отмена" v-close-popup @click="$emit('update:modelValue', false)" :disable="loading")
+      q-btn(
+        color="primary" 
+        label="Перезапустить" 
+        type="submit" 
+        @click="handleSubmit" 
+        :loading="loading"
+        :disable="!meet?.processing?.questions?.length"
+      )
+</template>
+
+<script setup lang="ts">
+import { reactive, watch } from 'vue'
+import type { IMeet } from 'src/entities/Meet'
+
+const props = defineProps<{
+  modelValue: boolean,
+  meet: IMeet | null,
+  loading?: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: boolean): void
+  (e: 'restart', data: any): void
+}>()
+
+// Форма для перезапуска собрания
+const formData = reactive({
+  new_open_at: '',
+  new_close_at: ''
+})
+
+// Сброс формы при открытии диалога
+watch(() => props.modelValue, (newVal) => {
+  if (newVal) {
+    formData.new_open_at = ''
+    formData.new_close_at = ''
+  }
+})
+
+const handleSubmit = () => {
+  if (!props.meet) return
+  
+  // Проверяем наличие вопросов повестки
+  if (!props.meet.processing?.questions || props.meet.processing.questions.length === 0) {
+    return
+  }
+
+  emit('restart', {
+    ...formData,
+    hash: props.meet.hash
+  })
+}
+</script>

package/src/features/Meet/RestartMeet/ui/index.ts

@@ -0,0 +1,2 @@
+export { default as RestartMeetForm } from './RestartMeetForm.vue'
+export { default as RestartMeet } from './RestartMeet.vue'

package/src/features/Meet/VoteOnMeet/index.ts

@@ -0,0 +1 @@
+export * from './model'

package/src/features/Meet/VoteOnMeet/model/index.ts

@@ -0,0 +1,18 @@
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
+
+export type IVoteOnMeetInput = Mutations.Meet.VoteOnAnnualGeneralMeet.IInput['data'];
+export type IVoteOnMeetResult = Mutations.Meet.VoteOnAnnualGeneralMeet.IOutput[typeof Mutations.Meet.VoteOnAnnualGeneralMeet.name];
+
+export async function voteOnMeet(data: IVoteOnMeetInput): Promise<IVoteOnMeetResult> {
+  const { [Mutations.Meet.VoteOnAnnualGeneralMeet.name]: result } = await client.Mutation(
+    Mutations.Meet.VoteOnAnnualGeneralMeet.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+
+  return result;
+}

package/src/features/Payment/SetStatus/api/index.ts

@@ -0,0 +1,20 @@
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
+import type { IPayment } from 'src/entities/Payment/model';
+
+type ISetPaymentStatusInput = Mutations.Payments.SetPaymentStatus.IInput['data']
+
+async function setPaymentStatus(data: ISetPaymentStatusInput): Promise<IPayment> {
+  const { [Mutations.Payments.SetPaymentStatus.name]: result } = await client.Mutation(
+    Mutations.Payments.SetPaymentStatus.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+
+  return result;
+}
+
+export const api = { setPaymentStatus };

package/src/features/Payment/SetStatus/index.ts

@@ -0,0 +1 @@
+export * from './model'

package/src/features/Payment/SetStatus/model/index.ts

@@ -0,0 +1,30 @@
+import { usePaymentStore } from 'src/entities/Payment/model'
+import { api } from '../api'
+import { Zeus } from '@coopenomics/sdk'
+
+export const useSetStatus = () => {
+  const paymentStore = usePaymentStore()
+
+  const setPaidStatus = async (id: string) => {
+    await api.setPaymentStatus({ id, status: Zeus.PaymentStatus.PAID })
+    setTimeout(async () => {
+      await paymentStore.updatePayments({ id })
+    }, 1000)
+  }
+
+  const setRefundedStatus = async (id: string) => {
+    await api.setPaymentStatus({ id, status: Zeus.PaymentStatus.REFUNDED })
+    setTimeout(async () => {
+      await paymentStore.updatePayments({ id })
+    }, 1000)
+  }
+
+  const setCompletedStatus = async (id: string) => {
+    await api.setPaymentStatus({ id, status: Zeus.PaymentStatus.COMPLETED })
+    setTimeout(async () => {
+      await paymentStore.updatePayments({ id })
+    }, 1000)
+  }
+
+  return { setPaidStatus, setRefundedStatus, setCompletedStatus }
+}

package/src/features/{Order → Payment}/SetStatus/ui/SetOrderPaidStatusButton/SetOrderPaidStatusButton.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
-q-item(clickable flat size="sm" @click="showDialog=true").full-width
-  div.q-pa-sm
+q-btn(color="teal" clickable size="sm" @click="showDialog=true")
+  div
     q-icon(name="fa-regular fa-square-check").q-mr-xs
     span отметить оплаченным
 
@@ -18,6 +18,7 @@ import { useSetStatus } from '../../model';
 import { ref } from 'vue';
 import { ModalBase } from 'src/shared/ui/ModalBase';
 import { Form } from 'src/shared/ui/Form';
+
 const {setPaidStatus} = useSetStatus()
 const isSubmitting = ref(false)
 const showDialog = ref(false)
@@ -37,13 +38,16 @@ const close = () => {
 }
 
 const setPaid = async() => {
+  isSubmitting.value = true
   try {
     await setPaidStatus(props.id)
-    SuccessAlert('Статус ордера обновлён')
+    SuccessAlert('Статус платежа обновлён')
     close()
   } catch(e: any) {
     FailAlert(`Возникла ошибка: ${e.message}`)
     close()
+  } finally {
+    isSubmitting.value = false
   }
 }
 </script>

package/src/features/PaymentMethod/AddPaymentMethod/model/index.ts

@@ -34,7 +34,7 @@ export function useAddPaymentMethod() {
 
   async function addPaymentMethod(params: IAddPaymentMethod) {
 
-    await store.loadUserWalet({
+    await store.loadUserWallet({
       coopname: info.coopname,
       username: params.username,
     })
@@ -42,7 +42,7 @@ export function useAddPaymentMethod() {
 
     await sendPOST(`/v1/methods/${params.username}/add`, params)
 
-    await store.loadUserWalet({
+    await store.loadUserWallet({
       coopname: info.coopname,
       username: session.username
     })

package/src/features/PaymentMethod/AddPaymentMethod/ui/AddPaymentButton.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 div
-  q-btn(@click="showDialog=true" color="primary" size="sm" icon="add") добавить реквизиты
+  q-btn(@click="showDialog=true" color="primary" icon="add") добавить реквизиты
 
   //- q-badge(flat rounded color="grey").q-ml-sm
   //-   q-icon(name="far fa-question")

package/src/features/PaymentMethod/DeletePaymentMethod/model/index.ts

@@ -18,7 +18,7 @@ export function useDeletePaymentMethod() {
 
     await sendPOST(`/v1/methods/${username}/delete`, {method_id})
 
-    await store.loadUserWalet({
+    await store.loadUserWallet({
       coopname: info.coopname,
       username: session.username
     })

package/src/features/PaymentMethod/DeletePaymentMethod/ui/DeletePaymentMethodButton.vue

@@ -1,7 +1,9 @@
 <template lang="pug">
 div
-  q-btn(@click="showDialog=true" :size="size" flat dense) удалить
+  q-btn(@click="showDialog=true" :size="size" flat dense)
     q-icon(name="close")
+    span.q-ml-xs удалить
+
   q-dialog(v-model="showDialog" @hide="clear")
     ModalBase(:title='"Удалить метод платежа"' )
       Form(:handler-submit="handlerSubmit" :is-submitting="isSubmitting" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-pa-sm

package/src/features/Request/CancelRequest/ui/CancelButton.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-btn(color="red" @click="cancel") отменить поставку 
+q-btn(color="red" @click="cancel") отменить поставку
 </template>
 <script setup lang="ts">
   import { FailAlert, SuccessAlert } from 'src/shared/api'

package/src/features/Request/ConfirmRecieveOnRequest/ui/ConfirmRecieveOnRequest.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-btn(color="green" @click="confirmRecieve") выдал имущество 
+q-btn(color="green" @click="confirmRecieve") выдал имущество
 </template>
 <script setup lang="ts">
   import { FailAlert, SuccessAlert } from 'src/shared/api'

package/src/features/Request/CreateParentOffer/ui/CreateParentOfferForm/CreateParentOfferForm.vue

@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import { failAlert, SuccessAlert } from 'src/shared/api'
+import { FailAlert, SuccessAlert } from 'src/shared/api'
 import { api } from '../../api'
 import type { ICreateOffer, IFormData } from 'src/features/Request/CreateParentOffer/model'
 import { computed, ref } from 'vue'
 import { Form } from 'src/shared/ui/Form'
 import { useCooperativeStore } from 'src/entities/Cooperative'
 import { ImageUploaderWithPreview } from '../ImageUploaderWithPreview'
-import { CURRENCY } from 'src/shared/config'
-
+import { env } from 'src/shared/config'
 
 const props = defineProps({
   username: {
@@ -50,7 +49,7 @@ const handlerSubmit = async () => {
       coopname: props.coopname,
       program_id: formData.value.program_id,
       units: formData.value.units,
-      unit_cost: parseFloat(unit_cost.toString()).toFixed(4) + ' ' + CURRENCY,
+      unit_cost: parseFloat(unit_cost.toString()).toFixed(4) + ' ' + env.CURRENCY,
       product_lifecycle_secs: 86400 * formData.value.product_lifecycle_days,
       data: {
         title: formData.value.title,
@@ -64,7 +63,7 @@ const handlerSubmit = async () => {
     SuccessAlert('Объявление успешно создано')
   } catch (e: any) {
     console.log(e)
-    failAlert(e.message)
+    FailAlert(e.message)
   }
 }
 </script>

package/src/features/Request/CreateParentOffer/ui/ImageUploaderWithPreview/ImageUploaderWithPreview.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
-import { UPLOAD_URL } from 'src/shared/config'
+import { ref, computed } from 'vue'
 import { ImagesPreview } from '../ImagesPreview'
+import { env } from 'src/shared/config'
 
 const emit = defineEmits(['updateImages'])
 
@@ -38,11 +38,13 @@ const uploaderRef = ref()
 const triggerUploader = () => {
   uploaderRef.value.pickFiles()
 }
+
+const upload_url = computed(() => env.UPLOAD_URL)
 </script>
 
 <template lang="pug">
 div
   q-btn(icon="add" class="q-ml-md" @click="triggerUploader") Загрузить изображения
-  q-uploader(v-show="false" ref="uploaderRef" color="grey" flat no-thumbnails multiple square auto-upload :url="UPLOAD_URL" :max-file-size="104857600" @uploaded="uploaded").full-width
+  q-uploader(v-show="false" ref="uploaderRef" color="grey" flat no-thumbnails multiple square auto-upload :url="upload_url" :max-file-size="104857600" @uploaded="uploaded").full-width
   ImagesPreview(v-if="images.length > 0" :images="images" :show-remove="true" @select-image="select" @remove-image="remove").q-ma-md
 </template>

package/src/features/Request/DisputeOnRequest/ui/DisputeOnRequestButton.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-btn(color="red" @click="dispute") вернуть по гарантии  
+q-btn(color="red" @click="dispute") вернуть по гарантии
 </template>
 <script setup lang="ts">
   import { FailAlert, SuccessAlert } from 'src/shared/api'

package/src/features/Request/ModerateRequest/ui/ModerateRequestButton.vue

@@ -3,7 +3,7 @@ q-btn(color="red" @click="moderate") подтвердить модерацию
 </template>
 
 <script setup lang="ts">
-  import { failAlert, SuccessAlert } from 'src/shared/api'
+  import { FailAlert, SuccessAlert } from 'src/shared/api'
   import { ref } from 'vue'
   import { api } from '../api'
 
@@ -34,7 +34,7 @@ q-btn(color="red" @click="moderate") подтвердить модерацию
       })
       SuccessAlert('Модерация заявки подтверждена')
     } catch (e: any) {
-      failAlert(e)
+      FailAlert(e)
     }
   }
 

package/src/features/Request/PublishRequest/ui/PublishRequestButton.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-btn(@click="publish") опубликовать  
+q-btn(@click="publish") опубликовать
 </template>
 
 <script setup lang="ts">

package/src/features/Request/RecieveOnRequest/ui/RecieveOnRequestButton.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-btn(color="green" @click="recieve") получил имущество  
+q-btn(color="green" @click="recieve") получил имущество
 </template>
 <script setup lang="ts">
   import { FailAlert, SuccessAlert } from 'src/shared/api'

package/src/features/Request/UnpublishRequest/ui/UnpublishRequestButton.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-q-btn(@click="unpublish") снять с публикации  
+q-btn(@click="unpublish") снять с публикации
 </template>
 
 <script setup lang="ts">

package/src/features/Union/AddCooperative/model/index.ts

@@ -1,8 +1,8 @@
 import { TransactResult } from '@wharfkit/session';
 import { RegistratorContract } from 'cooptypes';
 import { useSessionStore } from 'src/entities/Session';
-import { CURRENCY } from 'src/shared/config';
 import { useGlobalStore } from 'src/shared/store';
+import { env } from 'src/shared/config';
 
 export function useAddCooperative() {
   async function addCooperative(
@@ -10,10 +10,10 @@ export function useAddCooperative() {
   ): Promise<TransactResult | undefined> {
     const session = useSessionStore();
 
-    data.params.initial = `${parseFloat(data.params.initial).toFixed(4)} ${CURRENCY}`
-    data.params.minimum = `${parseFloat(data.params.minimum).toFixed(4)} ${CURRENCY}`
-    data.params.org_initial = `${parseFloat(data.params.org_initial).toFixed(4)} ${CURRENCY}`
-    data.params.org_minimum = `${parseFloat(data.params.org_minimum).toFixed(4)} ${CURRENCY}`
+    data.params.initial = `${parseFloat(data.params.initial).toFixed(4)} ${env.CURRENCY}`
+    data.params.minimum = `${parseFloat(data.params.minimum).toFixed(4)} ${env.CURRENCY}`
+    data.params.org_initial = `${parseFloat(data.params.org_initial).toFixed(4)} ${env.CURRENCY}`
+    data.params.org_minimum = `${parseFloat(data.params.org_minimum).toFixed(4)} ${env.CURRENCY}`
 
     const result = await useGlobalStore().transact({
       account: RegistratorContract.contractName.production,

package/src/features/Union/AddCooperative/ui/AddCooperativeForm.vue

@@ -5,19 +5,19 @@ Form(:handler-submit="addNow" :is-submitting="isSubmitting" :showCancel="false"
 
   q-input(standout="bg-teal text-white" hint="100 RUB" label="Вступительный взнос для физлиц и ИП" v-model="data.params.initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
   q-input(standout="bg-teal text-white" hint="300 RUB" label="Минимальный паевый взнос для физлиц и ИП" v-model="data.params.minimum" type="number" :min="0" :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
   q-input(standout="bg-teal text-white" hint="1000 RUB" label="Вступительный взнос для организаций" v-model="data.params.org_initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
   q-input(standout="bg-teal text-white" hint="3000 RUB" label="Минимальный паевый взнос для организаций" v-model="data.params.org_minimum" type="number" :min="0"  :rules="[val => notEmpty(val)]")
     template(#append)
-      span.text-overline {{CURRENCY}}
+      span.text-overline {{currency}}
 
 </template>
 <script lang="ts" setup>
@@ -27,14 +27,14 @@ import { Form } from 'src/shared/ui/Form';
 import { notEmpty, isDomain } from 'src/shared/lib/utils';
 import { useSessionStore } from 'src/entities/Session';
 import { RegistratorContract } from 'cooptypes';
-import { CURRENCY } from 'src/shared/config';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import type { IObjectedDocument } from 'src/shared/lib/types/document';
+import { env } from 'src/shared/config';
 
 const emit = defineEmits(['finish'])
 
 const {addCooperative} = useAddCooperative()
-
+const currency = computed(() => env.CURRENCY)
 const isSubmitting = ref(false)
 
 const props = defineProps({
@@ -83,9 +83,6 @@ const addNow = async () => {
   } catch(e: any){
     FailAlert(e.message)
   }
-
-
-
 }
 
 </script>

package/src/features/User/AddUser/ui/AddUserDialog/AddUserDialog.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
 div
-  q-btn(size="sm" @click="showAdd = true" color="primary")
+  q-btn(@click="showAdd = true" color="primary")
     q-icon(name="add")
     span добавить пайщика
   q-dialog(v-model="showAdd" persistent :maximized="false" )
@@ -22,14 +22,13 @@ div
                 q-input(@change="changeEmail" v-model="state.email" standout="bg-teal text-white" label="Электронная почта" :rules='[validateEmail, validateExists]').q-mb-md
 
               template(#bottom="{userDataForm}")
-
                 q-input(
                   standout="bg-teal text-white"
                   v-model="addUserState.created_at"
                   mask="datetime"
                   label="Дата и время подписания заявления"
                   placeholder="год/месяц/день часы:минуты"
-                  :rules="[val => notEmpty(val)]"
+                  :rules="[val => notEmpty(val), val => validateDateWithinRange(100)(val)]"
                   autocomplete="off"
                   hint="когда пайщик был принят в кооператив"
                 ).q-mt-md
@@ -99,6 +98,7 @@ import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()
 
 import { notEmpty } from 'src/shared/lib/utils';
+import { validateDateWithinRange } from 'src/shared/lib/utils/dates/validateDateWithinRange';
 import { useAccountStore } from 'src/entities/Account/model';
 
 const { state, addUserState, clearUserData } = useRegistratorStore()
@@ -216,7 +216,7 @@ const addUserNow = (userDataForm: any) => {
         accountStore.getAccounts()
       } catch (e: any) {
         loading.value = false
-        FailAlert(`Возникла ошибка: ${e.message}`)
+        FailAlert(e)
       }
 
     } else {

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

@@ -3,19 +3,17 @@ import { useGlobalStore } from 'src/shared/store'
 import { api } from '../api'
 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'
+import { useInitWalletProcess } from 'src/processes/init-wallet'
 
 export function useLoginUser() {
   const globalStore = useGlobalStore()
   const currentUser = useCurrentUserStore()
-  const system = useSystemStore()
 
   async function login(email: string, wif: string): Promise<void> {
     const auth = await api.loginUser(email, wif);
     const { tokens, account } = await client.login(email, wif);
-
     // Создаём объект tokens с правильными типами
     const adaptedTokens: ITokens = {
       access: {
@@ -35,8 +33,8 @@ export function useLoginUser() {
     await session.init()
     client.setToken(auth.tokens.access.token)
 
-    await currentUser.loadProfile(globalStore.username, system.info.coopname)
-
+    const { run } = useInitWalletProcess()
+    await run() //запускаем фоновое обновление кошелька - заменить на подписку потом
     if (!currentUser.isRegistrationComplete){
       const {state, steps} = useRegistratorStore()
       state.userData.type = currentUser.userAccount?.type as 'individual' | 'entrepreneur' | 'organization'
@@ -48,7 +46,6 @@ export function useLoginUser() {
         organization: state.userData.organization_data,
         entrepreneur: state.userData.entrepreneur_data
       };
-
       const data = dataMap[state.userData.type];
       if (data) {
         for (const key of Object.keys(privateData)) {
@@ -74,7 +71,6 @@ export function useLoginUser() {
       else if (currentUser.userAccount?.status === 'registered')
         state.step = steps.Welcome
     }
-
   }
 
   return {

package/src/features/User/LoginUser/ui/LoginForm/LoginForm.vue

@@ -39,10 +39,6 @@ form(@submit.prevent="submit").full-width
 import { useCurrentUserStore } from 'src/entities/User';
 import { useLoginUser } from 'src/features/User/LoginUser';
 import { FailAlert } from 'src/shared/api';
-import { useSystemStore } from 'src/entities/System/model';
-const { info } = useSystemStore()
-
-import { useGlobalStore } from 'src/shared/store';
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
@@ -52,7 +48,6 @@ const email = ref('')
 const privateKey = ref('')
 const loading = ref(false)
 const currentUser = useCurrentUserStore()
-const globalStore = useGlobalStore()
 
 
 const submit = async () => {
@@ -60,7 +55,6 @@ const submit = async () => {
   try {
     const { login } = useLoginUser()
     await login(email.value, privateKey.value)
-    await currentUser.loadProfile(globalStore.username, info.coopname)
 
     if (!currentUser.isRegistrationComplete) {
       router.push({ name: 'signup' })

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

@@ -2,12 +2,13 @@ import { useSessionStore } from 'src/entities/Session'
 import { useGlobalStore } from 'src/shared/store'
 // import { api } from '../api'
 import { useCurrentUserStore } from 'src/entities/User'
+import { useRegistratorStore } from 'src/entities/Registrator'
 
 export function useLogoutUser() {
   async function logout(): Promise<void> {
     const global = useGlobalStore()
     //TODO: "начать с начала" при регистрации бажит на это - да и в целом пора бы маршруты срезать эти
-    // if (global.tokens?.refresh.token) await api.logoutUser(global.tokens?.refresh.token)
+    await useRegistratorStore().clearUserData()
 
     await global.logout()