Skip to content
Snippets Groups Projects
Commit 75f17a96 authored by Kimia Beheshti's avatar Kimia Beheshti
Browse files

Merge branch 'Issue/2011-pathConfig' into 'dev'

New: Add Base Path for temporary deployment (coscine/issues#2011)

See merge request !28
parents b1c04f56 9b3f4c06
No related branches found
No related tags found
2 merge requests!29Release: Sprint/2022 04 :robot:,!28New: Add Base Path for temporary deployment (coscine/issues#2011)
Pipeline #666108 passed
......@@ -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>
......
......@@ -24,7 +24,7 @@ export const routes: RouteConfig[] = [
];
const router = new VueRouter({
base: "/",
base: import.meta.env.BASE_URL,
mode: "history",
routes,
});
......
......@@ -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;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment