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

Lint + ES6

Browse Source
This commit is contained in:
Liyas Thomas
2020-10-21 12:20:32 +05:30
parent 774853af7a
commit f49c2138de
25 changed files with 263 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/collections/add-folder.vue
View File

@@ -45,6 +45,7 @@
<script>
import { fb } from "~/helpers/fb"
import closeIcon from "~/static/icons/close-24px.svg?inline"
export default {
components: {
closeIcon,
@@ -60,6 +61,13 @@ export default {
}
},
methods: {
syncCollections() {
if (fb.currentUser !== null) {
if (fb.currentSettings[0].value) {
fb.writeCollections(JSON.parse(JSON.stringify(this.$store.state.postwoman.collections)))
}
}
},
addFolder() {
this.$store.commit("postwoman/addFolder", {
name: this.$data.name,
@@ -68,13 +76,6 @@ export default {
this.hideModal()
this.syncCollections()
},
syncCollections() {
if (fb.currentUser !== null) {
if (fb.currentSettings[0].value) {
fb.writeCollections(JSON.parse(JSON.stringify(this.$store.state.postwoman.collections)))
}
}
},
hideModal() {
this.$emit("hide-modal")
},

41
components/collections/collection.vue
View File

@@ -1,12 +1,13 @@
<template>
<div>
<div :class="['row-wrapper', dragging ? 'drop-zone':'' ]"
@dragover.prevent
@drop.prevent="dropEvent"
@dragover="dragging=true"
@drop="dragging=false"
@dragleave="dragging=false"
@dragend="dragging=false"
<div
:class="['row-wrapper', dragging ? 'drop-zone' : '']"
@dragover.prevent
@drop.prevent="dropEvent"
@dragover="dragging = true"
@drop="dragging = false"
@dragleave="dragging = false"
@dragend="dragging = false"
>
<button class="icon" @click="toggleShowChildren">
<i class="material-icons" v-show="!showChildren && !isFiltered">arrow_right</i>
@@ -29,7 +30,11 @@
</button>
<template slot="popover">
<div>
<button class="icon" @click="$emit('add-folder', {folder: collection})" v-close-popover>
<button
class="icon"
@click="$emit('add-folder', { folder: collection })"
v-close-popover
>
<i class="material-icons">create_new_folder</i>
<span>{{ $t("new_folder") }}</span>
</button>
@@ -135,20 +140,20 @@ export default {
})
this.syncCollections()
},
dropEvent(event) {
this.dragging = !this.dragging;
const oldCollectionIndex = event.dataTransfer.getData('oldCollectionIndex');
const oldFolderIndex = event.dataTransfer.getData('oldFolderIndex');
const oldFolderName = event.dataTransfer.getData('oldFolderName');
const requestIndex = event.dataTransfer.getData('requestIndex');
dropEvent({ dataTransfer }) {
this.dragging = !this.dragging
const oldCollectionIndex = dataTransfer.getData("oldCollectionIndex")
const oldFolderIndex = dataTransfer.getData("oldFolderIndex")
const oldFolderName = dataTransfer.getData("oldFolderName")
const requestIndex = dataTransfer.getData("requestIndex")
this.$store.commit("postwoman/moveRequest", {
oldCollectionIndex: oldCollectionIndex,
oldCollectionIndex,
newCollectionIndex: this.$props.collectionIndex,
newFolderIndex: -1,
newFolderName: this.$props.collection.name,
oldFolderIndex: oldFolderIndex,
oldFolderName: oldFolderName,
requestIndex: requestIndex
oldFolderIndex,
oldFolderName,
requestIndex,
})
this.syncCollections()
},

42
components/collections/folder.vue
View File

@@ -1,13 +1,13 @@
<template>
<div>
<div
:class="['row-wrapper', dragging ? 'drop-zone':'' ]"
:class="['row-wrapper', dragging ? 'drop-zone' : '']"
@dragover.prevent
@drop.prevent="dropEvent"
@dragover="dragging=true"
@drop="dragging=false"
@dragleave="dragging=false"
@dragend="dragging=false"
@dragover="dragging = true"
@drop="dragging = false"
@dragleave="dragging = false"
@dragend="dragging = false"
>
<div>
<button class="icon" @click="toggleShowChildren">
@@ -29,7 +29,11 @@
</button>
</div>
<div>
<button class="icon" @click="$emit('edit-folder', { folder, folderIndex, collectionIndex })" v-close-popover>
<button
class="icon"
@click="$emit('edit-folder', { folder, folderIndex, collectionIndex })"
v-close-popover
>
<i class="material-icons">edit</i>
<span>{{ $t("edit") }}</span>
</button>
@@ -63,7 +67,7 @@
</li>
</ul>
<ul v-if="folder.folders && folder.folders.length" class="flex-col">
<li v-for="(subFolder, subFolderIndex) in folder.folders" :key="subFolder.name" >
<li v-for="(subFolder, subFolderIndex) in folder.folders" :key="subFolder.name">
<folder
:folder="subFolder"
:folder-index="subFolderIndex"
@@ -115,31 +119,31 @@ export default {
this.$store.commit("postwoman/removeFolder", {
collectionIndex: this.$props.collectionIndex,
folderName: this.$props.folder.name,
folderIndex: this.$props.folderIndex
folderIndex: this.$props.folderIndex,
})
this.syncCollections()
this.$toast.error(this.$t("deleted"), {
icon: "delete",
})
},
dropEvent(event) {
this.dragging = !this.dragging;
const oldCollectionIndex = event.dataTransfer.getData('oldCollectionIndex');
const oldFolderIndex = event.dataTransfer.getData('oldFolderIndex');
const oldFolderName = event.dataTransfer.getData('oldFolderName');
const requestIndex = event.dataTransfer.getData('requestIndex');
dropEvent({ dataTransfer }) {
this.dragging = !this.dragging
const oldCollectionIndex = dataTransfer.getData("oldCollectionIndex")
const oldFolderIndex = dataTransfer.getData("oldFolderIndex")
const oldFolderName = dataTransfer.getData("oldFolderName")
const requestIndex = dataTransfer.getData("requestIndex")
this.$store.commit("postwoman/moveRequest", {
oldCollectionIndex: oldCollectionIndex,
oldCollectionIndex,
newCollectionIndex: this.$props.collectionIndex,
newFolderIndex: this.$props.folderIndex,
newFolderName: this.$props.folder.name,
oldFolderIndex: oldFolderIndex,
oldFolderName: oldFolderName,
requestIndex: requestIndex
oldFolderIndex,
oldFolderName,
requestIndex,
})
this.syncCollections()
},
}
},
}
</script>

35
components/collections/import-export-collections.vue
View File

@@ -108,8 +108,8 @@ export default {
},
replaceWithJSON() {
let reader = new FileReader()
reader.onload = (event) => {
let content = event.target.result
reader.onload = ({ target }) => {
let content = target.result
let collections = JSON.parse(content)
if (collections[0]) {
let [name, folders, requests] = Object.keys(collections[0])
@@ -130,8 +130,8 @@ export default {
},
importFromJSON() {
let reader = new FileReader()
reader.onload = (event) => {
let content = event.target.result
reader.onload = ({ target }) => {
let content = target.result
let collections = JSON.parse(content)
if (collections[0]) {
let [name, folders, requests] = Object.keys(collections[0])
@@ -191,24 +191,23 @@ export default {
icon: "error",
})
},
parsePostmanCollection(collection) {
let postwomanCollection =
{
name: "",
folders: [],
requests: [],
}
parsePostmanCollection({ info, name, item }) {
let postwomanCollection = {
name: "",
folders: [],
requests: [],
}
postwomanCollection.name = collection.info ? collection.info.name : collection.name
postwomanCollection.name = info ? info.name : name
if (collection.item && collection.item.length > 0) {
for (let collectionItem of collection.item) {
if (item && item.length > 0) {
for (let collectionItem of item) {
if (collectionItem.request) {
if (postwomanCollection.hasOwnProperty('folders')) {
postwomanCollection.name = collection.info ? collection.info.name : collection.name
if (postwomanCollection.hasOwnProperty("folders")) {
postwomanCollection.name = info ? info.name : name
postwomanCollection.requests.push(this.parsePostmanRequest(collectionItem))
} else {
postwomanCollection.name = collection.name ? collection.name : ""
postwomanCollection.name = name ? name : ""
postwomanCollection.requests.push(this.parsePostmanRequest(collectionItem))
}
} else if (this.hasFolder(collectionItem)) {
@@ -295,7 +294,7 @@ export default {
return pwRequest
},
hasFolder(item) {
return item.hasOwnProperty('item')
return item.hasOwnProperty("item")
},
},
}

2
components/collections/index.vue
View File

@@ -119,7 +119,7 @@ export default {
editingCollection: undefined,
editingCollectionIndex: undefined,
editingFolder: undefined,
editingFolderName:undefined,
editingFolderName: undefined,
editingFolderIndex: undefined,
editingRequest: undefined,
editingRequestIndex: undefined,

34
components/collections/request.vue
View File

@@ -4,8 +4,8 @@
draggable="true"
@dragstart="dragStart"
@dragover.stop
@dragleave="dragging=false"
@dragend="dragging=false"
@dragleave="dragging = false"
@dragend="dragging = false"
>
<div>
<button
@@ -23,11 +23,19 @@
</button>
<template slot="popover">
<div>
<button class="icon" @click="$emit('edit-request',{ collectionIndex,
folderIndex,
folderName,
request,
requestIndex } )" v-close-popover>
<button
class="icon"
@click="
$emit('edit-request', {
collectionIndex,
folderIndex,
folderName,
request,
requestIndex,
})
"
v-close-popover
>
<i class="material-icons">edit</i>
<span>{{ $t("edit") }}</span>
</button>
@@ -73,12 +81,12 @@ export default {
selectRequest() {
this.$store.commit("postwoman/selectRequest", { request: this.request })
},
dragStart(event) {
this.dragging = !this.dragging;
event.dataTransfer.setData('oldCollectionIndex', this.$props.collectionIndex);
event.dataTransfer.setData('oldFolderIndex', this.$props.folderIndex)
event.dataTransfer.setData('oldFolderName', this.$props.folderName);
event.dataTransfer.setData('requestIndex', this.$props.requestIndex);
dragStart({ dataTransfer }) {
this.dragging = !this.dragging
dataTransfer.setData("oldCollectionIndex", this.$props.collectionIndex)
dataTransfer.setData("oldFolderIndex", this.$props.folderIndex)
dataTransfer.setData("oldFolderName", this.$props.folderName)
dataTransfer.setData("requestIndex", this.$props.requestIndex)
},
removeRequest() {
if (!confirm(this.$t("are_you_sure_remove_request"))) return

19
components/collections/save-request-as.vue
View File

@@ -108,13 +108,13 @@ export default {
"requestData.folderName": function resetRequestIndex() {
this.$data.requestData.requestIndex = undefined
},
editingRequest(request) {
this.defaultRequestName = request.label || "My Request"
editingRequest({ label }) {
this.defaultRequestName = label || "My Request"
},
},
computed: {
folders() {
const collections = this.$store.state.postwoman.collections
const collections = this.$store.state.postwoman.collections
const collectionIndex = this.$data.requestData.collectionIndex
const userSelectedAnyCollection = collectionIndex !== undefined
if (!userSelectedAnyCollection) return []
@@ -134,7 +134,7 @@ export default {
return []
}
const userSelectedAnyFolder = folderName !== undefined && folderName !== ''
const userSelectedAnyFolder = folderName !== undefined && folderName !== ""
if (userSelectedAnyFolder) {
const collection = collections[collectionIndex]
@@ -144,7 +144,7 @@ export default {
const collection = collections[collectionIndex]
const noCollectionAvailable = collection !== undefined
if (!noCollectionAvailable){
if (!noCollectionAvailable) {
return []
}
@@ -194,7 +194,7 @@ export default {
function getFolderNames(folders, namesList) {
if (folders.length) {
folders.forEach(folder => {
folders.forEach((folder) => {
namesList.push(folder.name)
if (folder.folders && folder.folders.length) {
getFolderNames(folder.folders, namesList)
@@ -205,14 +205,15 @@ function getFolderNames(folders, namesList) {
}
function findFolder(folderName, currentFolder) {
let selectedFolder, result;
let selectedFolder
let result
if (folderName === currentFolder.name){
if (folderName === currentFolder.name) {
return currentFolder
}
for (let i = 0; i < currentFolder.folders.length; i++) {
selectedFolder = currentFolder.folders[i];
selectedFolder = currentFolder.folders[i]
result = findFolder(folderName, selectedFolder)