diff --git a/src/renderer/assets/feather/disc.svg b/src/renderer/assets/feather/disc.svg new file mode 100644 index 00000000..2595b444 --- /dev/null +++ b/src/renderer/assets/feather/disc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/globe.svg b/src/renderer/assets/feather/globe.svg new file mode 100644 index 00000000..0a0586d3 --- /dev/null +++ b/src/renderer/assets/feather/globe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/home.svg b/src/renderer/assets/feather/home.svg new file mode 100644 index 00000000..7bb31b23 --- /dev/null +++ b/src/renderer/assets/feather/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/list.svg b/src/renderer/assets/feather/list.svg new file mode 100644 index 00000000..5ce38eaa --- /dev/null +++ b/src/renderer/assets/feather/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/music.svg b/src/renderer/assets/feather/music.svg new file mode 100644 index 00000000..7bee2f7e --- /dev/null +++ b/src/renderer/assets/feather/music.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/play-circle.svg b/src/renderer/assets/feather/play-circle.svg new file mode 100644 index 00000000..8766dc7b --- /dev/null +++ b/src/renderer/assets/feather/play-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/plus-circle.svg b/src/renderer/assets/feather/plus-circle.svg new file mode 100644 index 00000000..4291ff05 --- /dev/null +++ b/src/renderer/assets/feather/plus-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/radio.svg b/src/renderer/assets/feather/radio.svg new file mode 100644 index 00000000..5abfcd13 --- /dev/null +++ b/src/renderer/assets/feather/radio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/assets/feather/user.svg b/src/renderer/assets/feather/user.svg new file mode 100644 index 00000000..7bb5f291 --- /dev/null +++ b/src/renderer/assets/feather/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/index.js b/src/renderer/index.js index 114cc94e..b2621936 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -311,6 +311,11 @@ const app = new Vue({ }, }, methods: { + async getSvgIcon(url) { + let response = await fetch(url); + let data = await response.text(); + return data; + }, getSocialBadges(cb = () => { }) { let self = this @@ -2929,10 +2934,34 @@ const app = new Vue({ Vue.component('sidebar-library-item', { template: '#sidebar-library-item', - props: ['name', 'page', 'cd-click'], + props: { + name: { + type: String, + required: true + }, + page: { + type: String, + required: true + }, + svgIcon: { + type: String, + required: false, + default: '' + }, + cdClick: { + type: Function, + required: false + } + }, data: function () { return { - app: app + app: app, + svgIconData: "" + } + }, + async mounted() { + if (this.svgIcon) { + this.svgIconData = await this.app.getSvgIcon(this.svgIcon) } }, methods: {} diff --git a/src/renderer/style.less b/src/renderer/style.less index e963a857..9ccd74d8 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -682,7 +682,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track { border: 1px solid transparent; border-radius: 6px; background: transparent; - color: white; + color: #eee; transition: transform .1s; text-align: left; @@ -3715,6 +3715,19 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { /* Cider */ +// sidebar icon +.sidebar-icon { + width: 18px; + height: 18px; + margin-right: 8px; + + >svg { + width: 100%; + height: 100%; + color: #aaa; + } +} + // Modular .modular-fs { .app-drawer { diff --git a/src/renderer/views/components/sidebar-playlist.ejs b/src/renderer/views/components/sidebar-playlist.ejs index 5eba133f..b5ba0271 100644 --- a/src/renderer/views/components/sidebar-playlist.ejs +++ b/src/renderer/views/components/sidebar-playlist.ejs @@ -9,7 +9,7 @@ :href="item.href" @click='$root.appRoute(`playlist_` + item.id); $root.showingPlaylist = [];$root.getPlaylistFromID($root.page.substring(9))'> @@ -53,9 +53,13 @@ folderOpened: false, children: [], playlistRoot: "p.playlistsroot", - renaming: false + renaming: false, + icon: "" } }, + async mounted() { + this.icon = await this.$root.getSvgIcon("./assets/feather/list.svg") + }, methods: { rename() { this.renaming = false diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 41fa1a4b..144da55c 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -172,18 +172,17 @@
Apple Music
- - - - + + + +
Library
- - - - - + + + +
Playlists
@@ -563,6 +562,7 @@ diff --git a/src/renderer/views/pages/new/library-songs.ejs b/src/renderer/views/pages/new/library-songs.ejs new file mode 100644 index 00000000..a739868f --- /dev/null +++ b/src/renderer/views/pages/new/library-songs.ejs @@ -0,0 +1,16 @@ + + + \ No newline at end of file