potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Issue #1560 "Location is lost when navigating" : propagation of query for each route

Browse source
This commit is contained in:
Laurent GAY 2024-10-16 18:36:10 +02:00
parent 5b5f295dc3
commit 3ed4105879
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/components/NavBar.vue
View file

@ -189,8 +189,9 @@
<li class="m-auto" v-if="islongEvents"> <li class="m-auto" v-if="islongEvents">
<router-link <router-link
:to="{ :to="{
...$route,
name: RouteName.SEARCH, name: RouteName.SEARCH,
query: { contentType: 'SHORTEVENTS' }, query: { ...$route.query, contentType: 'SHORTEVENTS' },
}" }"
class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700" class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
>{{ t("Events") }}</router-link >{{ t("Events") }}</router-link
@ -198,7 +199,11 @@
</li> </li>
<li class="m-auto" v-else> <li class="m-auto" v-else>
<router-link <router-link
:to="{ name: RouteName.SEARCH, query: { contentType: 'EVENTS' } }" :to="{
...$route,
name: RouteName.SEARCH,
query: { ...$route.query, contentType: 'EVENTS' },
}"
class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700" class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
>{{ t("Events") }}</router-link >{{ t("Events") }}</router-link
> >
@ -206,8 +211,9 @@
<li class="m-auto" v-if="islongEvents"> <li class="m-auto" v-if="islongEvents">
<router-link <router-link
:to="{ :to="{
...$route,
name: RouteName.SEARCH, name: RouteName.SEARCH,
query: { contentType: 'LONGEVENTS' }, query: { ...$route.query, contentType: 'LONGEVENTS' },
}" }"
class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700" class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
>{{ t("Activities") }}</router-link >{{ t("Activities") }}</router-link
@ -215,7 +221,11 @@
</li> </li>
<li class="m-auto"> <li class="m-auto">
<router-link <router-link
:to="{ name: RouteName.SEARCH, query: { contentType: 'GROUPS' } }" :to="{
...$route,
name: RouteName.SEARCH,
query: { ...$route.query, contentType: 'GROUPS' },
}"
class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700" class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
>{{ t("Groups") }}</router-link >{{ t("Groups") }}</router-link
> >