From b1cb9288df335b02cb59e4d4b2fce07467035ef3 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 4 Aug 2023 08:37:55 +0200 Subject: [PATCH] resf #5989 fix(redirect) --- src/components/NavBar.vue | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index 4c543cb1b..ff636adf7 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -17,26 +17,16 @@ const user = state.getUser(); const token = session.getToken(); const route = useRoute(); -onMounted(() => stateStore. setMounted()); +onMounted(() => stateStore.setMounted()); async function redirect() { - const currentURL = window.location.href; - const routeRegex = /\/(\w+)(?:\/(\d+))?/; - const match = currentURL.match(routeRegex); - const [, element, number] = match; - console.log(route.path); - const section = route.path.substring(route.path.indexOf('/')); - console.log(section); + let section = route.path.substring(1); + if (!route.path.includes('/')) return (window.location.href = await getUrl(section)); + section = section.substring(0, section.indexOf('/')); if (route?.params?.id) { - // const redirectURL = - // getUrl() + (number ? `${element}/${number}/summary` : `${element}/index`); - // window.location.href = redirectURL; - console.log(await getUrl(section)); - window.location.href = await getUrl(section + route.params); + window.location.href = await getUrl(`${section}/${route.params.id}/summary`); } else { - console.log(await getUrl(section)); - - // window.location.href = await getUrl('claim'); + window.location.href = await getUrl(section + '/index'); } }