From 3c17e15b081eb2f77979588b8d2ee5a4d71b9c0e Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 28 Dec 2021 04:35:44 -0800 Subject: [PATCH 1/2] working on adding social people and playlists in search, testing home page in dev mode --- src/renderer/index.js | 10 ++ src/renderer/style.less | 108 +++++++++++---- .../views/components/mediaitem-artwork.ejs | 21 ++- .../views/components/mediaitem-square.ejs | 3 + src/renderer/views/main.ejs | 10 ++ src/renderer/views/pages/collection-list.ejs | 11 +- src/renderer/views/pages/home.ejs | 124 ++++++++++++++++++ src/renderer/views/pages/search.ejs | 53 ++++++-- 8 files changed, 293 insertions(+), 47 deletions(-) create mode 100644 src/renderer/views/pages/home.ejs diff --git a/src/renderer/index.js b/src/renderer/index.js index 9a8d7a18..6d2b7898 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -114,6 +114,7 @@ const app = new Vue({ hints: [], showHints: false, results: {}, + resultsSocial: {}, limit: 10 }, playerLCD: { @@ -2167,6 +2168,15 @@ const app = new Vue({ }).then(function (results) { self.search.results = results }) + await this.mk.api.socialSearch(this.search.term, { + types: ["playlists", "social-profiles"], + limit: 25, + with: ["serverBubbles", "lyricSnippet"], + "art[url]": "f", + "art[social-profiles:url]": "c" + }, { includeResponseMeta: !0 }).then(function (results) { + self.search.resultsSocial = results + }) }, isInLibrary(playParams) { let self = this diff --git a/src/renderer/style.less b/src/renderer/style.less index c39c1a8d..8c05dd06 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1539,10 +1539,30 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { height: 100%; } +.home-page { + background: linear-gradient(0deg, black, #4c2c31); + top: 0; + padding-top: var(--navbarHeight); + + .user-icon { + border-radius: 100%; + width: 128px; + height: 128px; + overflow: hidden; + box-shadow: var(--mediaItemShadow-Shadow); + } + + .well.profile-well { + flex-direction: column; + justify-content: center; + align-items: center; + } +} + /* Cider */ .modal-fullscreen { - display:flex; + display: flex; justify-content: center; align-items: center; position: fixed; @@ -1552,11 +1572,12 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { height: 100%; background: rgba(0, 0, 0, 0.3); z-index: 9999; + .modal-window { background: #333; border-radius: 10px; box-shadow: var(--mediaItemShadow-Shadow); - display:flex; + display: flex; flex-flow: column; max-height: 500px; max-width: 360px; @@ -1578,18 +1599,18 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } .modal-header { - width:100%; + width: 100%; padding: 6px; } + .modal-content { - width:100%; - height:100%; + width: 100%; + height: 100%; overflow: hidden; overflow-y: overlay; } - .modal-footer { - } + .modal-footer {} } } @@ -1603,11 +1624,12 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { .modal-header { padding: 16px; - position:relative; + position: relative; .modal-title { text-align: center; } + .close-btn { width: 50px; height: 100%; @@ -1659,9 +1681,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { margin-right: 6px; } - .name { - - } + .name {} &:hover { background: var(--selected); @@ -2180,6 +2200,20 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { height: 100%; object-fit: cover; image-rendering: -webkit-optimize-contrast; + pointer-events: none; + } + + &.no-shadow { + box-shadow: none; + &::after { + display: none; + } + } + &.subtle-shadow { + box-shadow: var(--mediaItemShadow-ShadowSubtle); + } + &.shadow { + box-shadow: var(--mediaItemShadow-Shadow); } } @@ -2729,8 +2763,8 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { >.menu-btn { opacity: 0; appearance: none; - padding:0px; - border:0px; + padding: 0px; + border: 0px; width: 30px; height: 30px; border-radius: 50%; @@ -2755,6 +2789,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } &:hover { + >.play-btn, >.menu-btn { opacity: 1; @@ -2777,6 +2812,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { &.mediaitem-video { height: 200px; width: 240px; + .artwork { height: 120px; width: 212px; @@ -2786,16 +2822,27 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { &.mediaitem-brick { height: 200px; width: 240px; + .artwork { height: 123px; width: 220px; } } + + &.mediaitem-small { + width: 140px; + height: 180px; + + .artwork { + height: 128px; + width: 128px; + } + } } /* mediaitem-square */ -.albums-square-containeru > * > .cd-mediaitem-square { - --frame: max(220px, 15vw ); +.albums-square-containeru>*>.cd-mediaitem-square { + --frame: max(220px, 15vw); width: var(--frame); height: calc(var(--frame) * 13 / 11); display: inline-flex; @@ -2829,9 +2876,9 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { >.menu-btn { opacity: 0; appearance: none; - padding:0px; - border:0px; - width: calc(var(--frame) / 220 * 30); + padding: 0px; + border: 0px; + width: calc(var(--frame) / 220 * 30); height: calc(var(--frame) / 220 * 30); border-radius: 50%; background: rgba(50, 50, 50, 0.7); @@ -2843,7 +2890,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { >.play-btn { position: absolute; bottom: calc(var(--frame) / 220 * 14); - left: calc(var(--frame) / 220 * 14); + left: calc(var(--frame) / 220 * 14); z-index: 2; } @@ -2855,6 +2902,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } &:hover { + >.play-btn, >.menu-btn { opacity: 1; @@ -2875,10 +2923,11 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } &.mediaitem-video { - height:calc(var(--frame) / 220 * 200); + height: calc(var(--frame) / 220 * 200); width: calc(var(--frame) / 220 * 240); + .artwork { - height:calc(var(--frame) / 220 * 120); + height: calc(var(--frame) / 220 * 120); width: calc(var(--frame) / 220 * 212); } } @@ -2886,9 +2935,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { &.mediaitem-brick { height: calc(var(--frame) / 220 * 200); width: calc(var(--frame) / 220 * 240); + .artwork { height: calc(var(--frame) / 220 * 123); - width: calc(var(--frame) ); + width: calc(var(--frame)); } } } @@ -2952,16 +3002,17 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { // Modular .modular-fs { .app-drawer { - width:100%; - right:0px; - top:0px; - height:100%; + width: 100%; + right: 0px; + top: 0px; + height: 100%; border-radius: 0px; box-shadow: unset; background: black; + .lyric-body { justify-content: center; - align-items:center; + align-items: center; .lyric-line { pointer-events: none; @@ -2982,6 +3033,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } } } + // Modular /* Transitions */ @@ -3280,7 +3332,7 @@ body.no-gpu { background: rgb(0 0 0); } - .addtoplaylist-panel { + .addtoplaylist-panel { .modal-window { background: rgb(18 18 18); backdrop-filter: unset; diff --git a/src/renderer/views/components/mediaitem-artwork.ejs b/src/renderer/views/components/mediaitem-artwork.ejs index 61a21af0..7c96e926 100644 --- a/src/renderer/views/components/mediaitem-artwork.ejs +++ b/src/renderer/views/components/mediaitem-artwork.ejs @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs index 239e598c..f056ecdb 100644 --- a/src/renderer/views/pages/search.ejs +++ b/src/renderer/views/pages/search.ejs @@ -12,37 +12,70 @@

Songs

-
+
+ v-for="(item, index) in search.results.song.data.limit(6)">
+ + @@ -51,7 +84,7 @@ Vue.component('cider-search', { template: "#cider-search", props: ['search'], - data: function() { + data: function () { return { app: this.$root } From 7e7119d592b275f0be943b7ed788d7933008fb29 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 28 Dec 2021 04:53:26 -0800 Subject: [PATCH 2/2] added a favorites section to home, added kind property to horizontal scroller --- src/renderer/style.less | 5 +++++ .../components/mediaitem-scroller-horizontal.ejs | 16 +++++++++++++--- src/renderer/views/pages/home.ejs | 8 ++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/renderer/style.less b/src/renderer/style.less index 8c05dd06..1955353d 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -2306,6 +2306,11 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { &:hover::-webkit-scrollbar-thumb { box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 50%); } + + &.small { + overflow-x: overlay; + height: 210px; + } } /* mediaitem-list-item */ diff --git a/src/renderer/views/components/mediaitem-scroller-horizontal.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal.ejs index 73838811..ef2f21d2 100644 --- a/src/renderer/views/components/mediaitem-scroller-horizontal.ejs +++ b/src/renderer/views/components/mediaitem-scroller-horizontal.ejs @@ -1,7 +1,7 @@