hl-core 0.0.9-beta.4 → 0.0.9-beta.6

package/api/index.ts

@@ -1,5 +1,5 @@
 import { MemberCodes } from '../types/enum';
-import { useAxios } from '../composables/axios';
+import { useAxiosInstance } from '../composables/axios';
 import { Value, IDocument } from '../composables/classes';
 import { AxiosRequestConfig } from 'axios';
 
@@ -13,7 +13,7 @@ export class ApiClass {
   private readonly productUrl: string = import.meta.env.VITE_PRODUCT_URL as string;
 
   private async axiosCall<T>(config: AxiosRequestConfig): Promise<T> {
-    const { data } = await useAxios(this.baseURL).request<T>(config);
+    const { data } = await useAxiosInstance(this.baseURL).request<T>(config);
     return data;
   }
 

package/components/Pages/ContragentForm.vue

@@ -217,6 +217,7 @@
 </template>
 
 <script lang="ts">
+import { StoreMembers } from '../../types/enum';
 import { Member, Value } from '../../composables/classes';
 
 export default defineComponent({
@@ -229,6 +230,10 @@ export default defineComponent({
       type: String as PropType<'default' | 'panel'>,
       default: 'default',
     },
+    whichForm: {
+      type: String as PropType<'contragent' | keyof typeof StoreMembers>,
+      default: 'contragent',
+    },
   },
   emits: ['success'],
   setup(props, { emit }) {
@@ -314,7 +319,7 @@ export default defineComponent({
     };
 
     const saveMember = async () => {
-      const hasSaved = await dataStore.saveContragent(props.member, 'contragent', null, true);
+      const hasSaved = await dataStore.saveContragent(props.member, props.whichForm, null, true);
       if (hasSaved === false) {
         return false;
       }

package/components/Pages/MemberForm.vue

@@ -711,7 +711,7 @@ export default {
         if (dataStore.isGons || dataStore.isBolashak) {
           return [];
         }
-        if ((dataStore.isKazyna || dataStore.isLiferenta) && member.value.age < 18) {
+        if ((dataStore.isKazyna || dataStore.isLiferenta) && Number(member.value.age) < 18) {
           return [];
         }
       }
@@ -1078,7 +1078,7 @@ export default {
         }
       }
       if (dataStore.isKazyna || dataStore.isLiferenta) {
-        if (whichForm.value === formStore.beneficiaryFormKey && member.value.age < 18) {
+        if (whichForm.value === formStore.beneficiaryFormKey && Number(member.value.age) < 18) {
           return true;
         }
       }

package/composables/axios.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import interceptors from '../api/interceptors';
 
-export const useAxios = (baseURL: string) => {
+export const useAxiosInstance = (baseURL: string) => {
   const axiosInstance = axios.create({
     baseURL: baseURL,
   });

package/nuxt.config.ts

@@ -6,7 +6,7 @@ import VueI18nVitePlugin from '@intlify/unplugin-vue-i18n/vite';
 export default defineNuxtConfig({
   ssr: false,
   spaLoadingTemplate: false,
-  modules: ['@pinia/nuxt', '@nuxtjs/tailwindcss', '@nuxt/devtools'],
+  modules: ['@pinia/nuxt', '@nuxtjs/tailwindcss', '@nuxt/devtools', '@vueuse/nuxt'],
 
   imports: {
     dirs: ['store', 'composables'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.4",
+  "version": "0.0.9-beta.6",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -42,6 +42,9 @@
   },
   "devDependencies": {
     "@nuxt/devtools": "^0.4.5",
+    "@vueuse/components": "^10.2.1",
+    "@vueuse/core": "^10.2.1",
+    "@vueuse/nuxt": "^10.2.1",
     "nuxt": "^3.6.2",
     "prettier": "^2.8.8"
   },
@@ -59,7 +62,6 @@
     "pinia": "^2.1.4",
     "typedoc": "^0.24.8",
     "typescript": "5.0.4",
-    "v-idle-3": "^0.3.14",
     "vue-i18n": "^9.2.2",
     "vue-json-pretty": "^2.2.4",
     "vue-toastification": "^2.0.0-rc.5",

package/plugins/helperFunctionsPlugins.ts

@@ -3,13 +3,10 @@ import { constants } from '../composables/constants';
 import { Styles } from '../composables/styles';
 import VueDatePicker from '@vuepic/vue-datepicker';
 import '@vuepic/vue-datepicker/dist/main.css';
-import Vidle from 'v-idle-3';
 import Maska from 'maska';
 import i18n from '../configs/i18n';
 
 export default defineNuxtPlugin(nuxtApp => {
-  //@ts-ignore
-  nuxtApp.vueApp.use(Vidle, {});
   nuxtApp.vueApp.use(Maska);
   nuxtApp.vueApp.use(i18n);
   nuxtApp.vueApp.component('VueDatePicker', VueDatePicker);