From 5f1326be8081b251cb256a78315f78827e6331e5 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 01:37:42 -0800
Subject: [PATCH] re-did version string in about using vue, fixed window not
 launching on yarn start under win10

---
 src/i18n/en_US.jsonc               | 2 +-
 src/main/base/browserwindow.ts     | 3 +--
 src/main/index.ts                  | 4 ++--
 src/renderer/index.js              | 7 +------
 src/renderer/views/pages/about.ejs | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index b5bb9035..220a3352 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -146,7 +146,7 @@
   "term.recordLabels": "Record Labels",
   "term.videoExtras": "Video Extras",
   "term.top": "Top",
-  
+  "term.version": "Version",
   // Home
   "home.title": "Home",
   "home.recentlyPlayed": "Recently Played",
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 0e0eba23..4293e4fc 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -602,8 +602,7 @@ export class BrowserWindow {
         })
 
         ipcMain.on('get-version', (_event) => {
-            app.getVersion()
-            BrowserWindow.win.webContents.send('version', app.getVersion());
+            _event.returnValue = app.getVersion()
         });
 
         /* *********************************************************************************************
diff --git a/src/main/index.ts b/src/main/index.ts
index 7c7a085c..8defcc3e 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -47,11 +47,11 @@ app.on('ready', () => {
         const win = await bw.createWindow()
 
         console.log('[Cider][Widevine] Status:', components.status());
-
+        win.show();
         win.on("ready-to-show", () => {
             Cider.bwCreated();
             CiderPlug.callPlugins('onReady', win);
-            win.show();
+
         });
     });
 
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 4615166d..ae90a48e 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -54,6 +54,7 @@ const app = new Vue({
     el: "#app",
     store: store,
     data: {
+        version: ipcRenderer.sendSync("get-version"),
         appMode: "player",
         ipcRenderer: ipcRenderer,
         cfg: ipcRenderer.sendSync("getStore"),
@@ -3652,12 +3653,6 @@ const app = new Vue({
                 if (sellang.startsWith("en") && this.mk.storefrontId != "en-us") sellang = "en-gb"
                 return await sellang
             }          
-        },
-        getVersion() {
-            ipcRenderer.send('get-version')
-            ipcRenderer.on('version', (event, version) => {
-                document.getElementById('version').innerHTML = `Version ${version}`
-            })
         }
     }
 })
diff --git a/src/renderer/views/pages/about.ejs b/src/renderer/views/pages/about.ejs
index 55d60540..dfbd4c91 100644
--- a/src/renderer/views/pages/about.ejs
+++ b/src/renderer/views/pages/about.ejs
@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col">
                 <img src="assets/banner.png" alt="Cider Logo" style="display:block;margin:0 auto;width: 500px;">
-                <p style="text-align: center" id="version">Version Unkown</p>
+                <p style="text-align: center" id="version">{{ $root.getLz("term.version") }} {{ $root.version }}</p>
                 <p style="text-align: center"> {{$root.getLz('about.thanks')}} </p>
 
                 <p style="text-align: center">"{{$root.getLz('term.appleMusic')}}" - {{$root.getLz('term.copyright')}} © 2022 <a href="https://www.apple.com/" class="dt-footer__link"