shared-ritm 1.0.73 → 1.0.75

package/dist/types/router/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("vue-router").Router;
+export default router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "private": false,
   "files": [
     "dist",
@@ -31,7 +31,8 @@
     "@vueuse/core": "^10.1.2",
     "axios": "^1.7.7",
     "quasar": "^2.17.1",
-    "vue": "^3.5.12"
+    "vue": "^3.5.12",
+    "vue-router": "^4.0.3"
   },
   "devDependencies": {
     "@quasar/vite-plugin": "^1.8.0",

package/src/common/app-sidebar/AppSidebar.vue

@@ -45,7 +45,7 @@
         <q-tooltip>Закрепить сайдбар</q-tooltip>
       </q-btn>
     </template>
-    <sidebar-menu :menu-items="menuItems" :minify="isSidebarMini" />
+    <sidebar-menu :main="main" :menu-items="menuItems" :minify="isSidebarMini" />
     <q-item v-ripple :class="$style['menu-exit']" clickable @click="logout()">
       <q-item-section avatar>
         <app-icon :name="'logout-icon'" color="white" size="24px" />
@@ -56,7 +56,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, defineProps, defineEmits, ref, watch } from 'vue'
+import { computed, defineProps, defineEmits, ref, watch, withDefaults } from 'vue'
 import SidebarMenu from './components/SidebarMenu.vue'
 
 import { useQuasar } from 'quasar'
@@ -66,9 +66,12 @@ interface Props {
   isDrawer: boolean
   minify?: boolean
   menuItems?: any[]
+  main?: boolean
 }
 const emits = defineEmits(['logout'])
-const props = defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  main: false,
+})
 const $q = useQuasar()
 
 const drawer = ref(true)

package/src/common/app-sidebar/components/SidebarMenu.vue

@@ -1,17 +1,33 @@
 <template>
   <div :class="$style.wrapper">
-    <sidebar-menu-item v-for="(item, index) in menuItems" :key="index" :item="item" :minify="minify" />
+    <sidebar-menu-item
+      v-for="(item, index) in menuItems"
+      :key="index"
+      :item="item"
+      :minify="minify"
+      @go-to-route="goToRoute"
+    />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { defineProps } from 'vue'
 import SidebarMenuItem from './SidebarMenuItem.vue'
+import { useRouter } from 'vue-router'
 
 interface Props {
   menuItems?: any[]
   minify?: boolean
+  main: boolean
 }
+
+const router = useRouter()
+
+const goToRoute = (to: string) => {
+  if (!props.main) window.location.href = to
+  router.push(to)
+}
+
 const props = defineProps<Props>()
 </script>
 

package/src/common/app-sidebar/components/SidebarMenuItem.vue

@@ -33,7 +33,7 @@
     :active="isRouteActive(item)"
     active-class="menu-active"
     clickable
-    :to="item.to"
+    @click="emits('goToRoute', item.to)"
   >
     <q-tooltip
       v-if="minify"
@@ -70,16 +70,13 @@ interface Props {
   }
 }
 
+const emits = defineEmits(['goToRoute'])
 const props = defineProps<Props>()
 
 const test = reactive({
   'repairs-icon': true,
 })
 
-const goToRoute = (item: any) => {
-  window.location.href = item.to
-}
-
 const isRouteActive = (item: any) => {
   return (item.to === '' && item.items.find((x: any) => x.to === '/repairs/')) || item.to === '/repairs/'
 }

package/src/main.ts

@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import { Quasar } from 'quasar'
-
+import router from './router'
 import '@quasar/extras/material-icons/material-icons.css'
 import 'quasar/src/css/index.sass'
 
@@ -12,4 +12,5 @@ const app = createApp(App)
 
 //@ts-ignore
 app.use(Quasar, { plugins: [] })
+app.use(router)
 app.mount('#app')

package/src/router/index.ts

@@ -0,0 +1,10 @@
+import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
+
+const routes: RouteRecordRaw[] = []
+
+const router = createRouter({
+  history: createWebHistory(),
+  routes,
+})
+
+export default router