From 80f408a7aa7f7837922e5d56d5c4edb3a22e2102 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Sat, 28 May 2022 17:07:15 -0700 Subject: [PATCH 01/67] add editPlayListDescription --- src/renderer/main/vueapp.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 2ac1e6cf..f0b3466c 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -1349,6 +1349,21 @@ const app = new Vue({ self.refreshPlaylists(false, false) }) }, + async editPlaylistDescription(id, name = app.getLz('term.newPlaylist')) { + let self = this + this.mk.api.v3.music( + `/v1/me/library/playlists/${id}`, {}, { + fetchOptions: { + method: "PATCH", + body: JSON.stringify({ + attributes: { description: name } + }) + } + } + ).then(res => { + self.refreshPlaylists(false, false) + }) + }, copyToClipboard(str) { // if (navigator.userAgent.includes('Darwin') || navigator.appVersion.indexOf("Mac") != -1) { // this.darwinShare(str) From 60506dc47aaf6280f180429b24bf88a350b8a656 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Sat, 28 May 2022 17:07:28 -0700 Subject: [PATCH 02/67] add feature to change playlist description --- src/renderer/less/pages.less | 12 ++++++-- src/renderer/views/pages/cider-playlist.ejs | 34 +++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 2fb5739e..d8648b8e 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -667,8 +667,6 @@ .nameEdit { font-weight : 700; font-size : 1.6rem; - margin-bottom: 6px; - margin-right : 6px; flex-shrink : unset; background : transparent; border : 0px; @@ -676,6 +674,16 @@ font-family : inherit; } + .descriptionEdit { + font-size : 14px; + flex-shrink : unset; + background : transparent; + border : 0px; + color : inherit; + font-family : inherit; + width : 60vw; + } + .playlist-artist { font-size : 20px; margin-bottom: 6px; diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 2fe6faf2..cb21bba6 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -54,9 +54,16 @@ class="content" v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short" @click="openInfoModal()"> -
+
{{data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard}}
+
From 196001832da845d31ed1d954f5d82f21f59861dd Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 14 Jun 2022 04:39:19 -0700 Subject: [PATCH 15/67] added brick and video scaling --- src/renderer/less/elements.less | 52 ++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index 2a27841c..382441e1 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -1059,7 +1059,7 @@ } } - &:not(.noscale) { + &:not(.mediaitem-brick):not(.mediaitem-video):not(.noscale) { @media (min-width: 1460px) { --scaleRate: 1.1; --scaleRateArtwork: 0.9; @@ -1133,8 +1133,6 @@ } &.mediaitem-video { - --scaleRate: 1.25; - --scaleRateArtwork: 1.25; height: 200px; width: 240px; @@ -1144,13 +1142,27 @@ } &:not(.noscale) { - @media (min-width: 1600px) { + @media (min-width: 1460px) { + --scaleRate: 1.1; + --scaleRateArtwork: 1.1; width: calc(240px * var(--scaleRate)); height: calc(200px * var(--scaleRate)); - + .artwork-container > .artwork { - width: calc(212px * var(--scaleRateArtwork)); - height: calc(120px * var(--scaleRateArtwork)); + width: calc(220px * var(--scaleRateArtwork)); + height: calc(123px * var(--scaleRateArtwork)); + } + } + + @media (min-width: 1550px) { + --scaleRate: 1.25; + --scaleRateArtwork: 1.25; + width: calc(240px * var(--scaleRate)); + height: calc(200px * var(--scaleRate)); + + .artwork-container > .artwork { + width: calc(220px * var(--scaleRateArtwork)); + height: calc(123px * var(--scaleRateArtwork)); } } } @@ -1164,6 +1176,32 @@ height: 123px; width: 220px; } + + &:not(.noscale) { + @media (min-width: 1460px) { + --scaleRate: 1.1; + --scaleRateArtwork: 1.1; + width: calc(240px * var(--scaleRate)); + height: calc(200px * var(--scaleRate)); + + .artwork-container > .artwork { + width: calc(220px * var(--scaleRateArtwork)); + height: calc(123px * var(--scaleRateArtwork)); + } + } + + @media (min-width: 1550px) { + --scaleRate: 1.25; + --scaleRateArtwork: 1.25; + width: calc(240px * var(--scaleRate)); + height: calc(200px * var(--scaleRate)); + + .artwork-container > .artwork { + width: calc(220px * var(--scaleRateArtwork)); + height: calc(123px * var(--scaleRateArtwork)); + } + } + } } &.mediaitem-small { From 6683fe3b232792fa49e71eb72f92290b86b18dd7 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:45:23 +0100 Subject: [PATCH 16/67] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f1370fb9..3b1355b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: cider-ci: docker: - - image: circleci/node:16 + - image: cimg/node:18.3.0 working_directory: ~/Cider orbs: # Add orbs to your configuration From 7435d4e251110d4e9d3ddf0a2a89c8610bf6ef65 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 14 Jun 2022 04:46:10 -0700 Subject: [PATCH 17/67] fixed scale on cards, card text is now centered --- src/renderer/less/elements.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index 382441e1..6247a172 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -1059,7 +1059,7 @@ } } - &:not(.mediaitem-brick):not(.mediaitem-video):not(.noscale) { + &:not(.mediaitem-card):not(.mediaitem-brick):not(.mediaitem-video):not(.noscale) { @media (min-width: 1460px) { --scaleRate: 1.1; --scaleRateArtwork: 0.9; @@ -1244,6 +1244,8 @@ padding: 10px 10px 14px; position: relative; width: 100%; + display: grid; + align-content: center; &::before { background: var(--bgartwork); @@ -1272,7 +1274,7 @@ & + .subtitle { max-height: none !important; - margin-top: -0.5em; + // margin-top: -0.5em; } } From 2855c4569c29b2a4122eb46e47c066fab20513b8 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:46:44 +0100 Subject: [PATCH 18/67] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b1355b5..4ce97f32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: cider-ci: docker: - - image: cimg/node:18.3.0 + - image: cimg/node:17.9.1 working_directory: ~/Cider orbs: # Add orbs to your configuration From cff6653cd7387f44b2252d43749539ca4c745684 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:48:17 +0100 Subject: [PATCH 19/67] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ce97f32..97af280b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: cider-ci: docker: - - image: cimg/node:17.9.1 + - image: cimg/node:lts-browsers working_directory: ~/Cider orbs: # Add orbs to your configuration From 5934d8b5ef21c809061dccab838030189a3bcfcb Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:49:00 +0100 Subject: [PATCH 20/67] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 97af280b..418d7cfe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: command: sudo chmod +x resources/version.sh && ./resources/version.sh || true - run: name: Update Package Managers - command: sudo npm update -g npm yarn + command: npm update -g npm yarn - restore_cache: name: Restore Yarn Package Cache keys: From 955140924c9a8f97a8b0ebf3897cab64ce1ce4d3 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 14 Jun 2022 12:49:57 +0100 Subject: [PATCH 21/67] not needed --- .circleci/config.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 418d7cfe..e02b98b2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,15 +15,9 @@ jobs: executor: cider-ci steps: - checkout - # - run: - # name: Rename Repository - # command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json - run: name: Update Version Number of App command: sudo chmod +x resources/version.sh && ./resources/version.sh || true - - run: - name: Update Package Managers - command: npm update -g npm yarn - restore_cache: name: Restore Yarn Package Cache keys: @@ -60,9 +54,6 @@ jobs: steps: - attach_workspace: at: ~/Cider -# - run: -# name: Fix Versioning and Add Channel -# command: yarn circle:script - run: name: Generate Builds (Linux) command: yarn electron-builder -l -p never @@ -89,9 +80,6 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update -y sudo apt-get install -y wine32 -# - run: -# name: Fix Versioning and Add Channel -# command: yarn circle:script - run: name: Generate Builds (Windows) command: yarn electron-builder -w --x64 -p never @@ -117,9 +105,6 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update -y sudo apt-get install -y wine32 -# - run: -# name: Fix Versioning and Add Channel -# command: yarn circle:script - run: name: Generate Builds (Winget) command: yarn electron-builder --win -c winget.json -p never @@ -156,9 +141,6 @@ jobs: mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: path: ~/Cider/dist/artifacts -# - run: -# name: Fix Versioning and Add Channel -# command: yarn circle:script - run: name: Update Version Number of App command: sudo chmod +x resources/version.sh && ./resources/version.sh || true From 7116a55f8c04c856128c3198d2723d0e5e0e5215 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 14 Jun 2022 04:53:06 -0700 Subject: [PATCH 22/67] added card hover --- src/renderer/less/elements.less | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index 6247a172..11094027 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -1230,7 +1230,7 @@ overflow: hidden; border-radius: 0px; margin: 0; - + transition: filter 0.2s ease-in-out; .mediaitem-artwork { border-radius: 0px; @@ -1260,6 +1260,7 @@ z-index: 0; opacity: 1; filter: brightness(0.5) blur(50px) saturate(180%); + transition: filter 0.2s ease-in-out; } } @@ -1304,6 +1305,15 @@ border-radius: inherit; } + &:hover { + .artwork{ + filter: brightness(0.8); + } + .info-rect-card::before { + filter: brightness(0.3) blur(50px) saturate(180%); + } + } + &:not(.noscale) { @media (min-width: 1460px) { width: calc(230px * 1.1); From a47fa000934f8d4406e7757ecb802eb2b36d0729 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 14 Jun 2022 05:02:31 -0700 Subject: [PATCH 23/67] artwork-material now uses mediaitem-artwork --- src/renderer/less/pages.less | 4 ++-- src/renderer/style.less | 6 +++--- src/renderer/views/components/artwork-material.ejs | 2 +- src/renderer/views/pages/cider-playlist.ejs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 3abcb2c9..a540ce6d 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -634,7 +634,7 @@ opacity : .7; animation : playlistArtworkFadeIn 1s var(--appleEase); - .artworkMaterial>img { + .artworkMaterial img { filter : brightness(100%) blur(80px) saturate(100%) contrast(1); object-position: center; object-fit : cover; @@ -990,7 +990,7 @@ opacity : .7; animation : playlistArtworkFadeIn 1s var(--appleEase); - .artworkMaterial>img { + .artworkMaterial img { filter : brightness(100%) blur(80px) saturate(100%) contrast(1); object-position: center; object-fit : cover; diff --git a/src/renderer/style.less b/src/renderer/style.less index 042ddd54..23bc4827 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -311,19 +311,19 @@ a.dropdown-item { overflow: hidden; pointer-events: none; - > img { + img { position: absolute; width: 200%; opacity: 0.5; filter: brightness(200%) blur(180px) saturate(280%) contrast(2); } - > img:first-child { + img:first-child { top: 0; left: 0; } - > img:last-child { + img:last-child { bottom: 0; right: 0; transform: rotate(180deg); diff --git a/src/renderer/views/components/artwork-material.ejs b/src/renderer/views/components/artwork-material.ejs index 3cfe9891..9eae3e7c 100644 --- a/src/renderer/views/components/artwork-material.ejs +++ b/src/renderer/views/components/artwork-material.ejs @@ -1,6 +1,6 @@ diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 2f5cbed4..d7987100 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -121,7 +121,7 @@
- +