diff --git a/package.json b/package.json index 69ed419c..8dcdf190 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "airtunes2": "git+https://github.com/ciderapp/node_airtunes2", "castv2-client": "^1.2.0", "chokidar": "^3.5.3", + "cider_utils": "git+https://github.com/ciderapp/cider_utils", "discord-auto-rpc": "^1.0.16", "dns-js": "git+https://github.com/ciderapp/node-dns-js.git", "ejs": "^3.1.6", @@ -80,8 +81,7 @@ "wallpaper": "5.0.1", "ws": "^8.5.0", "xml2js": "^0.4.23", - "youtube-search-without-api-key": "^1.0.7", - "cider_utils": "git+https://github.com/ciderapp/cider_utils" + "youtube-search-without-api-key": "^1.0.7" }, "devDependencies": { "@types/adm-zip": "^0.5.0", diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 702f80dd..10b472da 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -86,6 +86,7 @@ export class BrowserWindow { "pages/zoo", "pages/plugin-renderer", "pages/oobe", + "pages/cider-profile", "components/app-content", "components/sidebar", "components/mediaitem-artwork", @@ -193,6 +194,10 @@ export class BrowserWindow { page: "recordLabel_", component: ``, condition: `$root.page.includes('recordLabel_')` + }, { + page: "social-profiles_", + component: ``, + condition: `$root.page.includes('social-profiles_')` }, { page: "multiroom", component: ``, diff --git a/src/main/base/vrouting.json b/src/main/base/vrouting.json index 6d69582c..613103d1 100644 --- a/src/main/base/vrouting.json +++ b/src/main/base/vrouting.json @@ -69,6 +69,11 @@ "component": "", "condition": "page.includes('album_')" }, + { + "page": "social-profiles_", + "component": "", + "condition": "$root.page.includes('social-profiles_')" + }, { "page": "recordLabel_", "component": "", diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 1c74fa77..b01fcf98 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -1966,7 +1966,7 @@ const app = new Vue({ }) return; - } else if(item.attributes.link.url.includes("viewFeature")) { + } else if (item.attributes.link.url.includes("viewFeature")) { const params = new Proxy(new URLSearchParams(new URL(item.attributes.link.url).search), { get: (searchParams, prop) => searchParams.get(prop), }); @@ -1977,7 +1977,6 @@ const app = new Vue({ app.routeView(item) } ) - } else { window.open(item.attributes.link.url) } @@ -2018,7 +2017,26 @@ const app = new Vue({ }); window.location.hash = `${kind}/${id}` document.querySelector("#app-content").scrollTop = 0 - } else if (!kind.toString().includes("radioStation") && !kind.toString().includes("song") && !kind.toString().includes("musicVideo") && !kind.toString().includes("uploadedVideo") && !kind.toString().includes("music-movie")) { + } else if (kind.toString().includes("social-profiles")) { + app.page = (kind) + "_" + (id); + app.mk.api.v3.music( + `/v1/social/${app.mk.storefrontId}/social-profiles/${id}`, + {include:"shared-playlists"}).then( + (data) => { + console.log(data) + app.showingPlaylist = data.data?.data[0] + window.location.hash = `${kind}/${id}` + document.querySelector("#app-content").scrollTop = 0 + } + ) + // app.getTypeFromID((kind), (id), (isLibrary), { + // extend: "editorialVideo", + // include: 'grouping,playlists', + // views: 'top-releases,latest-releases,top-artists' + // }); + + } + else if (!kind.toString().includes("radioStation") && !kind.toString().includes("song") && !kind.toString().includes("musicVideo") && !kind.toString().includes("uploadedVideo") && !kind.toString().includes("music-movie")) { let params = { extend: "offers,editorialVideo", "views": "appears-on,more-by-artist,related-videos,other-versions,you-might-also-like,video-extras,audio-extras", diff --git a/src/renderer/style.less b/src/renderer/style.less index eb0a5ce9..99a94b71 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1322,6 +1322,7 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl height: 15px; width: 15px; margin-bottom: 15px; + z-index: 1; } } // Add Music Video Icons to Songs that are Music Videos diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs index c475119d..44fda15e 100644 --- a/src/renderer/views/app/chrome-bottom.ejs +++ b/src/renderer/views/app/chrome-bottom.ejs @@ -45,7 +45,12 @@
-
+
+