From 3f5ed0cab4def5f1588aa6fadc3a73ef99f73ae9 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Tue, 4 Mar 2025 10:41:00 +0100 Subject: [PATCH 1/2] add base url for admin /admin to router --- web-app/packages/admin-app/src/router.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-app/packages/admin-app/src/router.ts b/web-app/packages/admin-app/src/router.ts index d4a423cf..1de530fd 100644 --- a/web-app/packages/admin-app/src/router.ts +++ b/web-app/packages/admin-app/src/router.ts @@ -33,7 +33,7 @@ import { LoginView } from './modules/user' export const createRouter = (pinia: Pinia) => { const router = createRouterInstance({ - history: createWebHistory(), + history: createWebHistory(import.meta.env.BASE_URL), routes: [ { path: '/:pathMatch(.*)*', From c98a9188eef4eba1cb869101cdd948c8dd360df9 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Tue, 4 Mar 2025 10:52:06 +0100 Subject: [PATCH 2/2] Disable message about opt-out anytime --- .../packages/admin-lib/src/modules/admin/views/SettingsView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue b/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue index ee94513d..8204b41a 100644 --- a/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue +++ b/web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue @@ -49,7 +49,7 @@ const settingsItems = ref([ { title: 'Collect statistics', description: - 'Help us improve Mergin Maps by sharing usage information. Mergin Maps collects anonymous usage information to make the service better overtime. You can opt-out anytime.', + 'Help us improve Mergin Maps by sharing usage information. Mergin Maps collects anonymous usage information to make the service better overtime.', key: 'usageInformation' } ])