diff --git a/src/components/SidebarMenu.vue b/src/components/SidebarMenu.vue index 66cc9cbe7cc68389db41626c6de9b9da6f78ad93..4e5faabd7e22e2902db0263c83787d7a0e2c62a3 100644 --- a/src/components/SidebarMenu.vue +++ b/src/components/SidebarMenu.vue @@ -93,10 +93,10 @@ export default defineComponent({ if (this.project && this.project.slug) { return [ { - href: this.hrefFromRouter({ + href: { name: "project-home", params: { slug: this.project.slug }, - }), + }, title: this.$t("sidebarmenu.project").toString() + ": " + @@ -119,10 +119,10 @@ export default defineComponent({ child: this.projects.map((project) => { return { title: project.displayName, - href: this.hrefFromRouter({ + href: { name: "project-home", params: { slug: project.slug! }, - }), + }, icon: "bi bi-folder2-open", }; }) as Array<SidebarItem | SidebarComponentItem | SidebarHeaderItem>, @@ -149,10 +149,10 @@ export default defineComponent({ (resource.type?.displayName ? resource.type.displayName + ": " : "") + resource.displayName, - href: this.hrefFromRouter({ + href: { name: "resource-home", params: { slug: this.project!.slug!, guid: resource.id! }, - }), + }, icon: "bi bi-archive", badge: resource.archived ? { @@ -179,26 +179,26 @@ export default defineComponent({ child: [ { title: this.$t("sidebarmenu.editProject").toString(), - href: this.hrefFromRouter({ + href: { name: "project-settings", params: { slug: this.project.slug }, - }), + }, icon: "bi bi-pencil", }, { title: this.$t("sidebarmenu.manageUsers").toString(), - href: this.hrefFromRouter({ + href: { name: "project-members", params: { slug: this.project.slug }, - }), + }, icon: "bi bi-people", }, { title: this.$t("sidebarmenu.manageQuota").toString(), - href: this.hrefFromRouter({ + href: { name: "project-quota", params: { slug: this.project.slug }, - }), + }, icon: "bi bi-sliders", }, ], @@ -223,10 +223,6 @@ export default defineComponent({ collapse(collapsed: boolean) { this.collapsed = collapsed; }, - hrefFromRouter(to: RawLocation) { - const routeData = this.$router.resolve(to); - return routeData.href; - }, }, }); </script> diff --git a/src/router/index.ts b/src/router/index.ts index e12d9fc2705f713be77073a361dd48823091ce1d..6ca8a5bc0e5e19d3670c5f3b7e3e21322c33615f 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -24,7 +24,7 @@ export const routes: RouteConfig[] = [ ]; const router = new VueRouter({ - base: "/", + base: import.meta.env.BASE_URL, mode: "history", routes, }); diff --git a/vite.config.js b/vite.config.js index 4672b93d68ffcbd6cb102c99eca8470c8878e720..7671466d39a4088d5266a134c5a8e5e6745b374f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -42,6 +42,9 @@ const config = defineConfig({ host: true, port: 9234, }, + + // Remove when final deploying it + base: (process.env.NODE_ENV === 'production') ? '/coscine/apps/ui/' : undefined, }); export default config;