From 08874c70ea4408a6a1254de4047e36baffc044e2 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Fri, 17 Dec 2021 21:54:49 +0700
Subject: [PATCH] disable SW for now, fix lyrics, comment release for win

---
 .github/workflows/build-analyze-win.yml       | 24 +++++++++----------
 resources/cider-ui/index.js                   | 12 +++++-----
 resources/cider-ui/style.less                 |  8 +++++++
 .../cider-ui/views/components/lyrics-view.ejs |  5 ++--
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build-analyze-win.yml b/.github/workflows/build-analyze-win.yml
index e85c12fa..1f244436 100644
--- a/.github/workflows/build-analyze-win.yml
+++ b/.github/workflows/build-analyze-win.yml
@@ -80,16 +80,16 @@ jobs:
         # A file, directory or wildcard pattern that describes what to upload
         path: dist/
         # The desired behavior if no files are found using the provided path.
-    - name: Generate release tag
-      id: tag
-      run: |
-        echo "::set-output name=release_tag::CiderNightly_$(date +"%Y.%m.%d_%H-%M")"    
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        prerelease: true
-        tag_name: ${{ steps.tag.outputs.release_tag }}
-        files: dist/Cider Setup 1.0.0.exe
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+    # - name: Generate release tag
+    #   id: tag
+    #   run: |
+    #     echo "::set-output name=release_tag::CiderNightly_$(date +"%Y.%m.%d_%H-%M")"    
+    # - name: Release
+    #   uses: softprops/action-gh-release@v1
+    #   with:
+    #     prerelease: true
+    #     tag_name: ${{ steps.tag.outputs.release_tag }}
+    #     files: dist/Cider Setup 1.0.0.exe
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
           
diff --git a/resources/cider-ui/index.js b/resources/cider-ui/index.js
index 7897ca4d..6af4b988 100644
--- a/resources/cider-ui/index.js
+++ b/resources/cider-ui/index.js
@@ -1842,12 +1842,12 @@ document.addEventListener('musickitloaded', function () {
     request.send();
 });
 
-if ('serviceWorker' in navigator) {
-    // Use the window load event to keep the page load performant
-    window.addEventListener('load', () => {
-      navigator.serviceWorker.register('sw.js?v=1');
-    });
-  }
+// if ('serviceWorker' in navigator) {
+//     // Use the window load event to keep the page load performant
+//     window.addEventListener('load', () => {
+//       navigator.serviceWorker.register('sw.js?v=1');
+//     });
+//   }
 
 function uuidv4() {
     return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c =>
diff --git a/resources/cider-ui/style.less b/resources/cider-ui/style.less
index 143f2192..c4bb6830 100644
--- a/resources/cider-ui/style.less
+++ b/resources/cider-ui/style.less
@@ -1351,6 +1351,14 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   flex-flow: column;
 }
 
+.lyric-body .no-lyrics {
+  width: 100%;
+  justify-content: center;
+  align-items: center;
+  font-weight: bold;
+  font-size: 26px;
+}
+
 .lyric-line {
   --bgSpeed: 1s;
   appearance: none;
diff --git a/resources/cider-ui/views/components/lyrics-view.ejs b/resources/cider-ui/views/components/lyrics-view.ejs
index 08a1e8c6..ff8a7d13 100644
--- a/resources/cider-ui/views/components/lyrics-view.ejs
+++ b/resources/cider-ui/views/components/lyrics-view.ejs
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="lyrics-view">
     <div ref="lyricsview" class="md-body lyric-body">
-        <template v-if="lyrics && lyrics != []">
+        <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
             <template v-for="(lyric, index) in lyrics" v-if="lyric.line != 'lrcInstrumental'">
                 <h3 class="lyric-line" @click="if(lyric.startTime != 9999999) app.seekTo(lyric.startTime, false)"
                     v-bind:line-index="index.toString()">
@@ -34,7 +34,8 @@
             </template>
         </template>
         <template v-else>
-            No Lyrics Available
+            <div class="no-lyrics">
+                Loading... / Lyrics not found./ Instrumental.
         </template>
     </div>
 </script>