From 2db8c535a02aca894cfd7edd2ef392b6482c6966 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 22 Jan 2022 11:00:37 +0700
Subject: [PATCH] add webremote url in modal

---
 src/main/base/win.ts                           | 7 ++++++-
 src/renderer/index.js                          | 2 ++
 src/renderer/views/components/qrcode-modal.ejs | 4 ++--
 src/renderer/views/main.ejs                    | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/base/win.ts b/src/main/base/win.ts
index d3a31a68..0e7151ec 100644
--- a/src/main/base/win.ts
+++ b/src/main/base/win.ts
@@ -426,10 +426,15 @@ export class Win {
         //QR Code
         electron.ipcMain.handle('setRemoteQR', async (event , _) => {
            let url = await qrcode2.toDataURL(`http://${getIp()}:${this.remotePort}`)
-           console.log(url)
            return url;              
         })
 
+        //Remote URL
+        electron.ipcMain.handle('setRemoteURL', async (event , _) => {
+            let url = `http://${getIp()}:${this.remotePort}`
+            return await url;              
+        })
+
         /* *********************************************************************************************
          * Window Events
          * **********************************************************************************************/
diff --git a/src/renderer/index.js b/src/renderer/index.js
index e851ff1b..7ac6898b 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -231,6 +231,7 @@ const app = new Vue({
             loadingState: 0, // 0 loading, 1 loaded, 2 error
             id: ""
         },
+        webremoteurl : "",
         webremoteqr: "",
         mxmtoken: "",
         mkIsReady: false,
@@ -3298,6 +3299,7 @@ const app = new Vue({
         },
         async showWebRemoteQR(){
            this.webremoteqr = await ipcRenderer.invoke('setRemoteQR','')
+           this.webremoteurl =  await ipcRenderer.invoke('setRemoteURL','')
            this.modals.qrcode = true;
         }
 
diff --git a/src/renderer/views/components/qrcode-modal.ejs b/src/renderer/views/components/qrcode-modal.ejs
index 84d366fa..efd4bd38 100644
--- a/src/renderer/views/components/qrcode-modal.ejs
+++ b/src/renderer/views/components/qrcode-modal.ejs
@@ -2,7 +2,7 @@
     <div class="modal-fullscreen spatialproperties-panel">
         <div class="modal-window" >
             <div class="modal-header">
-                <div class="modal-title">Web Remote QR</div>
+                <div class="modal-title">{{`Web Remote QR : ` + url }}</div>
                 <button class="close-btn" @click="close()"></button>
             </div>
             <div class="modal-content">
@@ -21,7 +21,7 @@
               
             }
         },
-        props: ["src"],
+        props: ["src","url"],
         mounted() {
          
         },
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 36498b22..cb13e468 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -610,7 +610,7 @@
         <spatial-properties v-if="modals.spatialProperties"></spatial-properties>
     </transition>
     <transition name="modal">
-        <qrcode-modal v-if="modals.qrcode" :src="webremoteqr"></qrcode-modal>
+        <qrcode-modal v-if="modals.qrcode" :src="webremoteqr" :url="webremoteurl"></qrcode-modal>
     </transition>
     <div id="apple-music-video-container">
         <div id="apple-music-video-player-controls">