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

⚡ Minor tweaks

Browse Source
This commit is contained in:
liyasthomas
2019-11-03 01:20:40 +05:30
parent b95eaf1aed
commit 5db9ca9786
5 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/collections/collection.vue
View File

@@ -37,7 +37,6 @@
<label>Collection is empty</label>
</li>
</ul>
<ul>
<li v-for="(request, index) in collection.requests" :key="index">
<request

12
components/collections/editRequest.vue
View File

@@ -17,16 +17,20 @@
<div slot="body">
<ul>
<li>
<input type="text" v-model="requestUpdateData.name" v-bind:placeholder="request.name" />
<select type="text" v-model="requestUpdateData.collectionIndex">
<label for="selectLabel">Label</label>
<input type="text" id="selectLabel" v-model="requestUpdateData.name" :placeholder="request.name" />
<label for="selectCollection">Collection</label>
<select type="text" id="selectCollection" v-model="requestUpdateData.collectionIndex">
<option :key="undefined" :value="undefined" hidden disabled selected>Current Collection</option>
<option
v-for="(collection, index) in $store.state.postwoman.collections"
:key="index"
:value="index"
>{{ collection.name }}</option>
</select>
<select type="text" v-model="requestUpdateData.folderIndex">
<option :key="undefined" :value="undefined"></option>
<label for="selectFolder">Folder</label>
<select type="text" id="selectFolder" v-model="requestUpdateData.folderIndex">
<option :key="undefined" :value="undefined">/</option>
<option v-for="(folder, index) in folders" :key="index" :value="index">{{ folder.name }}</option>
</select>
</li>

1
components/collections/saveRequestAs.vue
View File

@@ -26,6 +26,7 @@
/>
<label for="selectCollection">Collection</label>
<select type="text" id="selectCollection" v-model="requestData.collectionIndex">
<option :key="undefined" :value="undefined" hidden disabled selected>Select a Collection</option>
<option
v-for="(collection, index) in $store.state.postwoman.collections"
:key="index"

34
pages/index.vue
View File

@@ -258,7 +258,7 @@
>
<i class="material-icons">save</i>
</button>
<button class="icon" @click="clearContent" v-tooltip.bottom="'Clear All'">
<button class="icon" @click="clearContent('', $event)" v-tooltip.bottom="'Clear All'">
<i class="material-icons">clear_all</i>
</button>
</div>
@@ -317,9 +317,8 @@
<div class="flex-wrap">
<label for="auth">Authentication Type</label>
<div>
<button class="icon" @click="clearContent('auth')">
<button class="icon" @click="clearContent('auth', $event)" v-tooltip.bottom="'Clear'">
<i class="material-icons">clear_all</i>
<span>Clear</span>
</button>
</div>
</div>
@@ -377,9 +376,8 @@
<div class="flex-wrap">
<label for="headerList">Header List</label>
<div>
<button class="icon" @click="clearContent('headers')">
<button class="icon" @click="clearContent('headers', $event)" v-tooltip.bottom="'Clear'">
<i class="material-icons">clear_all</i>
<span>Clear</span>
</button>
</div>
</div>
@@ -442,9 +440,8 @@
<div class="flex-wrap">
<label for="paramList">Parameter List</label>
<div>
<button class="icon" @click="clearContent('parameters')">
<button class="icon" @click="clearContent('parameters', $event)" v-tooltip.bottom="'Clear'">
<i class="material-icons">clear_all</i>
<span>Clear</span>
</button>
</div>
</div>
@@ -766,6 +763,7 @@ export default {
this.url = newValue.url;
this.path = newValue.path;
this.method = newValue.method;
this.label = newValue.label;
this.auth = newValue.auth;
this.httpUser = newValue.httpUser;
this.httpPassword = newValue.httpPassword;
@@ -1143,14 +1141,17 @@ export default {
}
},
methods: {
scrollInto(view) {
this.$refs[view].$el.scrollIntoView({
behavior: "smooth"
});
},
handleUseHistory({ label, method, url, path }) {
this.label = label;
this.method = method;
this.url = url;
this.path = path;
this.$refs.request.$el.scrollIntoView({
behavior: "smooth"
});
this.scrollInto('request');
},
getVariablesFromPreRequestScript() {
if (!this.preRequestScript) {
@@ -1206,6 +1207,7 @@ export default {
},
async sendRequest() {
this.$toast.clear();
this.scrollInto('response');
if (!this.isValidURL) {
this.$toast.error("URL is not formatted properly", {
@@ -1221,9 +1223,6 @@ export default {
if (this.$refs.response.$el.classList.contains("hidden")) {
this.$refs.response.$el.classList.toggle("hidden");
}
this.$refs.response.$el.scrollIntoView({
behavior: "smooth"
});
this.previewEnabled = false;
this.response.status = "Fetching...";
this.response.body = "Loading...";
@@ -1641,7 +1640,7 @@ export default {
this.passwordFieldType =
this.passwordFieldType === "password" ? "text" : "password";
},
clearContent(name) {
clearContent(name, e) {
switch (name) {
case "auth":
this.auth = "None";
@@ -1670,9 +1669,16 @@ export default {
this.bodyParams = [];
this.rawParams = "";
}
e.target.innerHTML = this.copiedButton;
this.$toast.info("Cleared", {
icon: "clear_all"
});
setTimeout(
() =>
(e.target.innerHTML =
'<i class="material-icons">clear_all</i>'),
1000
);
},
saveRequest() {
this.editRequest = {

7
store/state.js
View File

@@ -1,4 +1,4 @@
export default {
export default () => ({
request: {
method: 'GET',
url: 'https://reqres.in',
@@ -7,13 +7,14 @@ export default {
auth: 'None',
httpUser: '',
httpPassword: '',
passwordFieldType: 'password',
bearerToken: '',
headers: [],
params: [],
bodyParams: [],
rawParams: '',
rawInput: false,
requestType: '',
requestType: 'JavaScript XHR',
contentType: '',
}
};
});