From c6a57a38f9ef524e30899e9f1386caef131fd434 Mon Sep 17 00:00:00 2001 From: Alain Nussbaumer Date: Mon, 10 Jul 2023 13:24:42 +0200 Subject: [PATCH] [web] Use named route for the files page Switching to named routes in order to reduce future maintenance. --- web-src/src/components/ListDirectories.vue | 10 +++++----- web-src/src/components/NavbarTop.vue | 4 ++-- web-src/src/router/index.js | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/web-src/src/components/ListDirectories.vue b/web-src/src/components/ListDirectories.vue index d8410583..a75eade4 100644 --- a/web-src/src/components/ListDirectories.vue +++ b/web-src/src/components/ListDirectories.vue @@ -54,7 +54,7 @@ export default { data() { return { show_details_modal: false, - selected_directory: {} + selected_directory: '' } }, @@ -77,10 +77,10 @@ export default { parent === '' || this.$store.state.config.directories.includes(this.current_directory) ) { - this.$router.push({ path: '/files' }) + this.$router.push({ name: 'files' }) } else { this.$router.push({ - path: '/files', + name: 'files', query: { directory: this.current_directory.slice( 0, @@ -93,13 +93,13 @@ export default { open_directory(directory) { this.$router.push({ - path: '/files', + name: 'files', query: { directory: directory.path } }) }, open_dialog(directory) { - this.selected_directory = directory + this.selected_directory = directory.path this.show_details_modal = true } } diff --git a/web-src/src/components/NavbarTop.vue b/web-src/src/components/NavbarTop.vue index 7fc18d02..927d8d18 100644 --- a/web-src/src/components/NavbarTop.vue +++ b/web-src/src/components/NavbarTop.vue @@ -27,7 +27,7 @@ - + @@ -95,7 +95,7 @@ - + diff --git a/web-src/src/router/index.js b/web-src/src/router/index.js index 466fb6be..45bb882b 100644 --- a/web-src/src/router/index.js +++ b/web-src/src/router/index.js @@ -3,6 +3,7 @@ import { createRouter, createWebHashHistory } from 'vue-router' import PageAbout from '@/pages/PageAbout.vue' import PageAudiobooksAlbum from '@/pages/PageAudiobooksAlbum.vue' import PageAudiobooksAlbums from '@/pages/PageAudiobooksAlbums.vue' +import PageFiles from '@/pages/PageFiles.vue' import PagePodcast from '@/pages/PagePodcast.vue' import PagePodcasts from '@/pages/PagePodcasts.vue' import PageNowPlaying from '@/pages/PageNowPlaying.vue' @@ -25,7 +26,6 @@ import PageAudiobooksArtists from '@/pages/PageAudiobooksArtists.vue' import PageAudiobooksArtist from '@/pages/PageAudiobooksArtist.vue' import PagePlaylists from '@/pages/PagePlaylists.vue' import PagePlaylist from '@/pages/PagePlaylist.vue' -import PageFiles from '@/pages/PageFiles.vue' import PageRadioStreams from '@/pages/PageRadioStreams.vue' import PageSearchLibrary from '@/pages/PageSearchLibrary.vue' import SpotifyPageBrowse from '@/pages/SpotifyPageBrowse.vue' @@ -107,6 +107,12 @@ export const router = createRouter({ component: PageAlbum, meta: { show_progress: true } }, + { + component: PageFiles, + meta: { show_progress: true }, + name: 'files', + path: '/files' + }, { path: '/music/genres', name: 'Genres', @@ -188,12 +194,6 @@ export const router = createRouter({ component: PageRadioStreams, meta: { show_progress: true } }, - { - path: '/files', - name: 'Files', - component: PageFiles, - meta: { show_progress: true } - }, { path: '/playlists', redirect: '/playlists/0'