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

Merge remote-tracking branch 'upstream/main' into newstate/firebase

Browse Source
This commit is contained in:
Andrew Bastin
2021-06-19 20:41:25 -04:00
parent a85729b4cf bd3cec18d8
commit 7c2becd3a4
41 changed files with 1568 additions and 3022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/doc.vue
View File

@@ -2,7 +2,7 @@
<div class="page">
<div class="content">
<div class="page-columns inner-left">
<AppSection ref="import" :label="$t('import')" no-legend>
<AppSection ref="import" :label="$t('import')">
<div class="flex flex-col">
<label>{{ $t("collection") }}</label>
<p class="info">
@@ -55,7 +55,7 @@
</div>
</AppSection>
<AppSection ref="documentation" :label="$t('documentation')" no-legend>
<AppSection ref="documentation" :label="$t('documentation')">
<div class="flex flex-col">
<label>{{ $t("documentation") }}</label>
<p v-if="items.length === 0" class="info">

14
pages/graphql.vue
View File

@@ -2,7 +2,7 @@
<div class="page">
<div class="content">
<div class="page-columns inner-left">
<AppSection ref="endpoint" :label="$t('endpoint')" no-legend>
<AppSection ref="endpoint" :label="$t('endpoint')">
<ul>
<li>
<label for="url">{{ $t("url") }}</label>
@@ -37,7 +37,7 @@
</ul>
</AppSection>
<AppSection ref="headers" :label="$t('headers')" no-legend>
<AppSection ref="headers" :label="$t('headers')">
<div class="flex flex-col">
<label>{{ $t("headers") }}</label>
<ul v-if="headers.length !== 0">
@@ -150,7 +150,7 @@
</div>
</AppSection>
<AppSection ref="schema" :label="$t('schema')" no-legend>
<AppSection ref="schema" :label="$t('schema')">
<div class="row-wrapper">
<label>{{ $t("schema") }}</label>
<div v-if="schema">
@@ -212,7 +212,7 @@
/>
</AppSection>
<AppSection ref="query" :label="$t('query')" no-legend>
<AppSection ref="query" :label="$t('query')">
<div class="row-wrapper gqlRunQuery">
<label for="gqlQuery">{{ $t("query") }}</label>
<div>
@@ -266,7 +266,7 @@
/>
</AppSection>
<AppSection ref="variables" :label="$t('variables')" no-legend>
<AppSection ref="variables" :label="$t('variables')">
<div class="flex flex-col">
<label>{{ $t("variables") }}</label>
<SmartAceEditor
@@ -285,7 +285,7 @@
</div>
</AppSection>
<AppSection ref="response" :label="$t('response')" no-legend>
<AppSection ref="response" :label="$t('response')">
<div class="flex flex-col">
<label>{{ $t("response") }}</label>
<div class="row-wrapper">
@@ -347,7 +347,7 @@
>
<SmartTabs>
<SmartTab :id="'docs'" :label="`Docs`" :selected="true">
<AppSection ref="docs" :label="$t('docs')" no-legend>
<AppSection ref="docs" :label="$t('docs')">
<section class="flex-col">
<input
v-model="graphqlFieldsFilterText"

22
pages/index.vue
View File

@@ -3,7 +3,7 @@
<div class="page">
<div class="content">
<div class="page-columns inner-left">
<AppSection :label="$t('request')" ref="request" no-legend>
<AppSection :label="$t('request')" ref="request">
<ul>
<li class="shrink">
<label for="method">{{ $t("method") }}</label>
@@ -253,11 +253,7 @@
</SmartTab>
<SmartTab :id="'authentication'" :label="$t('authentication')">
<AppSection
:label="$t('authentication')"
ref="authentication"
no-legend
>
<AppSection :label="$t('authentication')" ref="authentication">
<ul>
<li>
<div class="row-wrapper">
@@ -358,7 +354,6 @@
<AppSection
v-if="showTokenRequest"
class="red"
label="Access Token Request"
ref="accessTokenRequest"
>
@@ -485,10 +480,8 @@
>
<AppSection
v-if="showPreRequestScript"
class="orange"
:label="$t('pre_request_script')"
ref="preRequest"
no-legend
>
<ul>
<li>
@@ -527,10 +520,8 @@
<SmartTab :id="'tests'" :label="$t('tests')">
<AppSection
v-if="testsEnabled"
class="orange"
:label="$t('tests')"
ref="postRequestTests"
no-legend
>
<ul>
<li>
@@ -2172,15 +2163,6 @@ export default {
e.preventDefault()
this.$refs.clearAll.click()
}
if (e.key === "Escape") {
e.preventDefault()
this.showCurlImportModal =
this.showTokenListModal =
this.showTokenRequestList =
this.showSaveRequestModal =
this.showCodegenModal =
false
}
if ((e.key === "g" || e.key === "G") && e.altKey) {
this.method = "GET"
}

10
pages/settings.vue
View File

@@ -4,7 +4,7 @@
<Teams />
</div>
<AppSection ref="account" :label="$t('account')" no-legend>
<AppSection ref="account" :label="$t('account')">
<div class="flex flex-col">
<label>{{ $t("account") }}</label>
<div v-if="currentUser">
@@ -67,7 +67,7 @@
</div>
</AppSection>
<AppSection ref="theme" :label="$t('theme')" no-legend>
<AppSection ref="theme" :label="$t('theme')">
<div class="flex flex-col">
<label>{{ $t("theme") }}</label>
<SmartColorModePicker />
@@ -84,7 +84,7 @@
</div>
</AppSection>
<AppSection ref="extensions" :label="$t('extensions')" no-legend>
<AppSection ref="extensions" :label="$t('extensions')">
<div class="flex flex-col">
<label>{{ $t("extensions") }}</label>
<div class="row-wrapper">
@@ -106,7 +106,7 @@
</div>
</AppSection>
<AppSection ref="proxy" :label="$t('proxy')" no-legend>
<AppSection ref="proxy" :label="$t('proxy')">
<div class="flex flex-col">
<label>{{ $t("proxy") }}</label>
<div class="row-wrapper">
@@ -177,7 +177,7 @@
-->
</AppSection>
<AppSection ref="experiments" :label="$t('experiments')" no-legend>
<AppSection ref="experiments" :label="$t('experiments')">
<div class="flex flex-col">
<label>{{ $t("experiments") }}</label>
<p class="info">