Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: back button not wroking on settings
  • Loading branch information
0PandaDEV committed Jan 1, 2025
commit b3daaaa633ee00c01fcf6ba4737916133356f5c6
1 change: 1 addition & 0 deletions assets/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ $mutedtext: #78756F;
justify-content: center;
height: 100vh;
gap: 6px;
z-index: -1;

.title {
font-size: 20px;
Expand Down
58 changes: 35 additions & 23 deletions pages/settings.vue
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down Expand Up @@ -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("/");
}
Expand Down