From b3daaaa633ee00c01fcf6ba4737916133356f5c6 Mon Sep 17 00:00:00 2001
From: PandaDEV <70103896+0PandaDEV@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:43:35 +1000
Subject: [PATCH] fix: back button not wroking on settings

---
 assets/css/settings.scss |  1 +
 pages/settings.vue       | 58 ++++++++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/assets/css/settings.scss b/assets/css/settings.scss
index c3ad9d4..c7d829a 100644
--- a/assets/css/settings.scss
+++ b/assets/css/settings.scss
@@ -43,6 +43,7 @@ $mutedtext: #78756F;
   justify-content: center;
   height: 100vh;
   gap: 6px;
+  z-index: -1;
 
   .title {
     font-size: 20px;
diff --git a/pages/settings.vue b/pages/settings.vue
index 6fd6417..dbf51c4 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="bg">
-    <div class="back">
-      <img @click="router.push('/')" src="../public/back_arrow.svg" />
+    <NuxtLink to="/" class="back">
+      <img src="../public/back_arrow.svg" />
       <p>Back</p>
-    </div>
+    </NuxtLink>
     <div class="bottom-bar">
       <div class="left">
         <img alt="" class="logo" src="../public/logo.png" width="18px" />
@@ -154,29 +154,41 @@ const saveKeybind = async () => {
 onMounted(() => {
   os.value = platform();
 
-  keyboard.down("all", (event) => {
-    const isMacSaveCombo =
-      os.value === "macos" &&
-      (event.code === "MetaLeft" || event.code === "MetaRight") &&
-      event.key === "Enter";
-
-    const isOtherOsSaveCombo =
-      os.value !== "macos" &&
-      (event.code === "ControlLeft" || event.code === "ControlRight") &&
-      event.key === "Enter";
-
-    if (
-      (isMacSaveCombo || isOtherOsSaveCombo) &&
-      !isKeybindInputFocused.value
-    ) {
-      event.preventDefault();
-      saveKeybind();
+  keyboard.down("MetaLeft+Enter", (event) => {
+    if (os.value === "macos" && !isKeybindInputFocused.value) {
+      console.log("Save on macOS")
+      event.preventDefault()
+      saveKeybind()
     }
-  });
+  })
+
+  keyboard.down("MetaRight+Enter", (event) => {
+    if (os.value === "macos" && !isKeybindInputFocused.value) {
+      console.log("Save on macOS")
+      event.preventDefault()
+      saveKeybind()
+    }
+  })
+
+  keyboard.down("ControlLeft+Enter", (event) => {
+    if (os.value !== "macos" && !isKeybindInputFocused.value) {
+      console.log("Save on other OS")
+      event.preventDefault()
+      saveKeybind()
+    }
+  })
+
+  keyboard.down("ControlRight+Enter", (event) => {
+    if (os.value !== "macos" && !isKeybindInputFocused.value) {
+      console.log("Save on other OS")
+      event.preventDefault()
+      saveKeybind()
+    }
+  })
 
   keyboard.down("Escape", (event) => {
-    const now = Date.now();
-    if (!isKeybindInputFocused.value && now - lastBlurTime.value > 100) {
+    console.log("Escape");
+    if (!isKeybindInputFocused.value) {
       event.preventDefault();
       router.push("/");
     }