Merge pull request #160 from Lazap-Development/nightly

Carry Changes to main branch
Lazap-Development · Jul 23, 2024 · ec016aa · ec016aa
2 parents 8288577 + 5968754
commit ec016aa
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 35 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 *.html linguist-detectable=false
-*.js linguist-detectable=false
+*.js linguist-detectable=false
+*.vue linguist-detectable=false
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -8,6 +8,11 @@
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/src/js/main.js"></script>
+    <script type="module">
+      import { createApp } from "vue";
+      import App from "./src/App.vue";
+
+      createApp(App).mount("#app");
+    </script>
   </body>
 </html>
diff --git a/public/external.html → overlay.html b/public/external.html → overlay.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -7,7 +7,12 @@
     <title>Lazap</title>
   </head>
   <body>
-    <div id="external"></div>
-    <script type="module" src="/src/js/main.js"></script>
+    <div id="app"></div>
+    <script type="module">
+      import { createApp } from "vue";
+      import App from "./src/AppOverlay.vue";
+
+      createApp(App).mount("#app");
+    </script>
   </body>
 </html>
diff --git a/public/overlay.html b/public/overlay.html
diff --git a/src-tauri/src/launchers/mod.rs b/src-tauri/src/launchers/mod.rs
@@ -194,11 +194,9 @@ pub async fn handle_launch(data: GameObject) -> Result<(), crate::Error> {
                 .wait()?;
         }
         _ => {
-            let command = format!(
-                "powershell start \"{}\\{}\"",
-                data.location, data.executable
-            );
+            let command = format!("powershell start \"{}\"", data.executable);
             Command::new("cmd")
+                .current_dir(data.location)
                 .args(&["/C", &command])
                 .spawn()?
                 .wait()?;

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -155,7 +155,6 @@
         "center": false,
         "visible": false,
         "decorations": false,
-        "url": "external.html",
         "focus": false
       },
       {
@@ -170,8 +169,8 @@
         "decorations": false,
         "focus": true,
         "alwaysOnTop": true,
-        "url": "overlay.html",
-        "skipTaskbar": true
+        "skipTaskbar": true,
+        "url": "overlay.html"
       }
     ]
   }

diff --git a/src/components/find-games.vue b/src/components/find-games.vue
@@ -8,7 +8,6 @@ import image from "../assets/img/default-game-banner.png";
 let isTyping = false;
 const typeSpeed = 50;
 
-// Classes
 class GameElement {
   constructor(data, listID, jsondata, settings, bannerdirarr) {
     this.data = data;

diff --git a/src/js/main.js b/src/js/main.js
diff --git a/src/js/overlay.js b/src/js/overlay.js