hl-core 0.0.9-beta.9 → 0.0.10-beta.10

package/layouts/default.vue

@@ -1,15 +1,18 @@
 <template>
   <div class="h-full z-[1]" :class="[$dataStore.hasLayoutMargins ? 'lg:mx-[22px] lg:my-[33px] lg:shadow-xl' : '']">
     <div :class="[$styles.greenBg]" class="hidden z-[-1] lg:block absolute left-0 top-0 h-[200px] w-full"></div>
-    <section class="flex h-full" :class="$styles.blueBgLight">
+    <section class="flex h-full relative" :class="$styles.blueBgLight">
       <base-menu-nav
         v-if="$dataStore.showNav"
         :selected="$dataStore.menu.selectedItem"
         :title="$dataStore.menu.title ?? 'Страховые продукты'"
         :has-back="$dataStore.menu.hasBack ?? false"
         :back-icon="$dataStore.menu.backIcon ?? 'mdi-arrow-left'"
-        :more-icon="$dataStore.menu.moreIcon ?? 'mdi-cog-outline'"
-        :has-more="'hasMore' in $route.meta && $route.meta.hasMore ? !!$route.meta.hasMore : false"
+        :more-icon="$dataStore.menu.moreIcon ?? 'mdi-dots-vertical'"
+        :has-more="'hasMore' in $route.meta ? !!$route.meta.hasMore : true"
+        :has-info="$dataStore.menu.hasInfo"
+        :info-icon="$dataStore.menu.infoIcon"
+        :info-items="$dataStore.menu.infoItems"
         :class="{
           // @ts-ignore
           '!hidden': !$display().lgAndUp.value && !!$dataStore.menu.selectedItem.title,
@@ -23,6 +26,7 @@
         </template>
       </base-menu-nav>
       <slot></slot>
+      <base-drawer which-panel="rightPanel" :panel-title="$dataStore.rightPanel.title" side="right" />
       <base-settings-panel />
     </section>
   </div>
@@ -31,6 +35,7 @@
 <script setup lang="ts">
 import { MenuItem } from '../composables/classes';
 const dataStore = useDataStore();
+const { $pwa } = useNuxtApp();
 
 const openSettings = async () => {
   dataStore.settings.open = true;
@@ -44,6 +49,60 @@ const onLink = async (item: MenuItem) => {
 const onBack = async (item: MenuItem) => {
   if (dataStore.menu.onBack) await dataStore.menu.onBack(item);
 };
+
+const onInit = async () => {
+  const projectConfig = dataStore.projectConfig;
+  if (!useEnv().isProduction && process.env.NODE_ENV === 'production' && $pwa && projectConfig === null) {
+    const hasConfig = await dataStore.getProjectConfig();
+    if (hasConfig === true) {
+      const commitVersion = String(import.meta.env.VITE_COMMIT_VERSION);
+      if (dataStore.projectConfig !== null && commitVersion !== dataStore.projectConfig.version) {
+        //@ts-ignore
+        await $pwa.updateServiceWorker(true);
+      }
+    }
+  }
+};
+
+onInit();
+
+watch(
+  () => dataStore.settings.open,
+  () => {
+    if (dataStore.settings.open === true && dataStore.panel.open === true) {
+      dataStore.panel.open = false;
+      dataStore.panelAction = null;
+    }
+    if (dataStore.settings.open === true && dataStore.rightPanel.open === true) {
+      dataStore.rightPanel.open = false;
+    }
+  },
+);
+
+watch(
+  () => dataStore.rightPanel.open,
+  () => {
+    if (dataStore.rightPanel.open === true && dataStore.panel.open === true) {
+      dataStore.panel.open = false;
+      dataStore.panelAction = null;
+    }
+    if (dataStore.rightPanel.open === true && dataStore.settings.open === true) {
+      dataStore.settings.open = false;
+    }
+  },
+);
+
+watch(
+  () => dataStore.panel.open,
+  () => {
+    if (dataStore.panel.open === true && dataStore.settings.open === true) {
+      dataStore.settings.open = false;
+    }
+    if (dataStore.panel.open === true && dataStore.rightPanel.open === true) {
+      dataStore.rightPanel.open = false;
+    }
+  },
+);
 </script>
 <style>
 .mainpage,

package/layouts/full.vue

@@ -4,3 +4,24 @@
     <slot></slot>
   </div>
 </template>
+
+<script setup lang="ts">
+const dataStore = useDataStore();
+const { $pwa } = useNuxtApp();
+
+const onInit = async () => {
+  const projectConfig = dataStore.projectConfig;
+  if (!useEnv().isProduction && process.env.NODE_ENV === 'production' && $pwa && projectConfig === null) {
+    const hasConfig = await dataStore.getProjectConfig();
+    if (hasConfig === true) {
+      const commitVersion = String(import.meta.env.VITE_COMMIT_VERSION);
+      if (dataStore.projectConfig !== null && commitVersion !== dataStore.projectConfig.version) {
+        //@ts-ignore
+        await $pwa.updateServiceWorker(true);
+      }
+    }
+  }
+};
+
+onInit();
+</script>