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

Merge branch 'main' into issue-1507

Browse Source
This commit is contained in:
Andrew Bastin
2021-05-04 22:44:11 -04:00
committed by GitHub
parent 63998f4a23 5c0035f4c3
commit aa65cada6f
7 changed files with 109 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -548,6 +548,16 @@ Become a financial contributor and help us sustain our community [[Support](#sup
#### GitHub Sponsors #### GitHub Sponsors
<p align="center">
<a href="https://simplescraper.io/?utm_source=hs" target="_blank" rel="noopener">
<img
width="100"
src="https://raw.githubusercontent.com/hoppscotch/hoppscotch/main/assets/images/Simplescraper.png"
alt="Simplescraper"
/>
</a>
</p>
<p align="center"> <p align="center">
<a href="https://github.com/eldadfux" target="_blank" rel="noopener"> <a href="https://github.com/eldadfux" target="_blank" rel="noopener">
<img <img

BIN
assets/images/Simplescraper.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
assets/images/Simplescraper_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

9
components/app/Contributors.vue
View File

@@ -116,6 +116,15 @@
/> />
</a> </a>
</div> </div>
<div class="contributors">
<a href="https://simplescraper.io/?utm_source=hs" target="_blank" rel="noopener">
<img
style="max-height: 50px"
src="~assets/images/Simplescraper_dark.png"
alt="Simplescraper"
/>
</a>
</div>
<div class="contributors"> <div class="contributors">
<a href="https://tyk.io?ref=hoppscotch" target="_blank" rel="noopener"> <a href="https://tyk.io?ref=hoppscotch" target="_blank" rel="noopener">
<img <img

13
components/app/Footer.vue
View File

@@ -5,7 +5,6 @@
<a class="footer-link" href="https://www.netlify.com" target="_blank" rel="noopener"> <a class="footer-link" href="https://www.netlify.com" target="_blank" rel="noopener">
Powered by Netlify Powered by Netlify
</a> </a>
<span class="footer-link"> Sponsored by </span>
<span> <span>
<a <a
class="footer-link" class="footer-link"
@@ -15,9 +14,6 @@
> >
OSS Capital OSS Capital
</a> </a>
</span>
<span class="footer-link"> & </span>
<span>
<a <a
class="footer-link" class="footer-link"
href="https://paw.cloud/?utm_source=hoppscotch&utm_medium=website&utm_campaign=hoppscotch-sponsorship" href="https://paw.cloud/?utm_source=hoppscotch&utm_medium=website&utm_campaign=hoppscotch-sponsorship"
@@ -26,6 +22,14 @@
> >
Paw Paw
</a> </a>
<a
class="footer-link"
href="https://simplescraper.io/?utm_source=hs"
target="_blank"
rel="noopener"
>
Simplescraper
</a>
</span> </span>
<iframe <iframe
src="https://ghbtns.com/github-btn.html?user=hoppscotch&type=sponsor" src="https://ghbtns.com/github-btn.html?user=hoppscotch&type=sponsor"
@@ -70,6 +74,7 @@
@apply my-2; @apply my-2;
@apply mx-4; @apply mx-4;
@apply text-fgLightColor; @apply text-fgLightColor;
@apply text-sm;
&:hover { &:hover {
@apply text-fgColor; @apply text-fgColor;

133
package-lock.json generated
View File

@@ -18,19 +18,19 @@
"integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==" "integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ=="
}, },
"@babel/core": { "@babel/core": {
"version": "7.13.16", "version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.16.tgz", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz",
"integrity": "sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==", "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==",
"requires": { "requires": {
"@babel/code-frame": "^7.12.13", "@babel/code-frame": "^7.12.13",
"@babel/generator": "^7.13.16", "@babel/generator": "^7.14.0",
"@babel/helper-compilation-targets": "^7.13.16", "@babel/helper-compilation-targets": "^7.13.16",
"@babel/helper-module-transforms": "^7.13.14", "@babel/helper-module-transforms": "^7.14.0",
"@babel/helpers": "^7.13.16", "@babel/helpers": "^7.14.0",
"@babel/parser": "^7.13.16", "@babel/parser": "^7.14.0",
"@babel/template": "^7.12.13", "@babel/template": "^7.12.13",
"@babel/traverse": "^7.13.15", "@babel/traverse": "^7.14.0",
"@babel/types": "^7.13.16", "@babel/types": "^7.14.0",
"convert-source-map": "^1.7.0", "convert-source-map": "^1.7.0",
"debug": "^4.1.0", "debug": "^4.1.0",
"gensync": "^1.0.0-beta.2", "gensync": "^1.0.0-beta.2",
@@ -40,16 +40,16 @@
}, },
"dependencies": { "dependencies": {
"@babel/compat-data": { "@babel/compat-data": {
"version": "7.13.15", "version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz",
"integrity": "sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==" "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q=="
}, },
"@babel/generator": { "@babel/generator": {
"version": "7.13.16", "version": "7.14.1",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.16.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz",
"integrity": "sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==", "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==",
"requires": { "requires": {
"@babel/types": "^7.13.16", "@babel/types": "^7.14.1",
"jsesc": "^2.5.1", "jsesc": "^2.5.1",
"source-map": "^0.5.0" "source-map": "^0.5.0"
} }
@@ -65,32 +65,52 @@
"semver": "^6.3.0" "semver": "^6.3.0"
} }
}, },
"@babel/helper-module-transforms": {
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz",
"integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==",
"requires": {
"@babel/helper-module-imports": "^7.13.12",
"@babel/helper-replace-supers": "^7.13.12",
"@babel/helper-simple-access": "^7.13.12",
"@babel/helper-split-export-declaration": "^7.12.13",
"@babel/helper-validator-identifier": "^7.14.0",
"@babel/template": "^7.12.13",
"@babel/traverse": "^7.14.0",
"@babel/types": "^7.14.0"
}
},
"@babel/helper-validator-identifier": {
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
"integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="
},
"@babel/parser": { "@babel/parser": {
"version": "7.13.16", "version": "7.14.1",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.16.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz",
"integrity": "sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==" "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q=="
}, },
"@babel/traverse": { "@babel/traverse": {
"version": "7.13.17", "version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.17.tgz", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
"integrity": "sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==", "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
"requires": { "requires": {
"@babel/code-frame": "^7.12.13", "@babel/code-frame": "^7.12.13",
"@babel/generator": "^7.13.16", "@babel/generator": "^7.14.0",
"@babel/helper-function-name": "^7.12.13", "@babel/helper-function-name": "^7.12.13",
"@babel/helper-split-export-declaration": "^7.12.13", "@babel/helper-split-export-declaration": "^7.12.13",
"@babel/parser": "^7.13.16", "@babel/parser": "^7.14.0",
"@babel/types": "^7.13.17", "@babel/types": "^7.14.0",
"debug": "^4.1.0", "debug": "^4.1.0",
"globals": "^11.1.0" "globals": "^11.1.0"
} }
}, },
"@babel/types": { "@babel/types": {
"version": "7.13.17", "version": "7.14.1",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
"integrity": "sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==", "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
"requires": { "requires": {
"@babel/helper-validator-identifier": "^7.12.11", "@babel/helper-validator-identifier": "^7.14.0",
"to-fast-properties": "^2.0.0" "to-fast-properties": "^2.0.0"
} }
} }
@@ -348,51 +368,56 @@
} }
}, },
"@babel/helpers": { "@babel/helpers": {
"version": "7.13.17", "version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.17.tgz", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
"integrity": "sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==", "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
"requires": { "requires": {
"@babel/template": "^7.12.13", "@babel/template": "^7.12.13",
"@babel/traverse": "^7.13.17", "@babel/traverse": "^7.14.0",
"@babel/types": "^7.13.17" "@babel/types": "^7.14.0"
}, },
"dependencies": { "dependencies": {
"@babel/generator": { "@babel/generator": {
"version": "7.13.16", "version": "7.14.1",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.16.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz",
"integrity": "sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==", "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==",
"requires": { "requires": {
"@babel/types": "^7.13.16", "@babel/types": "^7.14.1",
"jsesc": "^2.5.1", "jsesc": "^2.5.1",
"source-map": "^0.5.0" "source-map": "^0.5.0"
} }
}, },
"@babel/helper-validator-identifier": {
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
"integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="
},
"@babel/parser": { "@babel/parser": {
"version": "7.13.16", "version": "7.14.1",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.16.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz",
"integrity": "sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==" "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q=="
}, },
"@babel/traverse": { "@babel/traverse": {
"version": "7.13.17", "version": "7.14.0",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.17.tgz", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
"integrity": "sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==", "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
"requires": { "requires": {
"@babel/code-frame": "^7.12.13", "@babel/code-frame": "^7.12.13",
"@babel/generator": "^7.13.16", "@babel/generator": "^7.14.0",
"@babel/helper-function-name": "^7.12.13", "@babel/helper-function-name": "^7.12.13",
"@babel/helper-split-export-declaration": "^7.12.13", "@babel/helper-split-export-declaration": "^7.12.13",
"@babel/parser": "^7.13.16", "@babel/parser": "^7.14.0",
"@babel/types": "^7.13.17", "@babel/types": "^7.14.0",
"debug": "^4.1.0", "debug": "^4.1.0",
"globals": "^11.1.0" "globals": "^11.1.0"
} }
}, },
"@babel/types": { "@babel/types": {
"version": "7.13.17", "version": "7.14.1",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
"integrity": "sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==", "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
"requires": { "requires": {
"@babel/helper-validator-identifier": "^7.12.11", "@babel/helper-validator-identifier": "^7.14.0",
"to-fast-properties": "^2.0.0" "to-fast-properties": "^2.0.0"
} }
} }
@@ -4494,9 +4519,9 @@
"integrity": "sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg==" "integrity": "sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg=="
}, },
"acorn": { "acorn": {
"version": "8.2.2", "version": "8.2.4",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.2.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
"integrity": "sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ==" "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg=="
}, },
"acorn-globals": { "acorn-globals": {
"version": "6.0.0", "version": "6.0.0",

4
package.json
View File

@@ -26,7 +26,7 @@
"@nuxtjs/sitemap": "^2.4.0", "@nuxtjs/sitemap": "^2.4.0",
"@nuxtjs/toast": "^3.3.1", "@nuxtjs/toast": "^3.3.1",
"ace-builds": "^1.4.12", "ace-builds": "^1.4.12",
"acorn": "^8.2.2", "acorn": "^8.2.4",
"acorn-walk": "^8.1.0", "acorn-walk": "^8.1.0",
"esprima": "^4.0.1", "esprima": "^4.0.1",
"firebase": "^8.4.3", "firebase": "^8.4.3",
@@ -48,7 +48,7 @@
"yargs-parser": "^20.2.7" "yargs-parser": "^20.2.7"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.13.16", "@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.12.13", "@babel/plugin-proposal-class-properties": "^7.12.13",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
"@babel/plugin-proposal-optional-chaining": "^7.13.12", "@babel/plugin-proposal-optional-chaining": "^7.13.12",