hl-core 0.0.7-beta.5 → 0.0.7-beta.7

package/api/index.ts

@@ -283,6 +283,7 @@ export class ApiClass {
     return this.axiosCall({
       method: Methods.GET,
       url: '/Arm/api/Bpm/ProcessList',
+      timeout: 10000,
     });
   }
 }

package/api/interceptors.ts

@@ -19,8 +19,6 @@ export default function (axios: AxiosInstance) {
       const dataStore = useDataStore();
       const router = useRouter();
       if (error.response.status === 401) {
-        dataStore.$reset();
-        localStorage.clear();
         if (dataStore.isEFO) {
           router.push({ name: 'Auth', query: { error: 401 } });
         } else {
@@ -28,12 +26,12 @@ export default function (axios: AxiosInstance) {
         }
       }
       if (error.response.status === 500) {
-        dataStore.$reset();
-        localStorage.clear();
         if (router.currentRoute.value.name !== 'Auth') {
           router.push({ name: '500', query: { stack: error.stack } });
         }
       }
+      dataStore.$reset();
+      localStorage.clear();
       return Promise.reject(error);
     },
   );

package/components/Complex/Content.vue

@@ -1,5 +1,5 @@
 <template>
-  <aside class="w-full hidden lg:flex lg:w-3/4">
+  <aside class="w-full lg:flex lg:w-3/4">
     <slot></slot>
   </aside>
 </template>

package/components/Complex/Page.vue

@@ -1,11 +1,14 @@
 <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"
+      :more-icon="moreIcon"
       :title="title"
       @onBack="$emit('onBack')"
+      @onMore="$emit('onMore')"
     ></base-header>
     <slot></slot>
   </base-content>
@@ -22,11 +25,19 @@ export default defineComponent({
       type: String,
       default: 'mdi-arrow-left',
     },
+    hasMore: {
+      type: Boolean,
+      default: false,
+    },
+    moreIcon: {
+      type: String,
+      default: 'mdi-cog-outline',
+    },
     title: {
       type: String,
       default: '',
     },
   },
-  emits: ['onBack'],
+  emits: ['onBack', 'onMore'],
 });
 </script>

package/components/Layout/Header.vue

@@ -6,10 +6,17 @@
     <i
       v-if="hasBack"
       @click="$emit('onBack')"
-      class="absolute left-5 mdi text-lg cursor-pointer"
+      class="absolute left-5 mdi text-xl cursor-pointer"
       :class="[backIcon]"
     ></i>
     {{ title }}
+    <i
+      v-if="hasMore"
+      @click="$emit('onMore')"
+      class="mdi absolute right-5 text-xl cursor-pointer"
+      :class="[moreIcon, hideMoreOnLg ? 'lg:!hidden' : '']"
+    >
+    </i>
   </header>
 </template>
 
@@ -20,15 +27,36 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    hasMore: {
+      type: Boolean,
+      default: false,
+    },
+    hideMoreOnLg: {
+      type: Boolean,
+      default: false,
+    },
     backIcon: {
       type: String,
       default: 'mdi-arrow-left',
     },
+    moreIcon: {
+      type: String,
+      default: 'mdi-cog-outline',
+    },
     title: {
       type: String,
       default: '',
     },
   },
-  emits: ['onBack'],
+  emits: ['onBack', 'onMore'],
+  setup() {
+    const dataStore = useDataStore();
+
+    const onClickOutside = () => {
+      dataStore.settings.open = false;
+    };
+
+    return { onClickOutside };
+  },
 });
 </script>

package/components/Layout/Panel.vue

@@ -0,0 +1,33 @@
+<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>
+      <slot></slot>
+    </div>
+  </v-navigation-drawer>
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  name: 'BasePanel',
+  props: {},
+  setup() {
+    return {};
+  },
+});
+</script>

package/components/Layout/SettingsPanel.vue

@@ -0,0 +1,80 @@
+<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"
+      >
+        Выход
+
+        <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>
+</template>
+
+<script lang="ts" setup>
+const dialog = ref(false);
+const dataStore = useDataStore();
+
+const logoutUser = async () => {
+  dialog.value = false;
+  await dataStore.logoutUser();
+};
+</script>

package/components/Menu/MenuNav.vue

@@ -5,7 +5,11 @@
       :title="title"
       :has-back="hasBack"
       :back-icon="backIcon"
+      :has-more="hasMore"
+      :hide-more-on-lg="hideMoreOnLg"
+      :more-icon="moreIcon"
       @onBack="$emit('onBack')"
+      @onMore="$emit('onMore')"
     ></base-header>
     <slot key="slot-content" name="content"></slot>
     <section key="main" class="px-2 pt-[14px] flex flex-col gap-[10px]">
@@ -56,8 +60,20 @@ export default defineComponent({
       type: String,
       default: 'mdi-arrow-left',
     },
+    hasMore: {
+      type: Boolean,
+      default: false,
+    },
+    hideMoreOnLg: {
+      type: Boolean,
+      default: false,
+    },
+    moreIcon: {
+      type: String,
+      default: 'mdi-cog-outline',
+    },
   },
-  emits: ['update:modelValue', 'onLink', 'onBack', 'clicked'],
+  emits: ['update:modelValue', 'onLink', 'onBack', 'onMore', 'clicked'],
   setup(props, { emit }) {
     const dataStore = useDataStore();
     const pickItem = (item: MenuItem) => {

package/composables/classes.ts

@@ -737,6 +737,8 @@ export class ProductConditions {
 }
 
 export class DataStoreClass {
+  product: string | null;
+  showNav: boolean;
   menuItems: MenuItem[];
   menu: {
     title: string;
@@ -747,12 +749,16 @@ export class DataStoreClass {
     onLink: any;
     selectedItem: MenuItem;
   };
+  settings: {
+    open: boolean;
+    overlay: boolean;
+  };
   historyPageIndex: number;
   historyPageSize: number;
   historyTotalItems: number;
   isColumnAsc = { ...InitialColumns() };
   idleKey: number;
-  processList: any[];
+  processList: any[] | null;
   countries: Value[];
   citizenshipCountries: Value[];
   taxCountries: Value[];
@@ -790,6 +796,8 @@ export class DataStoreClass {
   userGroups: any[];
   onMainPage: boolean;
   constructor() {
+    this.product = null;
+    this.showNav = true;
     this.menuItems = [];
     this.menu = {
       title: '',
@@ -800,12 +808,16 @@ export class DataStoreClass {
       onLink: {},
       selectedItem: new MenuItem(),
     };
+    this.settings = {
+      open: false,
+      overlay: false,
+    };
     this.historyPageIndex = 1;
     this.historyPageSize = 10;
     this.historyTotalItems = 0;
     this.isColumnAsc = { ...InitialColumns() };
     this.idleKey = 999;
-    this.processList = [];
+    this.processList = null;
     this.countries = [];
     this.citizenshipCountries = [];
     this.taxCountries = [];

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',
@@ -50,8 +47,9 @@ export const constants = Object.freeze({
     applicationCreated: 'applicationCreated',
     clipboard: 'clipboard',
     toHomePage: 'toHomePage',
-    DOMevent: 'DOMevent',
     toStatementHistory: 'toStatementHistory',
+    toAuth: 'toAuth',
+    DOMevent: 'DOMevent',
     Error401: 'Error401',
     Error500: 'Error500',
   },

package/layouts/default.vue

@@ -6,16 +6,24 @@
     ></div>
     <section class="flex h-full" :class="$libStyles.blueBgLight">
       <base-menu-nav
+        v-if="$dataStore.showNav"
         v-model="$dataStore.menu.selectedItem"
         :selected="$dataStore.menu.selectedItem"
         :title="$dataStore.menu.title ?? 'Страховые продукты'"
         :has-back="$dataStore.menu.hasBack ?? false"
         :back-icon="$dataStore.menu.backIcon ?? 'mdi-arrow-left'"
+        :has-more="
+          'hasMore' in $route.meta && $route.meta.hasMore
+            ? !!$route.meta.hasMore
+            : false
+        "
+        :hide-more-on-lg="true"
         :class="{
           '!hidden':
             !$display().lgAndUp.value && !!$dataStore.menu.selectedItem.title,
         }"
         @onBack="$dataStore.menu.onBack"
+        @onMore="openSettings"
         @onLink="$dataStore.menu.onLink"
       >
         <template #end>
@@ -26,6 +34,15 @@
         </template>
       </base-menu-nav>
       <slot> </slot>
+      <base-settings-panel></base-settings-panel>
     </section>
   </div>
 </template>
+
+<script setup lang="ts">
+const dataStore = useDataStore();
+
+const openSettings = async () => {
+  dataStore.settings.open = true;
+};
+</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.7-beta.5",
+  "version": "0.0.7-beta.7",
   "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

@@ -9,7 +9,6 @@ import { ApiClass } from '@/api';
 export const useDataStore = defineStore('data', {
   state: () => ({
     ...new DataStoreClass(),
-    product: null,
     t: t,
     rules: rules,
     toast: Toast,
@@ -176,12 +175,20 @@ export const useDataStore = defineStore('data', {
     async logoutUser() {
       this.isLoading = true;
       try {
+        const whichProduct = this.product;
         const token = JSON.parse(localStorage.getItem('accessToken'));
         if (token) {
           this.$reset();
           localStorage.clear();
+
+          if (whichProduct === 'efo') {
+            await this.router.push({ name: 'Auth' });
+          } else {
+            this.sendToParent(constants.postActions.toAuth, null);
+          }
+        } else {
+          this.showToaster('error', this.t('toaster.undefinedError'), 3000);
         }
-        await this.router.push({ name: 'Auth' });
       } catch (err) {
         console.log(err);
       }
@@ -1118,7 +1125,7 @@ export const useDataStore = defineStore('data', {
       this.isLoading = true;
       try {
         const processList = await this.api.getProcessList();
-        if (processList.length > 0) {
+        if (this.processList === null) {
           this.processList = processList;
         }
       } catch (err) {

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' },
+    },
+  },
+};