From cf7813142eb9db8c5029c9bc49ddc96f5330e6bb Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Thu, 10 Feb 2022 13:34:04 +0700
Subject: [PATCH] webview pair-remote

---
 src/main/base/browserwindow.ts           | 3 ++-
 src/renderer/index.js                    | 8 ++++----
 src/renderer/views/app/app-content.ejs   | 6 ++++++
 src/renderer/views/app/sidebar.ejs       | 4 ----
 src/renderer/views/pages/remote-pair.ejs | 4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index ef6a0b94..d761be78 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -44,6 +44,7 @@ export class BrowserWindow {
                 "pages/search",
                 "pages/about",
                 "pages/library-videos",
+                "pages/remote-pair",
                 "components/mediaitem-artwork",
                 "components/artwork-material",
                 "components/menu-panel",
@@ -540,7 +541,7 @@ export class BrowserWindow {
 
         ipcMain.on('get-remote-pair-url', (_event, _) => {
             let url = `http://${BrowserWindow.getIP()}:${this.remotePort}`;
-            BrowserWindow.win.webContents.send('send-remote-pair-url', url);
+            BrowserWindow.win.webContents.send('send-remote-pair-url', (`https://cider.sh/pair-remote?url=${Buffer.from(encodeURI(url)).toString('base64')}`).toString());
         });
         if (process.platform === "darwin") {
             app.setUserActivity('com.CiderCollective.remote.pair', {
diff --git a/src/renderer/index.js b/src/renderer/index.js
index c472277a..d137676a 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -1582,10 +1582,10 @@ const app = new Vue({
                         bb = b.attributes.genreNames[0]
                     }
                     if (prefs.sort == "dateAdded"){
-                    let albumida =  a.relationships?.albums?.data[0]?.id ?? '1970-01-01T00:01:01Z'
-                    let albumidb =  b.relationships?.albums?.data[0]?.id ?? '1970-01-01T00:01:01Z'
-                    aa = startTime - new Date(((albumAdded.find(i => i[albumida]))?? [])[albumida] ?? '1970-01-01T00:01:01Z').getTime()
-                    bb = startTime - new Date(((albumAdded.find(i => i[albumidb]))?? [])[albumidb] ?? '1970-01-01T00:01:01Z').getTime()
+                        let albumida =  a.relationships?.albums?.data[0]?.id ?? '1970-01-01T00:01:01Z'
+                        let albumidb =  b.relationships?.albums?.data[0]?.id ?? '1970-01-01T00:01:01Z'
+                        aa = startTime - new Date(((albumAdded.find(i => i[albumida]))?? [])[albumida] ?? '1970-01-01T00:01:01Z').getTime()
+                        bb = startTime - new Date(((albumAdded.find(i => i[albumidb]))?? [])[albumidb] ?? '1970-01-01T00:01:01Z').getTime()
                     }
                     if (aa == null) {
                         aa = ""
diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs
index e3ad44a4..5087544a 100644
--- a/src/renderer/views/app/app-content.ejs
+++ b/src/renderer/views/app/app-content.ejs
@@ -159,5 +159,11 @@
             <cider-applecurator :data="appleCurator"></cider-applecurator>
         </template>
     </transition>
+        <!-- Library - Library Videos -->
+    <transition name="wpfade">
+        <template v-if="page == 'remote-pair'">
+                <remote-pair></remote-pair>
+        </template>
+    </transition>
 
 </div>
\ No newline at end of file
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index b4260263..7a7fae6f 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -93,12 +93,8 @@
                     </div>
                 </button>
                 <button class="usermenu-item" @click="appRoute('remote-pair')">
-                    <div class="row nopadding">
-                        <div class="col nopadding">
                             <span class="usermenu-item-icon"><%- include("../svg/smartphone.svg") %></span>
                             <span class="usermenu-item-name">{{$root.getLz('action.showWebRemoteQR')}}</span>
-                        </div>
-                    </div>
                 </button>
                 <button class="usermenu-item" v-if="cfg.advanced.AudioContext"
                         @click="modals.audioSettings = true">
diff --git a/src/renderer/views/pages/remote-pair.ejs b/src/renderer/views/pages/remote-pair.ejs
index c71cb50e..ccd08ead 100644
--- a/src/renderer/views/pages/remote-pair.ejs
+++ b/src/renderer/views/pages/remote-pair.ejs
@@ -4,8 +4,8 @@
     </div>
 </script>
 <script>
-    Vue.component('apple-account-settings', {
-        template: '#apple-account-settings',
+    Vue.component('remote-pair', {
+        template: '#remote-pair',
         async mounted() {
             ipcRenderer.send('get-remote-pair-url')
             ipcRenderer.on('send-remote-pair-url', (event, url) => {