Merge branch 'main' into main-ts

src/renderer/index.js

@@ -3123,9 +3123,9 @@ const app = new Vue({
             element.onclick = app.LastFMAuthenticate;
         },
         LastFMAuthenticate() {
-            console.log("wag")
+            console.log("[LastFM] Received LastFM authentication callback")
             const element = document.getElementById('lfmConnect');
-            window.open('https://www.last.fm/api/auth?api_key=174905d201451602407b428a86e8344d&cb=ame://auth/lastfm');
+            window.open('https://www.last.fm/api/auth?api_key=f9986d12aab5a0fe66193c559435ede3&cb=cider://auth/lastfm');
             element.innerText = 'Connecting...';
 
             /* Just a timeout for the button */

src/renderer/index_old.html

@@ -64,7 +64,7 @@
                                     {{ mk.nowPlayingItem["attributes"]["name"] }}
                                 </div>
                                 <div class="song-artist">
-                                    {{ mk.nowPlayingItem["attributes"]["artistName"] }} - {{
+                                    {{ mk.nowPlayingItem["attributes"]["artistName"] }} — {{
                                     mk.nowPlayingItem["attributes"]["albumName"] }}
                                 </div>
                                 <div class="song-progress">
@@ -560,7 +560,7 @@
                     <template v-if="item.attributes.artistName">
                         {{ item.attributes.artistName }}
                         <template v-if="item.attributes.albumName">
-                            - {{ item.attributes.albumName }}
+                            — {{ item.attributes.albumName }}
                         </template>
                     </template>
                 </div>

src/renderer/style.less

@@ -2929,6 +2929,8 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
   .autoplay {
     background: rgb(200 200 200 / 15%);
+    color:rgb(255 255 255);
+    font-size: larger;
     appearance: none;
     border: 0;
     border-radius: 6px;

src/renderer/views/components/fullscreen.ejs

@@ -33,7 +33,7 @@
                                 </div>
                                 <div class="song-artist item-navigate" style="display: inline-block;"
                                      @click="app.getNowPlayingItemDetailed('album')">
-                                    {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" - " +
+                                    {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" — " +
                                     app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
                                 </div>
                             </div>

src/renderer/views/components/mediaitem-list-item.ejs

@@ -39,7 +39,7 @@
                              @click="app.searchAndNavigate(item,'artist')">
                             {{ item.attributes.artistName }}
                         </div>
-                        <template v-if="item.attributes.albumName">&nbsp;-&nbsp;</template>
+                        <template v-if="item.attributes.albumName">&nbsp;—&nbsp;</template>
                         <template v-if="item.attributes.albumName">
                             <div class="artist item-navigate text-overflow-elipsis"
                                  @click="app.searchAndNavigate(item,'album')">

src/renderer/views/components/queue-item.ejs

@@ -19,7 +19,7 @@
                             <div class="artist item-navigate text-overflow-elipsis" @click="app.searchAndNavigate(item,'artist')">
                                 {{ item.attributes.artistName }}
                             </div>
-                            <template v-if="item.attributes.albumName">&nbsp;-&nbsp;</template>
+                            <template v-if="item.attributes.albumName">&nbsp;—&nbsp;</template>
                             <template v-if="item.attributes.albumName">
                                 <div class="artist item-navigate text-overflow-elipsis" @click="app.searchAndNavigate(item,'album')">
                                 {{ item.attributes.albumName }}

src/renderer/views/components/queue.ejs

@@ -5,7 +5,7 @@
                 <h3 class="queue-header-text">Queue</h3>
             </div>
             <div class="col-auto flex-center">
-                <button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled">AUTO</button>
+                <button class="autoplay" :style="{'background': app.mk.autoplayEnabled ? 'var(--keyColor)' : ''}" @click="app.mk.autoplayEnabled = !app.mk.autoplayEnabled">∞</button>
             </div>
         </div>
         <div class="queue-body">
@@ -25,7 +25,7 @@
                             </div>
                             <div class="col queue-info">
                                 <div class="queue-title text-overflow-elipsis">{{ queueItem.item.attributes.name }}</div>
-                                <div class="queue-subtitle text-overflow-elipsis">{{ queueItem.item.attributes.albumName }} - {{ queueItem.item.attributes.artistName }}</div>
+                                <div class="queue-subtitle text-overflow-elipsis">{{ queueItem.item.attributes.albumName }} — {{ queueItem.item.attributes.artistName }}</div>
                             </div>
                         </div>
                     </div>

src/renderer/views/main.ejs

@@ -93,7 +93,7 @@
                                         </div>
                                         <div class="song-artist item-navigate" style="display: inline-block;"
                                              @click="getNowPlayingItemDetailed('album')">
-                                            <div class="separator" style="display: inline-block;">{{"-"}}</div>
+                                            <div class="separator" style="display: inline-block;">{{"—"}}</div>
                                             {{(mk.nowPlayingItem["attributes"]["albumName"]) ?
                                             (mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
                                         </div>
@@ -142,8 +142,11 @@
                                 @click="invokeDrawer('queue')"></button>
                     </div>
                     <div class="app-chrome-item generic">
-                        <button class="playback-button--small lyrics" :class="{'active': drawer.panel == 'lyrics'}"
+                        <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
+                            <button class="playback-button--small lyrics" :class="{'active': drawer.panel == 'lyrics'}"
                                 @click="invokeDrawer('lyrics')"></button>
+                            </template>
+                        
                     </div>
                     <div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'right'">
                         <div class="window-controls">
@@ -517,7 +520,7 @@
 
                 </div>
                 <transition name="drawertransition">
-                    <div class="app-drawer" v-if="drawer.open && drawer.panel == 'lyrics'">
+                    <div class="app-drawer" v-if="drawer.open && drawer.panel == 'lyrics' && lyrics && lyrics != [] && lyrics.length > 0">
                         <div class="bgArtworkMaterial">
                             <div class="bg-artwork-container">
                                 <img class="bg-artwork a" :src="$store.state.artwork.playerLCD">
@@ -708,4 +711,4 @@
 <script src="https://cdn.jsdelivr.net/npm/resonance-audio/build/resonance-audio.min.js"></script>
 <script src="/audio/audio.js?v=1"></script>
 </body>
-</html>
+</html>