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

Merge pull request #2 from liyasthomas/master

Browse Source 
Update with master
This commit is contained in:
Leonardo Matos
2020-03-20 15:31:31 -03:00
committed by GitHub
parent b0c327854c b14adc29f5
commit 86ee80f607
6 changed files with 3439 additions and 1909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/collections/addCollection.vue
View File

@@ -67,7 +67,7 @@ export default {
},
addNewCollection() {
if (!this.$data.name) {
this.$toast.info($t("invalid_collection_name"))
this.$toast.info(this.$t("invalid_collection_name"))
return
}
this.$store.commit("postwoman/addNewCollection", {

2
components/collections/editCollection.vue
View File

@@ -60,7 +60,7 @@ export default {
methods: {
saveCollection() {
if (!this.$data.name) {
this.$toast.info($t("invalid_collection_name"))
this.$toast.info(this.$t("invalid_collection_name"))
return
}
const collectionUpdated = {

5288
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
package.json
View File

@@ -38,28 +38,28 @@
"@nuxtjs/sitemap": "^2.0.1",
"@nuxtjs/toast": "^3.3.0",
"ace-builds": "^1.4.8",
"firebase": "^7.11.0",
"firebase": "^7.12.0",
"graphql": "^14.6.0",
"graphql-language-service-interface": "^2.3.3",
"nuxt": "^2.11.0",
"nuxt-i18n": "^6.6.0",
"nuxt": "^2.12.0",
"nuxt-i18n": "^6.6.1",
"paho-mqtt": "^1.1.0",
"socket.io-client": "^2.3.0",
"v-tooltip": "^2.0.3",
"vue-virtual-scroll-list": "^1.4.6",
"vuefire": "^2.2.1",
"vuefire": "^2.2.2",
"vuejs-auto-complete": "^0.9.0",
"vuex-persist": "^2.2.0",
"yargs-parser": "^18.1.1"
},
"devDependencies": {
"cypress": "^4.1.0",
"cypress": "^4.2.0",
"husky": "^4.2.3",
"lint-staged": "^10.0.8",
"node-sass": "^4.13.1",
"prettier": "^1.19.1",
"pretty-quick": "^2.0.1",
"sass-loader": "^8.0.2",
"start-server-and-test": "^1.10.10"
"start-server-and-test": "^1.10.11"
}
}

38
pages/index.vue
View File

@@ -1435,23 +1435,21 @@ export default {
canListParameters(canToggleRaw) {
this.rawInput = !canToggleRaw
},
contentType(contentType) {
switch (contentType) {
case "application/json":
case "application/hal+json":
if (!(this.rawParams.charAt(0) in ['"', "{", "["])) {
this.rawParams = "{}"
}
break
case "application/xml":
if (this.rawParams.charAt(0) !== "<" || this.rawParams === "<!doctype html>") {
this.rawParams = "<?xml version='1.0' encoding='utf-8'?>"
}
break
case "text/html":
if (this.rawParams.charAt(0) !== "<" || this.rawParams.startsWith("<?xml")) {
this.rawParams = "<!doctype html>"
}
contentType(contentType, oldContentType) {
const getDefaultParams = contentType => {
switch (contentType) {
case "application/json":
case "application/hal+json":
return "{}"
case "application/xml":
return "<?xml version='1.0' encoding='utf-8'?>"
case "text/html":
return "<!doctype html>"
}
return ""
}
if (!this.rawParams || this.rawParams === getDefaultParams(oldContentType)) {
this.rawParams = getDefaultParams(contentType)
}
this.setRouteQueryState()
},
@@ -1546,7 +1544,11 @@ export default {
"text/plain",
],
canListParameters() {
return this.contentType === "application/x-www-form-urlencoded"
return [
"application/json",
"application/hal+json",
"application/x-www-form-urlencoded",
].includes(this.contentType)
},
uri: {
get() {

6
store/postwoman.js
View File

@@ -218,10 +218,8 @@ export const mutations = {
},
editCollection({ collections }, payload) {
const {
collection: { name },
collectionIndex,
} = payload
const { collection, collectionIndex } = payload
const { name } = collection
const duplicateCollection = collections.some(
item => item.name.toLowerCase() === name.toLowerCase()
)