From 11586b251cff20308376ee77ad1824ef9ee15233 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Mon, 6 Jun 2022 00:38:13 -0700
Subject: [PATCH] oobe improvemnets

- added close and minimize buttons (windows/linux only)
- added drag region to top
- optimized for smaller window sizes
---
 src/ciderkit/public.js                    |  2 +-
 src/renderer/less/pages.less              | 81 +++++++++++++++++++++--
 src/renderer/views/app/app-navigation.ejs |  2 +-
 src/renderer/views/pages/oobe.ejs         |  8 ++-
 4 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/src/ciderkit/public.js b/src/ciderkit/public.js
index d3c26637..bbddad9c 100644
--- a/src/ciderkit/public.js
+++ b/src/ciderkit/public.js
@@ -18,7 +18,7 @@ const CiderKit = {
                     body: body,
                     options: options
                 })
-                let response = await fetch("http://localhost:9000/api/musickit/v3", opts);
+                let response = await fetch("./api/musickit/v3", opts);
                 return response.json()
             }
         }
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index baed43e5..3abcb2c9 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -1700,6 +1700,10 @@
       overflow-y   : scroll;
       overflow-x   : hidden;
 
+      @media screen and (max-width: 1161px) {
+        font-size: 13px;
+      }
+
       &.text {
         white-space: pre-wrap;
       }
@@ -1729,10 +1733,10 @@
           }
 
           .card-body {
-            padding: 0;
-            display: flex;
+            padding        : 0;
+            display        : flex;
             justify-content: center;
-            align-items: center;
+            align-items    : center;
           }
 
           .card-footer {
@@ -1742,7 +1746,7 @@
             bottom     : 0;
             left       : 0;
             width      : 100%;
-            border:0px;
+            border     : 0px;
             text-shadow: 0px 2px 6px rgba(0, 0, 0, 0.25);
             font-weight: bold;
           }
@@ -1758,6 +1762,10 @@
             z-index   : 1;
             box-shadow: 0px 12px 16px rgb(0 0 0 / 25%);
           }
+
+          @media screen and (max-height: 688px) {
+            width: 270px;
+          }
         }
       }
     }
@@ -1775,6 +1783,71 @@
         text-align: center;
       }
     }
+
+  }
+
+
+  .oobe-titlebar {
+    position          : absolute;
+    top               : 0;
+    left              : 0;
+    height            : 46px;
+    width             : 100%;
+    align-items       : center;
+    justify-content   : right;
+    display           : flex;
+    -webkit-app-region: drag;
+
+    .button-group {
+      -webkit-app-region: no-drag;
+      display           : flex;
+      flex-direction    : row;
+      width             : 100px;
+      height            : 100%;
+      justify-content   : center;
+      align-items       : center;
+      gap               : 16px;
+
+      >button {
+        height         : 32px;
+        width          : 32px;
+        font-size      : 16px;
+        border-radius  : 0px;
+        border         : 0;
+        appearance     : none;
+        position       : relative;
+        display        : flex;
+        justify-content: center;
+        align-items    : center;
+        border-radius  : 100%;
+
+        &.close {
+          background-color: #fc3c44aa;
+          &:hover {
+            background-color: #fc3c44;
+          }
+        }
+
+        &.min {
+          background-color: rgb(200 200 200 / 5%);
+          &:hover {
+            background-color: rgb(200 200 200 / 10%);
+          }
+        }
+
+        &.close::before {
+          font-family: "codicon";
+          content    : "";
+          color      : white;
+        }
+
+        &.min::before {
+          font-family: "codicon";
+          content    : "";
+          color      : white;
+        }
+      }
+    }
   }
 }
 
diff --git a/src/renderer/views/app/app-navigation.ejs b/src/renderer/views/app/app-navigation.ejs
index e937bc99..9ebaa5ed 100644
--- a/src/renderer/views/app/app-navigation.ejs
+++ b/src/renderer/views/app/app-navigation.ejs
@@ -10,7 +10,7 @@
             <img
               class="sidebar-user-icon"
               loading="lazy"
-              :src="getMediaItemArtwork(chrome.hideUserInfo ? 'http://localhost:9000/assets/logocut.png' : (chrome.userinfo.attributes['artwork'] ? chrome.userinfo.attributes['artwork']['url'] : ''), 26)"
+              :src="getMediaItemArtwork(chrome.hideUserInfo ? './assets/logocut.png' : (chrome.userinfo.attributes['artwork'] ? chrome.userinfo.attributes['artwork']['url'] : ''), 26)"
             />
 
             <div class="sidebar-user-text" v-if="!chrome.hideUserInfo">
diff --git a/src/renderer/views/pages/oobe.ejs b/src/renderer/views/pages/oobe.ejs
index 1e882e81..6647e251 100644
--- a/src/renderer/views/pages/oobe.ejs
+++ b/src/renderer/views/pages/oobe.ejs
@@ -143,6 +143,12 @@
 
             </div>
         </div>
+        <div class="oobe-titlebar">
+            <div class="button-group" v-if="$root.platform !== 'darwin'">
+                <button class="min" @click="$root.ipcRenderer.send('minimize')"></button>
+                <button class="close" @click="$root.ipcRenderer.send('close')"></button>
+            </div>
+        </div>
     </div>
 </script>
 <script>
@@ -158,7 +164,7 @@
         },
         methods: {
             signIn() {
-                if(localStorage.getItem("music.ampwebplay.media-user-token")) {
+                if (localStorage.getItem("music.ampwebplay.media-user-token")) {
                     localStorage.setItem("seenOOBE", 1)
                     window.location.reload()
                 }