MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-26 04:49:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

[web] Use named route for the music page

Browse Source 
Switching to named routes in order to reduce future maintenance.
This commit is contained in:
Alain Nussbaumer 2023-07-12 17:25:47 +02:00
parent 493621a28b
commit 19c315a43a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-src/src/components/NavbarTop.vue
View File

@ -9,7 +9,7 @@
<navbar-item-link v-if="is_visible_playlists" :to="{ name: 'playlists' }"> <navbar-item-link v-if="is_visible_playlists" :to="{ name: 'playlists' }">
<mdicon class="icon" name="music-box-multiple" size="16" /> <mdicon class="icon" name="music-box-multiple" size="16" />
</navbar-item-link> </navbar-item-link>
<navbar-item-link v-if="is_visible_music" :to="{ path: '/music' }"> <navbar-item-link v-if="is_visible_music" :to="{ name: 'music' }">
<mdicon class="icon" name="music" size="16" /> <mdicon class="icon" name="music" size="16" />
</navbar-item-link> </navbar-item-link>
<navbar-item-link v-if="is_visible_podcasts" :to="{ name: 'podcasts' }"> <navbar-item-link v-if="is_visible_podcasts" :to="{ name: 'podcasts' }">
@ -61,7 +61,7 @@
<mdicon class="icon" name="music-box-multiple" size="16" /> <mdicon class="icon" name="music-box-multiple" size="16" />
<b v-text="$t('navigation.playlists')" /> <b v-text="$t('navigation.playlists')" />
</navbar-item-link> </navbar-item-link>
<navbar-item-link :to="{ path: '/music' }" exact> <navbar-item-link :to="{ name: 'music' }" exact>
<mdicon class="icon" name="music" size="16" /> <mdicon class="icon" name="music" size="16" />
<b v-text="$t('navigation.music')" /> <b v-text="$t('navigation.music')" />
</navbar-item-link> </navbar-item-link>

7
web-src/src/router/index.js
View File

@ -110,6 +110,7 @@ export const router = createRouter({
redirect: '/audiobooks/artists' redirect: '/audiobooks/artists'
}, },
{ {
name: 'music',
path: '/music', path: '/music',
redirect: '/music/browse' redirect: '/music/browse'
}, },
@ -301,13 +302,13 @@ export const router = createRouter({
} }
if (to.path === from.path && to.hash) { if (to.path === from.path && to.hash) {
// We are staying on the same page and are jumping to an anker (e. g. index nav) // We are staying on the same page and are jumping to an anchor (e. g. index nav)
// We don't have a transition, so don't add a timeout! // We don't have a transition, so don't add a timeout!
return { el: to.hash, top: 120 } return { el: to.hash, top: 120 }
} }
if (to.hash) { if (to.hash) {
// We are navigating to an anker of a new page, add a timeout to let the transition effect finish before scrolling // We are navigating to an anchor of a new page, add a timeout to let the transition effect finish before scrolling
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
setTimeout(() => { setTimeout(() => {
resolve({ el: to.hash, top: 120 }) resolve({ el: to.hash, top: 120 })
@ -317,7 +318,7 @@ export const router = createRouter({
if (to.meta.has_index) { if (to.meta.has_index) {
// We are navigating to a page with index nav, that should be hidden automatically // We are navigating to a page with index nav, that should be hidden automatically
// Dependending on wether we have a tab navigation, add an offset to the "top" anker // Depending on wether we have a tab navigation, add an offset to the "top" anchor
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
setTimeout(() => { setTimeout(() => {
if (to.meta.has_tabs) { if (to.meta.has_tabs) {