diff --git a/README.md b/README.md index ee3b5fd1..b3e20bbd 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ * [Documentation](https://docs.cider.sh) * [Request Feature](https://github.com/ciderapp/Cider/discussions/new?category=feature-request) * [Report Bug](https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D+) -* [**View The Releases**](https://github.com/ciderapp/Cider/releases/latest) +* [**View The Releases**](https://github.com/ciderapp/cider-releases/releases/latest) ### Install Sources -[![Get it from Github](https://img.shields.io/badge/Get_It_From_GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/ciderapp/cider/releases/latest) +[![Get it from Github](https://img.shields.io/badge/Get_It_From_GitHub-100000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/ciderapp/cider-releases/releases/latest) [![Get it from the Microsoft Store](https://img.shields.io/badge/Get_It_From_The_Microsoft_Store-100000?style=for-the-badge&logo=microsoft)](https://www.microsoft.com/store/apps/9P21XJ9D9G66) 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 b946cb8f..52a54fea 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -63,7 +63,6 @@ export class BrowserWindow { "pages/browse", "pages/groupings", "pages/charts", - "pages/settings", //"pages/installed-themes", "pages/listen_now", "pages/radio", @@ -87,6 +86,7 @@ export class BrowserWindow { "pages/zoo", "pages/plugin-renderer", "pages/oobe", + "pages/cider-profile", "components/app-content", "components/sidebar", "components/mediaitem-artwork", @@ -195,6 +195,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/vcomponents.json b/src/main/base/vcomponents.json index 53232dc8..fcbc115c 100644 --- a/src/main/base/vcomponents.json +++ b/src/main/base/vcomponents.json @@ -6,7 +6,6 @@ "pages/library-artists", "pages/browse", "pages/groupings", - "pages/settings", "pages/installed-themes", "pages/listen_now", "pages/radio", 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/less/ameframework.less b/src/renderer/less/ameframework.less index fe69d570..085aa08e 100644 --- a/src/renderer/less/ameframework.less +++ b/src/renderer/less/ameframework.less @@ -240,8 +240,10 @@ input[type=range].md-slider::-webkit-slider-runnable-track { } @media only screen and (min-width: 1133px) and (max-width: 1233px) { - .row .col-auto { - display: none !important; + .about-page { + .row .col-auto { + display: none !important; + } } } diff --git a/src/renderer/less/bootstrap.less b/src/renderer/less/bootstrap.less index c0c8bf72..8fe8cd27 100644 --- a/src/renderer/less/bootstrap.less +++ b/src/renderer/less/bootstrap.less @@ -2642,9 +2642,11 @@ fieldset:disabled .btn { width: auto; } -@media only screen and (min-width: 1133px) and (max-width: 1241px) { - .row .col-auto { - display: none !important; +@media only screen and (min-width: 1133px) and (max-width: 1233px) { + .about-page { + .row .col-auto { + display: none !important; + } } } diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index c5b015bc..ebe641f8 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -1303,8 +1303,10 @@ float: right; } @media only screen and (min-width: 1133px) and (max-width: 1277px) { - .social-btn { - display: none !important; + .about-page { + .social-btn { + display: none !important; + } } } diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 91174618..0101fad1 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 = "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", @@ -3342,6 +3360,7 @@ const app = new Vue({ translation: '' }); app.lyrics = preLrc.reverse(); + if (app.lyrics[5].line == "") {app.loadNeteaseLyrics();} // Detect incomplete QQ lyrics. } catch (e) { console.log(e) app.loadNeteaseLyrics(); diff --git a/src/renderer/style.less b/src/renderer/style.less index 162261a5..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 @@ -1900,8 +1901,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } @media only screen and (min-width: 1133px) and (max-width: 1277px) { - .social-btn { - display: none !important; + .about-page { + .social-btn { + display: none !important; + } } } diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs index c475119d..f6843d68 100644 --- a/src/renderer/views/app/chrome-bottom.ejs +++ b/src/renderer/views/app/chrome-bottom.ejs @@ -45,7 +45,12 @@
-
+
+