hl-core 0.0.7-beta.6 → 0.0.7-beta.8

package/api/index.ts

@@ -8,7 +8,7 @@ enum Methods {
 
 export class ApiClass {
   baseURL: string | undefined;
-  constructor(baseURL: string | undefined) {
+  constructor(baseURL?: string | undefined) {
     this.baseURL = baseURL;
   }
 

package/components/Complex/Page.vue

@@ -1,7 +1,7 @@
 <template>
   <base-content class="flex-col" :class="[$libStyles.whiteBg]">
     <base-header
-      class="justify-start pl-14"
+      class="justify-center lg:pl-14"
       :has-back="hasBack"
       :back-icon="backIcon"
       :has-more="hasMore"

package/components/Layout/Drawer.vue

@@ -0,0 +1,42 @@
+<template>
+  <v-navigation-drawer
+    v-model="$dataStore[whichPanel].open"
+    :temporary="$dataStore[whichPanel].overlay"
+    location="right"
+    class="sm:!w-[400px] lg:!relative"
+    :class="[
+      $dataStore[whichPanel].overlay ? 'lg:!hidden' : '',
+      $dataStore[whichPanel].open ? '!w-full lg:!w-[420px]' : 'lg:!w-[0px]',
+    ]"
+  >
+    <base-header
+      :title="panelTitle"
+      :has-back="true"
+      back-icon="mdi-close"
+      class="justify-center"
+      @onBack="$dataStore[whichPanel].open = false"
+    ></base-header>
+    <div>
+      <slot></slot>
+    </div>
+  </v-navigation-drawer>
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  name: 'BasePanel',
+  props: {
+    panelTitle: {
+      type: String,
+      default: '',
+    },
+    whichPanel: {
+      type: String as PropType<'settings' | 'panel'>,
+      default: 'panel',
+    },
+  },
+  setup() {
+    return {};
+  },
+});
+</script>

package/components/Layout/SettingsPanel.vue

@@ -1,72 +1,54 @@
 <template>
-  <v-navigation-drawer
-    v-model="$dataStore.settings.open"
-    :temporary="$dataStore.settings.overlay"
-    location="right"
-    class="sm:!w-[400px] lg:!relative"
-    :class="[
-      $dataStore.settings.overlay ? 'lg:!hidden' : '',
-      $dataStore.settings.open ? '!w-full lg:!w-[420px]' : 'lg:!w-[0px]',
-    ]"
-  >
-    <base-header
-      :title="$dataStore.menu.title"
-      :has-back="true"
-      back-icon="mdi-close"
-      class="justify-center"
-      @onBack="$dataStore.settings.open = false"
-    ></base-header>
-    <div>
-      <span
-        class="transition-all h-[64px] px-4 flex justify-between items-center border-b-[1px] hover:border-b-[#A0B3D8]"
-      >
-        <v-btn
-          size="x-small"
-          icon="mdi-minus"
-          color="#A0B3D8"
-          class="text-white"
-          variant="flat"
-        ></v-btn>
-        Шрифт
-        <v-btn
-          size="x-small"
-          icon="mdi-plus"
-          color="#A0B3D8"
-          class="text-white"
-          variant="flat"
-        ></v-btn>
-      </span>
-      <span
-        class="transition-all h-[64px] px-4 flex justify-between items-center border-b-[1px] hover:border-b-[#A0B3D8]"
-      >
-        <v-text-field
-          v-model="$dataStore.user.fullName"
-          :readonly="true"
-          hide-details
-          variant="plain"
-          :label="$dataStore.user.roles?.join(', ')"
-        ></v-text-field>
-        <i class="mdi mdi-account-outline text-2xl text-[#A0B3D8]"></i>
-      </span>
-      <span
-        class="transition-all h-[64px] px-4 flex justify-between items-center border-b-[1px] cursor-pointer hover:border-b-[#A0B3D8]"
-        @click="dialog = true"
-      >
-        Выход
+  <base-drawer :panel-title="$dataStore.menu.title" which-panel="settings">
+    <span
+      class="transition-all h-[64px] px-4 flex justify-between items-center border-b-[1px] hover:border-b-[#A0B3D8]"
+    >
+      <v-btn
+        size="x-small"
+        icon="mdi-minus"
+        color="#A0B3D8"
+        class="text-white"
+        variant="flat"
+      ></v-btn>
+      Шрифт
+      <v-btn
+        size="x-small"
+        icon="mdi-plus"
+        color="#A0B3D8"
+        class="text-white"
+        variant="flat"
+      ></v-btn>
+    </span>
+    <span
+      class="transition-all h-[64px] px-4 flex justify-between items-center border-b-[1px] hover:border-b-[#A0B3D8]"
+    >
+      <v-text-field
+        v-model="$dataStore.user.fullName"
+        :readonly="true"
+        hide-details
+        variant="plain"
+        :label="$dataStore.user.roles?.join(', ')"
+      ></v-text-field>
+      <i class="mdi mdi-account-outline text-2xl text-[#A0B3D8]"></i>
+    </span>
+    <span
+      class="transition-all h-[64px] px-4 flex justify-between items-center border-b-[1px] cursor-pointer hover:border-b-[#A0B3D8]"
+      @click="dialog = true"
+    >
+      Выход
 
-        <i class="mdi mdi-logout text-xl text-[#A0B3D8]"></i>
-      </span>
-      <base-dialog
-        v-model="dialog"
-        :title="$t('dialog.exit')"
-        :subtitle="$t('dialog.dataWillClear')"
-        actions="default"
-        @yes="logoutUser"
-        @no="dialog = false"
-      >
-      </base-dialog>
-    </div>
-  </v-navigation-drawer>
+      <i class="mdi mdi-logout text-xl text-[#A0B3D8]"></i>
+    </span>
+    <base-dialog
+      v-model="dialog"
+      :title="$t('dialog.exit')"
+      :subtitle="$t('dialog.dataWillClear')"
+      actions="default"
+      @yes="logoutUser"
+      @no="dialog = false"
+    >
+    </base-dialog
+  ></base-drawer>
 </template>
 
 <script lang="ts" setup>

package/composables/classes.ts

@@ -753,6 +753,10 @@ export class DataStoreClass {
     open: boolean;
     overlay: boolean;
   };
+  panel: {
+    open: boolean;
+    overlay: boolean;
+  };
   historyPageIndex: number;
   historyPageSize: number;
   historyTotalItems: number;
@@ -812,6 +816,10 @@ export class DataStoreClass {
       open: false,
       overlay: false,
     };
+    this.panel = {
+      open: false,
+      overlay: false,
+    };
     this.historyPageIndex = 1;
     this.historyPageSize = 10;
     this.historyTotalItems = 0;

package/composables/constants.ts

@@ -1,16 +1,13 @@
 export const constants = Object.freeze({
   products: {
+    pensionannuity: 1,
     baiterek: 3,
     halykmycar: 5,
     lifetrip: 7,
     bolashak: 8,
     liferenta: 9,
   },
-  BAITEREK_ROUTE: 'baiterek',
-  MYCAR_ROUTE: 'halykmycar',
-  LIFETRIP_ROUTE: 'lifetrip',
-  BOLASHAK_ROUTE: 'bolashak',
-  LIFERENTA_ROUTE: 'liferenta',
+
   editableStatuses: ['StartForm', 'EditBeneficiaryForm', 'EditForm'],
   documentsLinkVisibleStatuses: [
     'DocumentsSignedFrom',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.7-beta.6",
+  "version": "0.0.7-beta.8",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -24,13 +24,13 @@
   },
   "devDependencies": {
     "@nuxt/devtools": "^0.2.5",
-    "nuxt": "^3.2.3",
+    "nuxt": "^3.3.1",
     "prettier": "^2.8.4",
     "typescript": "^4.9.5"
   },
   "dependencies": {
     "@mdi/font": "^7.1.96",
-    "@nuxtjs/tailwindcss": "^6.4.1",
+    "@nuxtjs/tailwindcss": "^6.6.0",
     "@pinia/nuxt": "^0.4.7",
     "animate.css": "^4.1.1",
     "axios": "^1.3.4",
@@ -39,6 +39,6 @@
     "pinia": "^2.0.33",
     "v-idle-3": "^0.3.14",
     "vue-toastification": "^2.0.0-rc.5",
-    "vuetify": "^3.1.8"
+    "vuetify": "^3.1.10"
   }
 }

package/store/data.store.js

@@ -34,6 +34,12 @@ export const useDataStore = defineStore('data', {
   }),
   getters: {
     isEFO: state => state.product === 'efo',
+    isBaiterek: state => state.product === 'baiterek',
+    isBolashak: state => state.product === 'bolashak',
+    isMycar: state => state.product === 'mycar',
+    isLifetrip: state => state.product === 'lifetrip',
+    isLiferenta: state => state.product === 'liferenta',
+    isPension: state => state.product === 'pension',
   },
   actions: {
     sendToParent(action, value) {

package/store/messages.ts

@@ -287,7 +287,7 @@ export const messages = {
     },
     agreementBlock: {
       title: 'Согласие на сбор и обработку пресональных данных',
-      text: `Я, {text} предоставляю АО «Халык-Life» (БИН 051140004354) и (или) организациям,
+      text: `Я, предоставляю АО «Халык-Life» (БИН 051140004354) и (или) организациям,
                   входящими в состав финансовой Группы «Халык» (Акционеру АО «Халык-Life» (БИН 940140000385) и его дочерним организациям),
                   перестраховочным организациям, организации по формированию и ведению базы данных по страхованию (БИН 120940011577), юридическому лицу,
                   осуществляющему деятельность по привлечению пенсионных взносов и пенсионным выплатам (БИН 971240002115), юридическому лицу,

package/tailwind.config.js

@@ -1,10 +1,10 @@
-module.exports = {
-  theme: {
-    screens: {
-      sm: { min: '600px' },
-      md: { min: '960px' },
-      lg: { min: '1280px' },
-      xl: { min: '1920px' },
-    },
-  },
-};
+module.exports = {
+  theme: {
+    screens: {
+      sm: { min: '600px' },
+      md: { min: '960px' },
+      lg: { min: '1280px' },
+      xl: { min: '1920px' },
+    },
+  },
+};

package/components/Layout/Panel.vue

@@ -1,47 +0,0 @@
-<template>
-  <v-navigation-drawer
-    v-model="$dataStore.settings.open"
-    :temporary="$dataStore.settings.overlay"
-    location="right"
-    class="!w-full sm:!w-[400px] lg:!hidden"
-  >
-    <base-header
-      :title="$dataStore.menu.title"
-      :has-back="true"
-      back-icon="mdi-close"
-      class="justify-center"
-      @onBack="$dataStore.settings.open = false"
-    ></base-header>
-    <div>
-      <slot></slot>
-    </div>
-    <base-dialog
-      v-model="dialog"
-      :title="$t('dialog.exit')"
-      :subtitle="$t('dialog.dataWillClear')"
-      actions="default"
-      @yes="closeModal"
-      @no="dialog = false"
-    >
-    </base-dialog>
-  </v-navigation-drawer>
-</template>
-
-<script lang="ts">
-export default defineComponent({
-  name: 'BasePanel',
-  props: {},
-  setup() {
-    const dialog = ref(false);
-    const dataStore = useDataStore();
-
-    const closeModal = async () => {
-      dialog.value = false;
-    };
-    return {
-      dialog,
-      closeModal,
-    };
-  },
-});
-</script>