From 3340fb93df9e56caf8f7e93e57c531bcfdc5bfbb Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Mon, 7 Feb 2022 10:04:41 -0800
Subject: [PATCH] removed some comments, fixed app not loading in yarn start.
---
src/renderer/index.js | 82 -------------------
.../ameframework.less} | 0
src/renderer/style.less | 2 +-
src/renderer/views/app/chrome-top.ejs | 2 +-
4 files changed, 2 insertions(+), 84 deletions(-)
rename src/renderer/{ameframework.css => less/ameframework.less} (100%)
diff --git a/src/renderer/index.js b/src/renderer/index.js
index e5dba229..7000a24b 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -3073,23 +3073,6 @@ const app = new Vue({
})
self.$store.commit("setLCDArtwork", img)
})
-
- // Vibrant.from(this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"].replace('{w}', size).replace('{h}', size)).getPalette().then(palette=>{
- // let angle = "140deg"
- // let gradient = ""
- // let colors = Object.values(palette).filter(color=>color!=null)
- // if(colors.length > 0){
- // let stops = []
- // colors.forEach(color=>{
- // stops.push(`${self._rgbToRgb(color._rgb)} 0%`)
- // })
- // stops.push(`${self._rgbToRgb(colors[0]._rgb)} 100%`)
- // gradient = `linear-gradient(${angle}, ${stops.join(", ")}`
- // }
- //
- // document.querySelector("#app").style.setProperty("--bgColor", gradient)
- // }).setQuantizer(Vibrant.Quantizer.WebWorker)
-
try {
clearInterval(bginterval);
} catch (err) {
@@ -3114,47 +3097,6 @@ const app = new Vue({
}
}, 200)
},
-
- // getNowPlayingArtwork(size = 600) {
- // if (typeof this.mk.nowPlayingItem === "undefined") return;
- // let interval = setInterval(() => {
-
- // try {
- // if (this.mk.nowPlayingItem && this.mk.nowPlayingItem["id"] != this.currentTrackIDBG && document.querySelector('.app-playback-controls .artwork')) {
- // this.currentTrackIDBG = this.mk.nowPlayingItem["id"];
- // if (document.querySelector('.app-playback-controls .artwork') != null) {
- // clearInterval(interval);
- // }
- // if (app.mk.nowPlayingItem.attributes.artwork != null && app.mk.nowPlayingItem.attributes.artwork.url != null && app.mk.nowPlayingItem.attributes.artwork.url!= '' ) {
- // document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${decodeURI((this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"])).replace('{w}', size).replace('{h}', size)}")`);
- // try {
- // clearInterval(interval);
- // } catch (err) {
- // }
- // } else {
- // this.setLibraryArt()
- // }
- // } else if (this.mk.nowPlayingItem["id"] == this.currentTrackID) {
- // try {
- // clearInterval(interval);
- // } catch (err) {
- // }
- // }
- // } catch (e) {
- // if (this.mk.nowPlayingItem && this.mk.nowPlayingItem["id"] && document.querySelector('.app-playback-controls .artwork')) {
- // this.setLibraryArt()
- // try {
- // clearInterval(interval);
- // } catch (err) {
- // }
-
- // }
-
- // }
- // }, 200)
-
-
- // },
async getCurrentArtURL() {
try {
this.currentArtUrl = '';
@@ -3169,11 +3111,6 @@ const app = new Vue({
data = data.data.data[0];
if (data != null && data !== "" && data.attributes != null && data.attributes.artwork != null) {
this.currentArtUrl = (data["attributes"]["artwork"]["url"] ?? '').replace('{w}', 50).replace('{h}', 50);
- // if (this.currentArtUrl != ""){
- // let attr = MusicKitInterop.getAttributes();
- // attr.artwork.url = this.currentArtUrl;
- // ipcRenderer.send('forceUpdateRPC',attr)
- // }
try {
document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
} catch (e) {
@@ -3398,18 +3335,11 @@ const app = new Vue({
}
},
async nowPlayingContextMenu(event) {
- // function revisedRandId() {
- // return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10);
- // }
let self = this
let data_type = this.mk.nowPlayingItem.playParams.kind
let item_id = this.mk.nowPlayingItem.attributes.playParams.id ?? this.mk.nowPlayingItem.id
let isLibrary = this.mk.nowPlayingItem.attributes.playParams.isLibrary ?? false
let params = {"fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library", "t": "1"}
- // let res = await app.mkapi(data_type, isLibrary , item_id, params);
- // if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
- // item_id = res.relationships.library.data[0].id
- // }
app.selectedMediaItems = []
app.select_selectMediaItem(item_id, data_type, 0, '12344', isLibrary)
let useMenu = "normal"
@@ -3473,7 +3403,6 @@ const app = new Vue({
"disabled": false,
"action": function () {
app.addToLibrary(app.mk.nowPlayingItem.id);
- // if (!isLibrary) {app.addToLibrary(item_id); this.mk.nowPlayingItem.attributes.playParams["isLibrary"] = true} else { app.removeFromLibrary(data_type,item_id); this.mk.nowPlayingItem.attributes.playParams["isLibrary"] = false};
}
},
{
@@ -3499,21 +3428,10 @@ const app = new Vue({
}
}
if (this.contextExt) {
- // if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
if (this.contextExt.normal) {
menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
}
}
-
- // isLibrary = await app.inLibrary([this.mk.nowPlayingItem])
- // console.warn(isLibrary)
- // if(isLibrary.length != 0) {
- // if (isLibrary[0].attributes.inLibrary) {
- // menus.normal.items.find(x => x.id == "addToLibrary").disabled = true
- // }
- // }else{
- // menus.normal.items.find(x => x.id == "addToLibrary").disabled = true
- // }
this.showMenuPanel(menus[useMenu], event)
try {
diff --git a/src/renderer/ameframework.css b/src/renderer/less/ameframework.less
similarity index 100%
rename from src/renderer/ameframework.css
rename to src/renderer/less/ameframework.less
diff --git a/src/renderer/style.less b/src/renderer/style.less
index c7903888..4b88be9c 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -1,10 +1,10 @@
-@import url("ameframework.css");
@import url("assets/fonts/Inter/inter.css");
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@100;300;400;500;700;900&display=swap');
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+HK:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap");
+@import url("less/ameframework.less");
@import url("less/bootstrap.less");
@import url("less/notyf.less");
diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs
index 15fa6f2f..8f2d2207 100644
--- a/src/renderer/views/app/chrome-top.ejs
+++ b/src/renderer/views/app/chrome-top.ejs
@@ -57,7 +57,7 @@
v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
style="display: inline-block">
-
+