Add version number in settings

RuurdBijlsma · Nov 12, 2023 · d6c4008 · d6c4008
1 parent c129a32
commit d6c4008
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ruurd-music",
-    "version": "6.5.0",
+    "version": "6.5.1",
     "description": "A streaming music player",
     "main": "./out/main/index.js",
     "keywords": [

diff --git a/src/main/NodeFunctions.ts b/src/main/NodeFunctions.ts
@@ -527,4 +527,8 @@ export default class NodeFunctions {
             return false;
         }
     }
+
+    getAppVersion(){
+        return app.getVersion();
+    }
 }
diff --git a/src/main/ipcFunctions.ts b/src/main/ipcFunctions.ts
@@ -68,6 +68,7 @@ export function handleIpc(ipcMain: Electron.IpcMain, win: BrowserWindow) {
     ipcMain.handle("getFileContents", (_, file: string) =>
         nf.getFileContents(file),
     );
+    ipcMain.handle("getAppVersion", (_) => nf.getAppVersion());
 
     ipcMain.handle(
         "firstLogin",

diff --git a/src/preload/index.d.ts b/src/preload/index.d.ts
@@ -24,7 +24,8 @@ declare global {
             updateYtdlp: () => Promise<string>,
             checkTracksDownloaded: (filenames: string[]) => Promise<boolean>,
             saveStringToFile: (file: string, contents: string) => Promise<boolean>,
-            getFileContents: (file: string) => Promise<string|null>,
+            getFileContents: (file: string) => Promise<string | null>,
+            getAppVersion: () => Promise<string>,
 
             fileSize: (file: string) => Promise<number>,
             checkFileExists: (filename: string) => Promise<any>,

diff --git a/src/preload/index.ts b/src/preload/index.ts
@@ -1,5 +1,4 @@
 import { contextBridge, ipcRenderer } from "electron";
-import { electronAPI } from "@electron-toolkit/preload";
 
 // Custom APIs for renderer
 const api = {
@@ -58,6 +57,7 @@ const api = {
         secret: string;
     }) => ipcRenderer.invoke("firstLogin", spotifyAuth),
     resetSpotifyLogin: () => ipcRenderer.invoke("resetSpotifyLogin"),
+    getAppVersion: () => ipcRenderer.invoke("getAppVersion"),
 
     minimizeWindow: () => ipcRenderer.send("win:invoke", "min"),
     toggleMaximize: () => ipcRenderer.send("win:invoke", "max"),
@@ -100,7 +100,6 @@ ipcRenderer.on(
 
 if (process.contextIsolated) {
     try {
-        contextBridge.exposeInMainWorld("electron", electronAPI);
         contextBridge.exposeInMainWorld("api", api);
         contextBridge.exposeInMainWorld("events", events);
     } catch (error) {

diff --git a/src/renderer/src/views/Settings.vue b/src/renderer/src/views/Settings.vue
@@ -170,6 +170,10 @@
         >
             {{ updateResult }}
         </v-sheet>
+
+        <div class="version-string mt-10">
+            <span class="mr-2">Ruurd Music</span><span class="bold-version">v{{ appVersion }}</span>
+        </div>
     </div>
 </template>
 
@@ -187,6 +191,8 @@ const platform = usePlatformStore();
 const base = useBaseStore();
 const ruurdAuth = useRuurdAuthStore();
 const ui = useUIStore();
+const appVersion = ref("");
+window.api.getAppVersion().then((r) => (appVersion.value = r));
 
 const updateLoading = ref(false);
 const updateResult = ref("");
@@ -292,4 +298,15 @@ h5 {
 .file-buttons > * {
     flex-grow: 1;
 }
+
+.version-string {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    opacity: 0.6;
+    font-weight: 300;
+}
+.bold-version{
+    font-weight: 500;
+}
 </style>