From fd94c517909211b0079a225f1c438a07f96289cc Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Tue, 03 Jun 2025 20:14:38 +0000
Subject: [PATCH] using .env for base urls

---
 vue/.env            |    1 +
 vue/src/router.js   |   12 +++++++-----
 vue/src/App.vue     |    1 +
 vue/.env.production |    1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/vue/.env b/vue/.env
index 23b8aff..c4f3e62 100644
--- a/vue/.env
+++ b/vue/.env
@@ -1,2 +1,3 @@
 VITE_API_BASE="/api"
 VITE_ILIAS_BASE="http://localhost:8060"
+VITE_ROUTER_BASE=""
diff --git a/vue/.env.production b/vue/.env.production
index 0dfd00f..6a03d54 100644
--- a/vue/.env.production
+++ b/vue/.env.production
@@ -1,2 +1,3 @@
 VITE_API_BASE="https://globusfm-dev2.minervis.com/popcorn/api"
 VITE_ILIAS_BASE="https://globusfm-dev2.minervis.com"
+VITE_ROUTER_BASE="/popcorn"
diff --git a/vue/src/App.vue b/vue/src/App.vue
index 701f8ac..6463d3f 100644
--- a/vue/src/App.vue
+++ b/vue/src/App.vue
@@ -8,6 +8,7 @@
 
 console.log("import.meta.env.VITE_API_BASE",import.meta.env.VITE_API_BASE)
 console.log("import.meta.env.VITE_ILIAS_BASE",import.meta.env.VITE_ILIAS_BASE)
+console.log("import.meta.env.VITE_ROUTER_BASE",import.meta.env.VITE_ILIAS_BASE)
 
 const apiToken = ref("")
 
diff --git a/vue/src/router.js b/vue/src/router.js
index b79cbe4..d7acafe 100644
--- a/vue/src/router.js
+++ b/vue/src/router.js
@@ -8,12 +8,14 @@
 import Kurse from './pages/Kurse.vue'
 import KursDetail from './pages/KursDetail.vue'
 
+const base = import.meta.env.VITE_ROUTER_BASE
+
 const routes = [
-   { path: '/', redirect: "/user" },
-   { path: '/ui/user', component: Users },
-   { path: '/ui/user/:userId', component: UserDetail },
-   { path: '/ui/kurs', component: Kurse },
-   { path: '/ui/kurs/:kursId', component: KursDetail },
+   { path: `${base}/`, redirect: "/user" },
+   { path: `${base}/ui/user`, component: Users },
+   { path: `${base}/ui/user/:userId`, component: UserDetail },
+   { path: `${base}/ui/kurs`, component: Kurse },
+   { path: `${base}/ui/kurs/:kursId`, component: KursDetail },
 ]
 
 const router = createRouter({

--
Gitblit v1.8.0