From 2df1a2d95f63b23119679582ce42f895c45aba0a Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 14 Dec 2021 22:12:19 -0800 Subject: [PATCH] Renamed cider-ui-tests to cider-ui, starting skeleton for settings page --- .../cider-ui-tests/views/pages/settings.ejs | 1 - .../ameframework.css | 0 .../{cider-ui-tests => cider-ui}/apple-hls.js | 0 .../assets/RatingsLove.png | Bin .../assets/arrow-left.svg | 0 .../assets/backward.svg | 0 .../assets/cast_white.svg | 0 .../assets/chevron-left.svg | 0 .../assets/forward.svg | 0 .../assets/list.svg | 0 .../assets/logocut.png | Bin .../assets/lossless.svg | 0 .../assets/pause.svg | 0 .../assets/play.svg | 0 .../assets/quote-right.svg | 0 .../assets/repeat.svg | 0 .../assets/search.svg | 0 .../assets/shuffle.svg | 0 .../assets/transparent.png | Bin .../assets/volume-down.svg | 0 .../assets/volume-up.svg | 0 .../{cider-ui-tests => cider-ui}/hlscider.js | 0 .../{cider-ui-tests => cider-ui}/index.js | 6 +- .../index_old.html | 0 .../{cider-ui-tests => cider-ui}/less.js | 0 .../{cider-ui-tests => cider-ui}/logotmp.png | Bin .../sortable.min.js | 0 .../style-old.css | 0 .../{cider-ui-tests => cider-ui}/style.less | 66 ++++++- .../{cider-ui-tests => cider-ui}/todo.js | 0 .../views/components/animatedartwork-view.ejs | 0 .../views/components/editorialNotes.ejs | 0 .../views/components/hello-world.ejs | 0 .../views/components/mediaitem-artwork.ejs | 0 .../views/components/mediaitem-hrect.ejs | 0 .../views/components/mediaitem-list-item.ejs | 0 .../views/components/mediaitem-mvview-sp.ejs | 0 .../views/components/mediaitem-mvview.ejs | 0 .../mediaitem-scroller-horizontal-large.ejs | 0 .../mediaitem-scroller-horizontal-mvview.ejs | 0 .../mediaitem-scroller-horizontal-sp.ejs | 0 .../mediaitem-scroller-horizontal.ejs | 0 .../components/mediaitem-square-large.ejs | 0 .../views/components/mediaitem-square-sp.ejs | 0 .../views/components/mediaitem-square.ejs | 0 .../views/main.ejs | 11 +- .../views/pages/about.ejs | 0 .../views/pages/artist.ejs | 0 .../views/pages/browse.ejs | 0 .../views/pages/cider-playlist.ejs | 0 .../views/pages/collection-list.ejs | 0 .../views/pages/library-albums.ejs | 0 .../views/pages/library-recentlyadded.ejs | 0 .../views/pages/library-songs.ejs | 0 .../views/pages/listen_now.ejs | 0 .../views/pages/radio.ejs | 0 .../views/pages/recordLabel.ejs | 0 .../views/pages/search.ejs | 0 resources/cider-ui/views/pages/settings.ejs | 178 ++++++++++++++++++ .../views/pages/webview.ejs | 0 .../views/svg/arrow-up.svg | 0 .../views/svg/cast.svg | 0 .../views/svg/fullscreen.svg | 0 .../views/svg/play.svg | 0 .../views/svg/redo.svg | 0 .../vue-observe-visibility.min.js | 0 resources/{cider-ui-tests => cider-ui}/vue.js | 0 .../vuedraggable.umd.min.js | 0 resources/functions/cider-base.js | 2 +- 69 files changed, 259 insertions(+), 5 deletions(-) delete mode 100644 resources/cider-ui-tests/views/pages/settings.ejs rename resources/{cider-ui-tests => cider-ui}/ameframework.css (100%) rename resources/{cider-ui-tests => cider-ui}/apple-hls.js (100%) rename resources/{cider-ui-tests => cider-ui}/assets/RatingsLove.png (100%) rename resources/{cider-ui-tests => cider-ui}/assets/arrow-left.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/backward.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/cast_white.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/chevron-left.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/forward.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/list.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/logocut.png (100%) rename resources/{cider-ui-tests => cider-ui}/assets/lossless.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/pause.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/play.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/quote-right.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/repeat.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/search.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/shuffle.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/transparent.png (100%) rename resources/{cider-ui-tests => cider-ui}/assets/volume-down.svg (100%) rename resources/{cider-ui-tests => cider-ui}/assets/volume-up.svg (100%) rename resources/{cider-ui-tests => cider-ui}/hlscider.js (100%) rename resources/{cider-ui-tests => cider-ui}/index.js (99%) rename resources/{cider-ui-tests => cider-ui}/index_old.html (100%) rename resources/{cider-ui-tests => cider-ui}/less.js (100%) rename resources/{cider-ui-tests => cider-ui}/logotmp.png (100%) rename resources/{cider-ui-tests => cider-ui}/sortable.min.js (100%) rename resources/{cider-ui-tests => cider-ui}/style-old.css (100%) rename resources/{cider-ui-tests => cider-ui}/style.less (98%) rename resources/{cider-ui-tests => cider-ui}/todo.js (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/animatedartwork-view.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/editorialNotes.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/hello-world.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-artwork.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-hrect.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-list-item.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-mvview-sp.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-mvview.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-scroller-horizontal-large.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-scroller-horizontal-mvview.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-scroller-horizontal-sp.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-scroller-horizontal.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-square-large.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-square-sp.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/components/mediaitem-square.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/main.ejs (98%) rename resources/{cider-ui-tests => cider-ui}/views/pages/about.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/artist.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/browse.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/cider-playlist.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/collection-list.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/library-albums.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/library-recentlyadded.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/library-songs.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/listen_now.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/radio.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/recordLabel.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/pages/search.ejs (100%) create mode 100644 resources/cider-ui/views/pages/settings.ejs rename resources/{cider-ui-tests => cider-ui}/views/pages/webview.ejs (100%) rename resources/{cider-ui-tests => cider-ui}/views/svg/arrow-up.svg (100%) rename resources/{cider-ui-tests => cider-ui}/views/svg/cast.svg (100%) rename resources/{cider-ui-tests => cider-ui}/views/svg/fullscreen.svg (100%) rename resources/{cider-ui-tests => cider-ui}/views/svg/play.svg (100%) rename resources/{cider-ui-tests => cider-ui}/views/svg/redo.svg (100%) rename resources/{cider-ui-tests => cider-ui}/vue-observe-visibility.min.js (100%) rename resources/{cider-ui-tests => cider-ui}/vue.js (100%) rename resources/{cider-ui-tests => cider-ui}/vuedraggable.umd.min.js (100%) diff --git a/resources/cider-ui-tests/views/pages/settings.ejs b/resources/cider-ui-tests/views/pages/settings.ejs deleted file mode 100644 index 48c7f234..00000000 --- a/resources/cider-ui-tests/views/pages/settings.ejs +++ /dev/null @@ -1 +0,0 @@ -

Settings

diff --git a/resources/cider-ui-tests/ameframework.css b/resources/cider-ui/ameframework.css similarity index 100% rename from resources/cider-ui-tests/ameframework.css rename to resources/cider-ui/ameframework.css diff --git a/resources/cider-ui-tests/apple-hls.js b/resources/cider-ui/apple-hls.js similarity index 100% rename from resources/cider-ui-tests/apple-hls.js rename to resources/cider-ui/apple-hls.js diff --git a/resources/cider-ui-tests/assets/RatingsLove.png b/resources/cider-ui/assets/RatingsLove.png similarity index 100% rename from resources/cider-ui-tests/assets/RatingsLove.png rename to resources/cider-ui/assets/RatingsLove.png diff --git a/resources/cider-ui-tests/assets/arrow-left.svg b/resources/cider-ui/assets/arrow-left.svg similarity index 100% rename from resources/cider-ui-tests/assets/arrow-left.svg rename to resources/cider-ui/assets/arrow-left.svg diff --git a/resources/cider-ui-tests/assets/backward.svg b/resources/cider-ui/assets/backward.svg similarity index 100% rename from resources/cider-ui-tests/assets/backward.svg rename to resources/cider-ui/assets/backward.svg diff --git a/resources/cider-ui-tests/assets/cast_white.svg b/resources/cider-ui/assets/cast_white.svg similarity index 100% rename from resources/cider-ui-tests/assets/cast_white.svg rename to resources/cider-ui/assets/cast_white.svg diff --git a/resources/cider-ui-tests/assets/chevron-left.svg b/resources/cider-ui/assets/chevron-left.svg similarity index 100% rename from resources/cider-ui-tests/assets/chevron-left.svg rename to resources/cider-ui/assets/chevron-left.svg diff --git a/resources/cider-ui-tests/assets/forward.svg b/resources/cider-ui/assets/forward.svg similarity index 100% rename from resources/cider-ui-tests/assets/forward.svg rename to resources/cider-ui/assets/forward.svg diff --git a/resources/cider-ui-tests/assets/list.svg b/resources/cider-ui/assets/list.svg similarity index 100% rename from resources/cider-ui-tests/assets/list.svg rename to resources/cider-ui/assets/list.svg diff --git a/resources/cider-ui-tests/assets/logocut.png b/resources/cider-ui/assets/logocut.png similarity index 100% rename from resources/cider-ui-tests/assets/logocut.png rename to resources/cider-ui/assets/logocut.png diff --git a/resources/cider-ui-tests/assets/lossless.svg b/resources/cider-ui/assets/lossless.svg similarity index 100% rename from resources/cider-ui-tests/assets/lossless.svg rename to resources/cider-ui/assets/lossless.svg diff --git a/resources/cider-ui-tests/assets/pause.svg b/resources/cider-ui/assets/pause.svg similarity index 100% rename from resources/cider-ui-tests/assets/pause.svg rename to resources/cider-ui/assets/pause.svg diff --git a/resources/cider-ui-tests/assets/play.svg b/resources/cider-ui/assets/play.svg similarity index 100% rename from resources/cider-ui-tests/assets/play.svg rename to resources/cider-ui/assets/play.svg diff --git a/resources/cider-ui-tests/assets/quote-right.svg b/resources/cider-ui/assets/quote-right.svg similarity index 100% rename from resources/cider-ui-tests/assets/quote-right.svg rename to resources/cider-ui/assets/quote-right.svg diff --git a/resources/cider-ui-tests/assets/repeat.svg b/resources/cider-ui/assets/repeat.svg similarity index 100% rename from resources/cider-ui-tests/assets/repeat.svg rename to resources/cider-ui/assets/repeat.svg diff --git a/resources/cider-ui-tests/assets/search.svg b/resources/cider-ui/assets/search.svg similarity index 100% rename from resources/cider-ui-tests/assets/search.svg rename to resources/cider-ui/assets/search.svg diff --git a/resources/cider-ui-tests/assets/shuffle.svg b/resources/cider-ui/assets/shuffle.svg similarity index 100% rename from resources/cider-ui-tests/assets/shuffle.svg rename to resources/cider-ui/assets/shuffle.svg diff --git a/resources/cider-ui-tests/assets/transparent.png b/resources/cider-ui/assets/transparent.png similarity index 100% rename from resources/cider-ui-tests/assets/transparent.png rename to resources/cider-ui/assets/transparent.png diff --git a/resources/cider-ui-tests/assets/volume-down.svg b/resources/cider-ui/assets/volume-down.svg similarity index 100% rename from resources/cider-ui-tests/assets/volume-down.svg rename to resources/cider-ui/assets/volume-down.svg diff --git a/resources/cider-ui-tests/assets/volume-up.svg b/resources/cider-ui/assets/volume-up.svg similarity index 100% rename from resources/cider-ui-tests/assets/volume-up.svg rename to resources/cider-ui/assets/volume-up.svg diff --git a/resources/cider-ui-tests/hlscider.js b/resources/cider-ui/hlscider.js similarity index 100% rename from resources/cider-ui-tests/hlscider.js rename to resources/cider-ui/hlscider.js diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui/index.js similarity index 99% rename from resources/cider-ui-tests/index.js rename to resources/cider-ui/index.js index 5537ba3c..270c8816 100644 --- a/resources/cider-ui-tests/index.js +++ b/resources/cider-ui/index.js @@ -189,7 +189,11 @@ const app = new Vue({ this.mk.authorize() this.$forceUpdate() this.mk.privateEnabled = true - this.platform = ipcRenderer.sendSync('cider-platform'); + try { + this.platform = ipcRenderer.sendSync('cider-platform'); + }catch(e){ + this.platform = "dev" + } // Set profile name this.chrome.userinfo = await this.mkapi("personalSocialProfile", false, "") // API Fallback diff --git a/resources/cider-ui-tests/index_old.html b/resources/cider-ui/index_old.html similarity index 100% rename from resources/cider-ui-tests/index_old.html rename to resources/cider-ui/index_old.html diff --git a/resources/cider-ui-tests/less.js b/resources/cider-ui/less.js similarity index 100% rename from resources/cider-ui-tests/less.js rename to resources/cider-ui/less.js diff --git a/resources/cider-ui-tests/logotmp.png b/resources/cider-ui/logotmp.png similarity index 100% rename from resources/cider-ui-tests/logotmp.png rename to resources/cider-ui/logotmp.png diff --git a/resources/cider-ui-tests/sortable.min.js b/resources/cider-ui/sortable.min.js similarity index 100% rename from resources/cider-ui-tests/sortable.min.js rename to resources/cider-ui/sortable.min.js diff --git a/resources/cider-ui-tests/style-old.css b/resources/cider-ui/style-old.css similarity index 100% rename from resources/cider-ui-tests/style-old.css rename to resources/cider-ui/style-old.css diff --git a/resources/cider-ui-tests/style.less b/resources/cider-ui/style.less similarity index 98% rename from resources/cider-ui-tests/style.less rename to resources/cider-ui/style.less index fc44799c..a1f7c8d0 100644 --- a/resources/cider-ui-tests/style.less +++ b/resources/cider-ui/style.less @@ -2424,4 +2424,68 @@ div#captions { .semibold{ font-weight: 500; -} \ No newline at end of file +} + +/* Switch Checkbox */ +input[type=checkbox][switch] { + width: 38px; + appearance: none; + border-radius: 32px; + height: 24px; + zoom: 1; + top: 0; + cursor: pointer; + left: 0; + position: relative; + transform: scale(1); + background: rgb(142 142 147 / 100%); + padding: 0; + margin: 0; +} + +input[type=checkbox][switch]:focus, +input[type=checkbox][switch]:active { + outline: none; +} + +input[type=checkbox][switch]:checked { + background: var(--keyColor); + border: 0 solid var(--keyColor); + mix-blend-mode: unset; +} + +input[type=checkbox][switch]::before { + background: white; + width: 26px; + height: 26px; + top: -1px; + left: -1px; + position: absolute; + content: ' '; + border-radius: 32px; + transition: .10s left var(--appleEase); + transform: scale(.75); +} + + +input[type=checkbox][switch]:checked::before { + background: white; + top: -1px; + left: 13px; + transition: .10s left var(--appleEase); + transform: scale(.75); +} + +input[type=checkbox][switch]:disabled::before { + opacity: .5; +} + +input[type=checkbox][switch]:active::before { + left: 13px; +} + +input[type=checkbox][switch]:checked:active::before { + left: -1px; +} + +/* End Switch Checkbox */ \ No newline at end of file diff --git a/resources/cider-ui-tests/todo.js b/resources/cider-ui/todo.js similarity index 100% rename from resources/cider-ui-tests/todo.js rename to resources/cider-ui/todo.js diff --git a/resources/cider-ui-tests/views/components/animatedartwork-view.ejs b/resources/cider-ui/views/components/animatedartwork-view.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/animatedartwork-view.ejs rename to resources/cider-ui/views/components/animatedartwork-view.ejs diff --git a/resources/cider-ui-tests/views/components/editorialNotes.ejs b/resources/cider-ui/views/components/editorialNotes.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/editorialNotes.ejs rename to resources/cider-ui/views/components/editorialNotes.ejs diff --git a/resources/cider-ui-tests/views/components/hello-world.ejs b/resources/cider-ui/views/components/hello-world.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/hello-world.ejs rename to resources/cider-ui/views/components/hello-world.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-artwork.ejs b/resources/cider-ui/views/components/mediaitem-artwork.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-artwork.ejs rename to resources/cider-ui/views/components/mediaitem-artwork.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-hrect.ejs b/resources/cider-ui/views/components/mediaitem-hrect.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-hrect.ejs rename to resources/cider-ui/views/components/mediaitem-hrect.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-list-item.ejs b/resources/cider-ui/views/components/mediaitem-list-item.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-list-item.ejs rename to resources/cider-ui/views/components/mediaitem-list-item.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-mvview-sp.ejs b/resources/cider-ui/views/components/mediaitem-mvview-sp.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-mvview-sp.ejs rename to resources/cider-ui/views/components/mediaitem-mvview-sp.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-mvview.ejs b/resources/cider-ui/views/components/mediaitem-mvview.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-mvview.ejs rename to resources/cider-ui/views/components/mediaitem-mvview.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal-large.ejs b/resources/cider-ui/views/components/mediaitem-scroller-horizontal-large.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal-large.ejs rename to resources/cider-ui/views/components/mediaitem-scroller-horizontal-large.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal-mvview.ejs b/resources/cider-ui/views/components/mediaitem-scroller-horizontal-mvview.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal-mvview.ejs rename to resources/cider-ui/views/components/mediaitem-scroller-horizontal-mvview.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal-sp.ejs b/resources/cider-ui/views/components/mediaitem-scroller-horizontal-sp.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal-sp.ejs rename to resources/cider-ui/views/components/mediaitem-scroller-horizontal-sp.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal.ejs b/resources/cider-ui/views/components/mediaitem-scroller-horizontal.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-scroller-horizontal.ejs rename to resources/cider-ui/views/components/mediaitem-scroller-horizontal.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-square-large.ejs b/resources/cider-ui/views/components/mediaitem-square-large.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-square-large.ejs rename to resources/cider-ui/views/components/mediaitem-square-large.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-square-sp.ejs b/resources/cider-ui/views/components/mediaitem-square-sp.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-square-sp.ejs rename to resources/cider-ui/views/components/mediaitem-square-sp.ejs diff --git a/resources/cider-ui-tests/views/components/mediaitem-square.ejs b/resources/cider-ui/views/components/mediaitem-square.ejs similarity index 100% rename from resources/cider-ui-tests/views/components/mediaitem-square.ejs rename to resources/cider-ui/views/components/mediaitem-square.ejs diff --git a/resources/cider-ui-tests/views/main.ejs b/resources/cider-ui/views/main.ejs similarity index 98% rename from resources/cider-ui-tests/views/main.ejs rename to resources/cider-ui/views/main.ejs index a8b36053..f316d2bd 100644 --- a/resources/cider-ui-tests/views/main.ejs +++ b/resources/cider-ui/views/main.ejs @@ -188,7 +188,7 @@ -