fcad-core-dragon 2.0.0-beta.1 → 2.0.0-beta.3

package/src/router/index.js

@@ -1,41 +1,43 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import routes from './routes'
-
-Vue.use(VueRouter)
-
-const router = new VueRouter({
-  base: process.env.BASE_URL,
-  routes,
-  scrollBehavior(to, from, savedPosition) {
-    if (to.hash) {
-      from, savedPosition
-      return {
-        selector: to.hash
-        // , offset: { x: 0, y: 10 }
-      }
-    }
-  }
-})
-
-router.beforeResolve((to, from, next) => {
-  const noNavigationToMenu = Vue.prototype.$helper.getSettingsFromStore(
-    'no_menu'
-  )
-
-  Vue.prototype.$bus.$emit('update-route-history', from)
-  Vue.prototype.$bus.$emit('update-content', to, from, next)
-
-  if (noNavigationToMenu && to.name == 'menu') {
-    const r = Vue.prototype.$helper.getRoutesFromVueRouter() //This return all the routes defined for the module
-    let safeRoute = r.meta.children[0] //get the first navigable route from the module routes
-
-    return next({
-      name: safeRoute._namedRoute // redirect to safety route //
-    })
-  }
-
-  return next(true)
-})
-
-export default router
+//import VueRouter from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router'
+import routes from './routes'
+import { useAppStore } from '../module/stores/appStore'
+import { inject } from 'vue'
+
+//Vue.use(VueRouter)
+
+const router = createRouter({
+  history: createWebHashHistory(),
+  routes,
+  scrollBehavior(to, from, savedPosition) {
+    if (to.hash) {
+      from, savedPosition
+      return {
+        selector: to.hash
+        // , offset: { x: 0, y: 10 }
+      }
+    }
+  }
+})
+
+router.beforeResolve((to, from, next) => {
+  const appStore = useAppStore()
+  const app = inject('app')
+  const noNavigationToMenu = appStore.getSettingsFromStore('no_menu')
+
+  app.config.globalProperties.$bus.$emit('update-route-history', from)
+  app.config.globalProperties.$bus.$emit('update-content', to, from, next)
+
+  if (noNavigationToMenu && to.name == 'menu') {
+    const r = app.config.globalProperties.$helper.getRoutesFromVueRouter() //This return all the routes defined for the module
+    let safeRoute = r.meta.children[0] //get the first navigable route from the module routes
+
+    return next({
+      name: safeRoute._namedRoute // redirect to safety route //
+    })
+  }
+
+  return next(true)
+})
+
+export default router