chore: resolve merge conflicts

2026-07-28 20:05:37 +02:00
parent 32c4c81124
commit c1f2d31f4e
2 changed files with 11 additions and 5408 deletions
@@ -40,7 +40,7 @@ const routes = [
        }
    },
    {
-        path: '/settings/:rest(.*)*',
+        path: '/settings',
        name: 'settings',
        component: SettingsView,
        meta: {
@@ -59,30 +59,17 @@ const router = createRouter({
    routes
 });

-// remove trailing slash(es)
-router.beforeEach((route) => {
-    if (route.path !== '/' && route.path.endsWith('/')) {
-        return {
-            path: route.path.replace(/\/+$/, ''),
-            query: route.query,
-            hash: route.hash,
-            replace: true
-        };
-    };
-});
-
-// set page title
-router.afterEach(to => {
+export const updatePageTitle = function updatePageTitle (route) {
    const title =
-        typeof to.meta.title === 'function'
-        ? to.meta.title(to)
-        : to.meta.title;
+        typeof route.meta.title === 'function'
+        ? route.meta.title(route)
+        : route.meta.title;

    if (title) {
        document.title = `${title} - Seekra`;
    } else {
        document.title = 'Seekra';
    };
-});
+};

 export default router;