diff --git a/frontend/src/components/Search.vue b/frontend/src/components/Search.vue
index 6b498218..2c67bf80 100644
--- a/frontend/src/components/Search.vue
+++ b/frontend/src/components/Search.vue
@@ -90,10 +90,10 @@ export default {
};
},
watch: {
- show(val, old) {
- this.active = val === "search";
+ currentPrompt(val, old) {
+ this.active = val.prompt === "search";
- if (old === "search" && !this.active) {
+ if (old.prompt === "search" && !this.active) {
if (this.reload) {
this.setReload(true);
}
@@ -116,8 +116,8 @@ export default {
},
},
computed: {
- ...mapState(["user", "show"]),
- ...mapGetters(["isListing"]),
+ ...mapState(["user"]),
+ ...mapGetters(["isListing", "currentPrompt"]),
boxes() {
return boxes;
},
diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 4394f55a..5dd6d2d6 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -133,9 +133,9 @@ export default {
},
computed: {
...mapState(["user"]),
- ...mapGetters(["isLogged"]),
+ ...mapGetters(["isLogged", "currentPrompt"]),
active() {
- return this.$store.state.show === "sidebar";
+ return this.currentPrompt.prompt === "sidebar";
},
signup: () => signup,
version: () => version,
diff --git a/frontend/src/components/header/HeaderBar.vue b/frontend/src/components/header/HeaderBar.vue
index cc9dfeec..78567d88 100644
--- a/frontend/src/components/header/HeaderBar.vue
+++ b/frontend/src/components/header/HeaderBar.vue
@@ -11,7 +11,7 @@
-
+
@@ -25,7 +25,7 @@
@@ -35,6 +35,7 @@
import { logoURL } from "@/utils/constants";
import Action from "@/components/header/Action";
+import { mapGetters } from "vuex";
export default {
name: "header-bar",
@@ -52,6 +53,9 @@ export default {
this.$store.commit("showHover", "sidebar");
},
},
+ computed: {
+ ...mapGetters(["currentPrompt"]),
+ }
};
diff --git a/frontend/src/components/prompts/Delete.vue b/frontend/src/components/prompts/Delete.vue
index 0540b1d8..8e319846 100644
--- a/frontend/src/components/prompts/Delete.vue
+++ b/frontend/src/components/prompts/Delete.vue
@@ -37,8 +37,8 @@ import buttons from "@/utils/buttons";
export default {
name: "delete",
computed: {
- ...mapGetters(["isListing", "selectedCount"]),
- ...mapState(["req", "selected", "showConfirm"]),
+ ...mapGetters(["isListing", "selectedCount", "currentPrompt"]),
+ ...mapState(["req", "selected"]),
},
methods: {
...mapMutations(["closeHovers"]),
@@ -50,7 +50,7 @@ export default {
await api.remove(this.$route.path);
buttons.success("delete");
- this.showConfirm();
+ this.currentPrompt?.confirm();
this.closeHovers();
return;
}
diff --git a/frontend/src/components/prompts/Download.vue b/frontend/src/components/prompts/Download.vue
index 8c5a570d..1c6e63b1 100644
--- a/frontend/src/components/prompts/Download.vue
+++ b/frontend/src/components/prompts/Download.vue
@@ -11,7 +11,7 @@
v-for="(ext, format) in formats"
:key="format"
class="button button--block"
- @click="showConfirm(format)"
+ @click="currentPrompt.confirm(format)"
v-focus
>
{{ ext }}
@@ -21,7 +21,7 @@
diff --git a/frontend/src/components/prompts/Move.vue b/frontend/src/components/prompts/Move.vue
index 9fac0eb8..f89e4899 100644
--- a/frontend/src/components/prompts/Move.vue
+++ b/frontend/src/components/prompts/Move.vue
@@ -9,6 +9,17 @@
+
+
+