wip! [vue3] Migrate to vue-router 4.x

chme · Feb 12, 2022 · d9617e1 · d9617e1
1 parent d27730e
commit d9617e1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 44 deletions.
diff --git a/web-src/src/main.js b/web-src/src/main.js
@@ -1,10 +1,12 @@
 import { createApp } from 'vue'
 import store from './store'
+import { router } from './router'
 import VueProgressBar from '@aacassandra/vue3-progressbar'
 import App from './App.vue'
 
 createApp(App)
   .use(store)
+  .use(router)
   .use(VueProgressBar, {
     color: 'hsl(204, 86%, 53%)',
     failedColor: 'red',

diff --git a/web-src/src/router/index.js b/web-src/src/router/index.js
@@ -1,50 +1,47 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
+import { createRouter } from 'vue-router'
 import store from '@/store'
 import * as types from '@/store/mutation_types'
-import PageQueue from '@/pages/PageQueue'
-import PageNowPlaying from '@/pages/PageNowPlaying'
-import PageBrowse from '@/pages/PageBrowse'
-import PageBrowseRecentlyAdded from '@/pages/PageBrowseRecentlyAdded'
-import PageBrowseRecentlyPlayed from '@/pages/PageBrowseRecentlyPlayed'
-import PageArtists from '@/pages/PageArtists'
-import PageArtist from '@/pages/PageArtist'
-import PageAlbums from '@/pages/PageAlbums'
-import PageAlbum from '@/pages/PageAlbum'
-import PageGenres from '@/pages/PageGenres'
-import PageGenre from '@/pages/PageGenre'
-import PageGenreTracks from '@/pages/PageGenreTracks'
-import PageArtistTracks from '@/pages/PageArtistTracks'
-import PageComposers from '@/pages/PageComposers'
-import PageComposer from '@/pages/PageComposer'
-import PageComposerTracks from '@/pages/PageComposerTracks'
-import PagePodcasts from '@/pages/PagePodcasts'
-import PagePodcast from '@/pages/PagePodcast'
-import PageAudiobooksAlbums from '@/pages/PageAudiobooksAlbums'
-import PageAudiobooksArtists from '@/pages/PageAudiobooksArtists'
-import PageAudiobooksArtist from '@/pages/PageAudiobooksArtist'
-import PageAudiobooksAlbum from '@/pages/PageAudiobooksAlbum'
-import PagePlaylists from '@/pages/PagePlaylists'
-import PagePlaylist from '@/pages/PagePlaylist'
-import PageFiles from '@/pages/PageFiles'
-import PageRadioStreams from '@/pages/PageRadioStreams'
-import PageSearch from '@/pages/PageSearch'
-import PageAbout from '@/pages/PageAbout'
-import SpotifyPageBrowse from '@/pages/SpotifyPageBrowse'
-import SpotifyPageBrowseNewReleases from '@/pages/SpotifyPageBrowseNewReleases'
-import SpotifyPageBrowseFeaturedPlaylists from '@/pages/SpotifyPageBrowseFeaturedPlaylists'
-import SpotifyPageArtist from '@/pages/SpotifyPageArtist'
-import SpotifyPageAlbum from '@/pages/SpotifyPageAlbum'
-import SpotifyPagePlaylist from '@/pages/SpotifyPagePlaylist'
-import SpotifyPageSearch from '@/pages/SpotifyPageSearch'
-import SettingsPageWebinterface from '@/pages/SettingsPageWebinterface'
-import SettingsPageArtwork from '@/pages/SettingsPageArtwork'
-import SettingsPageOnlineServices from '@/pages/SettingsPageOnlineServices'
-import SettingsPageRemotesOutputs from '@/pages/SettingsPageRemotesOutputs'
+import PageQueue from '@/pages/PageQueue.vue'
+import PageNowPlaying from '@/pages/PageNowPlaying.vue'
+import PageBrowse from '@/pages/PageBrowse.vue'
+import PageBrowseRecentlyAdded from '@/pages/PageBrowseRecentlyAdded.vue'
+import PageBrowseRecentlyPlayed from '@/pages/PageBrowseRecentlyPlayed.vue'
+import PageArtists from '@/pages/PageArtists.vue'
+import PageArtist from '@/pages/PageArtist.vue'
+import PageAlbums from '@/pages/PageAlbums.vue'
+import PageAlbum from '@/pages/PageAlbum.vue'
+import PageGenres from '@/pages/PageGenres.vue'
+import PageGenre from '@/pages/PageGenre.vue'
+import PageGenreTracks from '@/pages/PageGenreTracks.vue'
+import PageArtistTracks from '@/pages/PageArtistTracks.vue'
+import PageComposers from '@/pages/PageComposers.vue'
+import PageComposer from '@/pages/PageComposer.vue'
+import PageComposerTracks from '@/pages/PageComposerTracks.vue'
+import PagePodcasts from '@/pages/PagePodcasts.vue'
+import PagePodcast from '@/pages/PagePodcast.vue'
+import PageAudiobooksAlbums from '@/pages/PageAudiobooksAlbums.vue'
+import PageAudiobooksArtists from '@/pages/PageAudiobooksArtists.vue'
+import PageAudiobooksArtist from '@/pages/PageAudiobooksArtist.vue'
+import PageAudiobooksAlbum from '@/pages/PageAudiobooksAlbum.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 PageSearch from '@/pages/PageSearch.vue'
+import PageAbout from '@/pages/PageAbout.vue'
+import SpotifyPageBrowse from '@/pages/SpotifyPageBrowse.vue'
+import SpotifyPageBrowseNewReleases from '@/pages/SpotifyPageBrowseNewReleases.vue'
+import SpotifyPageBrowseFeaturedPlaylists from '@/pages/SpotifyPageBrowseFeaturedPlaylists.vue'
+import SpotifyPageArtist from '@/pages/SpotifyPageArtist.vue'
+import SpotifyPageAlbum from '@/pages/SpotifyPageAlbum.vue'
+import SpotifyPagePlaylist from '@/pages/SpotifyPagePlaylist.vue'
+import SpotifyPageSearch from '@/pages/SpotifyPageSearch.vue'
+import SettingsPageWebinterface from '@/pages/SettingsPageWebinterface.vue'
+import SettingsPageArtwork from '@/pages/SettingsPageArtwork.vue'
+import SettingsPageOnlineServices from '@/pages/SettingsPageOnlineServices.vue'
+import SettingsPageRemotesOutputs from '@/pages/SettingsPageRemotesOutputs.vue'
 
-Vue.use(VueRouter)
-
-export const router = new VueRouter({
+export const router = createRouter({
   routes: [
     {
       path: '/',