From 7fff11ef30806f548c3ce9e3f76a9aac3db785e0 Mon Sep 17 00:00:00 2001 From: chme Date: Sat, 16 Apr 2022 10:14:03 +0200 Subject: [PATCH 1/4] [web] Only include icons in bundle that are used in the web interface --- web-src/package-lock.json | 40 ++++-- web-src/package.json | 3 +- web-src/src/components/DropdownMenu.vue | 4 +- web-src/src/components/ListAlbums.vue | 2 +- web-src/src/components/ListArtists.vue | 2 +- web-src/src/components/ListComposers.vue | 2 +- web-src/src/components/ListDirectories.vue | 6 +- web-src/src/components/ListGenres.vue | 2 +- web-src/src/components/ListItemQueueItem.vue | 2 +- web-src/src/components/ListPlaylists.vue | 21 ++-- web-src/src/components/ListTracks.vue | 4 +- web-src/src/components/ModalDialog.vue | 6 +- web-src/src/components/ModalDialogAddRss.vue | 10 +- .../components/ModalDialogAddUrlStream.vue | 12 +- web-src/src/components/ModalDialogAlbum.vue | 10 +- web-src/src/components/ModalDialogArtist.vue | 10 +- .../src/components/ModalDialogComposer.vue | 10 +- .../src/components/ModalDialogDirectory.vue | 10 +- web-src/src/components/ModalDialogGenre.vue | 10 +- .../src/components/ModalDialogPlaylist.vue | 10 +- .../components/ModalDialogPlaylistSave.vue | 10 +- .../src/components/ModalDialogQueueItem.vue | 4 +- .../components/ModalDialogRemotePairing.vue | 4 +- web-src/src/components/ModalDialogTrack.vue | 10 +- web-src/src/components/NavbarBottom.vue | 62 ++++------ web-src/src/components/NavbarItemOutput.vue | 14 +-- web-src/src/components/NavbarTop.vue | 34 ++--- .../src/components/PlayerButtonConsume.vue | 7 +- web-src/src/components/PlayerButtonNext.vue | 9 +- .../src/components/PlayerButtonPlayPause.vue | 27 ++-- .../src/components/PlayerButtonPrevious.vue | 9 +- web-src/src/components/PlayerButtonRepeat.vue | 26 ++-- .../src/components/PlayerButtonSeekBack.vue | 10 +- .../components/PlayerButtonSeekForward.vue | 12 +- .../src/components/PlayerButtonShuffle.vue | 20 +-- .../components/SpotifyModalDialogAlbum.vue | 10 +- .../components/SpotifyModalDialogArtist.vue | 10 +- .../components/SpotifyModalDialogPlaylist.vue | 10 +- .../components/SpotifyModalDialogTrack.vue | 10 +- web-src/src/components/TabsAudiobooks.vue | 4 +- web-src/src/components/TabsMusic.vue | 14 ++- web-src/src/components/TabsSearch.vue | 16 ++- web-src/src/icons.js | 117 ++++++++++++++++++ web-src/src/main copy.js | 31 ----- web-src/src/main.js | 6 +- web-src/src/pages/PageAlbum.vue | 6 +- web-src/src/pages/PageArtist.vue | 6 +- web-src/src/pages/PageArtistTracks.vue | 4 +- web-src/src/pages/PageAudiobooksAlbum.vue | 6 +- web-src/src/pages/PageAudiobooksArtist.vue | 6 +- web-src/src/pages/PageComposer.vue | 4 +- web-src/src/pages/PageComposerTracks.vue | 4 +- web-src/src/pages/PageFiles.vue | 4 +- web-src/src/pages/PageGenre.vue | 4 +- web-src/src/pages/PageGenreTracks.vue | 4 +- web-src/src/pages/PagePlaylist.vue | 6 +- web-src/src/pages/PagePodcast.vue | 6 +- web-src/src/pages/PagePodcasts.vue | 6 +- web-src/src/pages/PageQueue.vue | 14 +-- web-src/src/pages/PageSearch.vue | 2 +- web-src/src/pages/SpotifyPageAlbum.vue | 8 +- web-src/src/pages/SpotifyPageArtist.vue | 8 +- web-src/src/pages/SpotifyPageBrowse.vue | 4 +- .../SpotifyPageBrowseFeaturedPlaylists.vue | 2 +- .../pages/SpotifyPageBrowseNewReleases.vue | 2 +- web-src/src/pages/SpotifyPagePlaylist.vue | 8 +- web-src/src/pages/SpotifyPageSearch.vue | 10 +- web-src/src/templates/ContentWithHeading.vue | 4 +- 68 files changed, 476 insertions(+), 314 deletions(-) create mode 100644 web-src/src/icons.js delete mode 100644 web-src/src/main copy.js diff --git a/web-src/package-lock.json b/web-src/package-lock.json index 3b2d1eb9..c73f525b 100644 --- a/web-src/package-lock.json +++ b/web-src/package-lock.json @@ -9,13 +9,14 @@ "version": "2.0.0", "dependencies": { "@aacassandra/vue3-progressbar": "^1.0.3", + "@mdi/js": "^6.6.96", "@ts-pro/vue-eternal-loading": "^1.2.0", "@vueform/slider": "github:chme/slider#faff83ed8a77f2cdbcb7252505ef734301efd139", "axios": "^0.26.1", "bulma": "^0.9.3", "bulma-switch": "^2.0.4", "luxon": "^2.3.1", - "mdi": "^2.2.43", + "mdi-vue": "^3.0.12", "reconnectingwebsocket": "^1.0.0", "spotify-web-api-js": "^1.5.2", "string-to-color": "^2.2.2", @@ -97,6 +98,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@mdi/js": { + "version": "6.6.96", + "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.6.96.tgz", + "integrity": "sha512-ke9PN5DjPCOlMfhioxeZYADz8Yiz6v47W0IYRza01SSJD7y1EwESVpwFnnFUso+eCoWtE1CO9cTIvQF6sEreuA==" + }, "node_modules/@ts-pro/vue-eternal-loading": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ts-pro/vue-eternal-loading/-/vue-eternal-loading-1.2.0.tgz", @@ -1485,11 +1491,17 @@ "sourcemap-codec": "^1.4.8" } }, - "node_modules/mdi": { - "version": "2.2.43", - "resolved": "https://registry.npmjs.org/mdi/-/mdi-2.2.43.tgz", - "integrity": "sha512-g3m6z4303qieltUM20JL2gdsJZvoVzIzO74qa2XxZ2kg9JPwrPEAgooVhRDHZi1vvRh0gB8Dg+c9XqNdz4jcIg==", - "deprecated": "The mdi package was renamed to @mdi/font after v2.2.43. Please rename in your package.json for future updates." + "node_modules/mdi-vue": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/mdi-vue/-/mdi-vue-3.0.12.tgz", + "integrity": "sha512-rc4rq99Hafa7v1u3KyfzGRr13v7/AzBvNrcXdhcgPQvj8wYafimbLGfNvQcGiAYZMow40KpXlZuG07132XccKw==", + "dependencies": { + "@mdi/js": "*" + }, + "peerDependencies": { + "@mdi/js": "*", + "vue": "*" + } }, "node_modules/minimatch": { "version": "3.1.2", @@ -2182,6 +2194,11 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@mdi/js": { + "version": "6.6.96", + "resolved": "https://registry.npmjs.org/@mdi/js/-/js-6.6.96.tgz", + "integrity": "sha512-ke9PN5DjPCOlMfhioxeZYADz8Yiz6v47W0IYRza01SSJD7y1EwESVpwFnnFUso+eCoWtE1CO9cTIvQF6sEreuA==" + }, "@ts-pro/vue-eternal-loading": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ts-pro/vue-eternal-loading/-/vue-eternal-loading-1.2.0.tgz", @@ -3145,10 +3162,13 @@ "sourcemap-codec": "^1.4.8" } }, - "mdi": { - "version": "2.2.43", - "resolved": "https://registry.npmjs.org/mdi/-/mdi-2.2.43.tgz", - "integrity": "sha512-g3m6z4303qieltUM20JL2gdsJZvoVzIzO74qa2XxZ2kg9JPwrPEAgooVhRDHZi1vvRh0gB8Dg+c9XqNdz4jcIg==" + "mdi-vue": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/mdi-vue/-/mdi-vue-3.0.12.tgz", + "integrity": "sha512-rc4rq99Hafa7v1u3KyfzGRr13v7/AzBvNrcXdhcgPQvj8wYafimbLGfNvQcGiAYZMow40KpXlZuG07132XccKw==", + "requires": { + "@mdi/js": "*" + } }, "minimatch": { "version": "3.1.2", diff --git a/web-src/package.json b/web-src/package.json index a4046106..5bdd391e 100644 --- a/web-src/package.json +++ b/web-src/package.json @@ -11,13 +11,14 @@ }, "dependencies": { "@aacassandra/vue3-progressbar": "^1.0.3", + "@mdi/js": "^6.6.96", "@ts-pro/vue-eternal-loading": "^1.2.0", "@vueform/slider": "github:chme/slider#faff83ed8a77f2cdbcb7252505ef734301efd139", "axios": "^0.26.1", "bulma": "^0.9.3", "bulma-switch": "^2.0.4", "luxon": "^2.3.1", - "mdi": "^2.2.43", + "mdi-vue": "^3.0.12", "reconnectingwebsocket": "^1.0.0", "spotify-web-api-js": "^1.5.2", "string-to-color": "^2.2.2", diff --git a/web-src/src/components/DropdownMenu.vue b/web-src/src/components/DropdownMenu.vue index 988c47bd..db2a887a 100644 --- a/web-src/src/components/DropdownMenu.vue +++ b/web-src/src/components/DropdownMenu.vue @@ -12,8 +12,8 @@ @click="is_active = !is_active" > {{ modelValue }} - -