btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge branch 'master' of https://github.com/liyasthomas/postwoman

Browse Source
This commit is contained in:
Liyas Thomas
2020-02-04 07:06:41 +05:30
parent 06d58547c8 173e3a3fc0
commit c43a864480
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
layouts/default.vue
View File

@@ -566,19 +566,19 @@
<div slot="body"> <div slot="body">
<div> <div>
<label>{{ $t("send_request") }}</label> <label>{{ $t("send_request") }}</label>
<kbd>⌘ G</kbd> <kbd>{{ getSpecialKey() }} G</kbd>
</div> </div>
<div> <div>
<label>{{ $t("save_to_collections") }}</label> <label>{{ $t("save_to_collections") }}</label>
<kbd>⌘ S</kbd> <kbd>{{ getSpecialKey() }} S</kbd>
</div> </div>
<div> <div>
<label>{{ $t("copy_request_link") }}</label> <label>{{ $t("copy_request_link") }}</label>
<kbd>⌘ K</kbd> <kbd>{{ getSpecialKey() }} K</kbd>
</div> </div>
<div> <div>
<label>{{ $t("reset_request") }}</label> <label>{{ $t("reset_request") }}</label>
<kbd>⌘ L</kbd> <kbd>{{ getSpecialKey() }} L</kbd>
</div> </div>
</div> </div>
<div slot="footer"></div> <div slot="footer"></div>
@@ -677,6 +677,9 @@ export default {
}, },
methods: { methods: {
getSpecialKey() {
return (/(Mac|iPhone|iPod|iPad)/i.test(navigator.platform)) ? "⌘" : "Ctrl";
},
linkActive(path) { linkActive(path) {
return { return {
"nuxt-link-exact-active": this.$route.path === path, "nuxt-link-exact-active": this.$route.path === path,

4
store/postwoman.js
View File

@@ -112,7 +112,7 @@ export const mutations = {
addNewCollection({ collections }, collection) { addNewCollection({ collections }, collection) {
const { name } = collection; const { name } = collection;
const duplicateCollection = collections.some(item => item.name === name); const duplicateCollection = collections.some(item => item.name.toLowerCase() === name.toLowerCase());
if (duplicateCollection) { if (duplicateCollection) {
this.$toast.info("Duplicate collection"); this.$toast.info("Duplicate collection");
return; return;
@@ -133,7 +133,7 @@ export const mutations = {
editCollection({ collections }, payload) { editCollection({ collections }, payload) {
const { collection, collectionIndex } = payload; const { collection, collectionIndex } = payload;
const { name } = collection; const { name } = collection;
const duplicateCollection = collections.some(item => item.name === name); const duplicateCollection = collections.some(item => item.name.toLowerCase() === name.toLowerCase());
if (duplicateCollection) { if (duplicateCollection) {
this.$toast.info("Duplicate collection"); this.$toast.info("Duplicate collection");
return; return;