From 73a83b2177bb47aad355773a634ae9d78d411fa7 Mon Sep 17 00:00:00 2001 From: Tomas Mizera Date: Tue, 25 Aug 2026 21:03:44 +0200 Subject: [PATCH 1/6] Show user and project ID in admin panel, fix page headers and other small fixes --- .../admin-lib/src/modules/admin/routes.ts | 9 +- .../modules/admin/views/AccountDetailView.vue | 129 ++++++++++++++---- .../src/modules/admin/views/ProjectView.vue | 66 +++++++++ .../lib/src/common/composables/index.ts | 1 + .../common/composables/useCopyToClipboard.ts | 30 ++++ 5 files changed, 203 insertions(+), 32 deletions(-) create mode 100644 web-app/packages/lib/src/common/composables/useCopyToClipboard.ts diff --git a/web-app/packages/admin-lib/src/modules/admin/routes.ts b/web-app/packages/admin-lib/src/modules/admin/routes.ts index 3439a561..6dc1f98c 100644 --- a/web-app/packages/admin-lib/src/modules/admin/routes.ts +++ b/web-app/packages/admin-lib/src/modules/admin/routes.ts @@ -21,15 +21,18 @@ export enum AdminRoutes { Login = 'login' } -export const getAdminTitle = (route: RouteLocationNormalizedLoaded) => { +export const getAdminTitle = ( + route: RouteLocationNormalizedLoaded, + config?: { accountEmail?: string } +) => { const params = route.params as AdminRouteParams const titles: Record = { [AdminRoutes.Login]: ['Sign in', 'Mergin Maps Admin Panel'], [AdminRoutes.ACCOUNTS]: 'Accounts', - [AdminRoutes.ACCOUNT]: 'Account details', + [AdminRoutes.ACCOUNT]: [config?.accountEmail || 'Account details'], [AdminRoutes.OVERVIEW]: 'Admin overview', [AdminRoutes.PROJECTS]: 'Projects', - [AdminRoutes.PROJECT]: ['Details', params.projectName], + [AdminRoutes.PROJECT]: [params.projectName], [AdminRoutes.SETTINGS]: 'Settings', [AdminRoutes.ProjectTree]: ['Files', params.projectName], [AdminRoutes.ProjectHistory]: ['History', params.projectName], diff --git a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue index c779d9e2..3ff32697 100644 --- a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue +++ b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue @@ -10,26 +10,30 @@