Skip to content

add base url for admin /admin to router #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcelGeo merged 2 commits into from
Mar 4, 2025
Merged

add base url for admin /admin to router #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f5ed0c
add base url for admin /admin to router
MarcelGeo Mar 4, 2025
c98a918
Disable message about opt-out anytime
MarcelGeo Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web-app/packages/admin-app/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(.*)*',
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/admin-lib/src/modules/admin/views/SettingsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const settingsItems = ref<AppSettingsItemConfig[]>([
{
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'
}
])
Expand Down
Loading