diff --git a/app/package.json b/app/package.json index a68da12f..2ae083bb 100644 --- a/app/package.json +++ b/app/package.json @@ -22,7 +22,7 @@ "simple-evaluate": "^1.4.6", "vue": "3.3.4", "vue-i18n": "^8.28.2", - "vue-router": "^3.6.5", + "vue-router": "^4.3.0", "vue-showdown": "^2.4.1", "vuelidate": "^0.7.7", "vuex": "^3.6.2" diff --git a/app/src/App.vue b/app/src/App.vue index b45efeb9..c4da2555 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -6,7 +6,6 @@ @@ -45,10 +44,12 @@
- - - - + + + + + +
diff --git a/app/src/components/RoutableTabs.vue b/app/src/components/RoutableTabs.vue index dfeff852..65144624 100644 --- a/app/src/components/RoutableTabs.vue +++ b/app/src/components/RoutableTabs.vue @@ -6,7 +6,6 @@ v-for="route in routes" :key="route.text" :to="route.to" - exact exact-active-class="active" > @@ -16,16 +15,18 @@ - - - - + + + + + + diff --git a/app/src/router/index.js b/app/src/router/index.js index dcb54734..8af04f87 100644 --- a/app/src/router/index.js +++ b/app/src/router/index.js @@ -1,13 +1,9 @@ -import Vue from 'vue' -import VueRouter from 'vue-router' +import { createRouter, createWebHashHistory } from 'vue-router' import routes from './routes' import store from '@/store' -Vue.use(VueRouter) - -const router = new VueRouter({ - // mode: 'history', // this allow all routes to be real ones (without '#') - base: import.meta.env.BASE_URL, +const router = createRouter({ + history: createWebHashHistory(import.meta.env.BASE_URL), routes, scrollBehavior(to, from, savedPosition) { @@ -22,7 +18,7 @@ const router = new VueRouter({ setTimeout(() => resolve(savedPosition), 0) }) } else { - return savedPosition || { x: 0, y: 0 } + return savedPosition || { left: 0, top: 0 } } }, })