Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia
TypeScript apiapi-clientapi-restapi-testingdeveloper-toolsgraphqlhttphttp-clientpwarestrest-apispatestingtesting-toolstoolsvuevuejswebsocket
chore(ui): improve ui consistency
liyasthomasba3d3430c02e
diff --git a/packages/hoppscotch-app/components/collections/ImportExport.vue b/packages/hoppscotch-app/components/collections/ImportExport.vueindex de9fa1e57..42dcb1235 100644--- a/packages/hoppscotch-app/components/collections/ImportExport.vue+++ b/packages/hoppscotch-app/components/collections/ImportExport.vue@@ -78,22 +78,7 @@</span></template><template #body>- <div v-if="mode == 'import_export'" class="flex flex-col space-y-2">- <SmartItem- v-tippy="{ theme: 'tooltip' }"- :title="$t('action.replace_current')"- svg="file"- :label="$t('action.replace_json')"- @click.native="openDialogChooseFileToReplaceWith"- />- <input- ref="inputChooseFileToReplaceWith"- class="input"- type="file"- style="display: none"- accept="application/json"- @change="replaceWithJSON"- />+ <div v-if="mode == 'import_export'" class="flex flex-col space-y-2 px-2"><SmartItemv-tippy="{ theme: 'tooltip' }":title="$t('action.preserve_current')"@@ -117,6 +102,22 @@:label="$t('import.from_my_collections')"@click.native="mode = 'import_from_my_collections'"/>+ <SmartItem+ v-tippy="{ theme: 'tooltip' }"+ :title="$t('action.replace_current')"+ svg="file"+ :label="$t('action.replace_json')"+ @click.native="openDialogChooseFileToReplaceWith"+ />+ <input+ ref="inputChooseFileToReplaceWith"+ class="input"+ type="file"+ style="display: none"+ accept="application/json"+ @change="replaceWithJSON"+ />+ <hr /><SmartItemv-tippy="{ theme: 'tooltip' }":title="$t('action.download_file')"diff --git a/packages/hoppscotch-app/components/collections/graphql/ImportExport.vue b/packages/hoppscotch-app/components/collections/graphql/ImportExport.vueindex 47fc42daf..0dcd087cd 100644--- a/packages/hoppscotch-app/components/collections/graphql/ImportExport.vue+++ b/packages/hoppscotch-app/components/collections/graphql/ImportExport.vue@@ -57,35 +57,36 @@</span></template><template #body>- <div class="flex flex-col space-y-2">+ <div class="flex flex-col space-y-2 px-2"><SmartItemv-tippy="{ theme: 'tooltip' }"- :title="$t('action.replace_current')"- svg="file"- :label="$t('action.replace_json')"- @click.native="openDialogChooseFileToReplaceWith"+ :title="$t('action.preserve_current')"+ svg="folder-plus"+ :label="$t('import.json')"+ @click.native="openDialogChooseFileToImportFrom"/><input- ref="inputChooseFileToReplaceWith"+ ref="inputChooseFileToImportFrom"class="input"type="file"accept="application/json"- @change="replaceWithJSON"+ @change="importFromJSON"/><SmartItemv-tippy="{ theme: 'tooltip' }"- :title="$t('action.preserve_current')"- svg="folder-plus"- :label="$t('import.json')"- @click.native="openDialogChooseFileToImportFrom"+ :title="$t('action.replace_current')"+ svg="file"+ :label="$t('action.replace_json')"+ @click.native="openDialogChooseFileToReplaceWith"/><input- ref="inputChooseFileToImportFrom"+ ref="inputChooseFileToReplaceWith"class="input"type="file"accept="application/json"- @change="importFromJSON"+ @change="replaceWithJSON"/>+ <hr /><SmartItemv-tippy="{ theme: 'tooltip' }":title="$t('action.download_file')"diff --git a/packages/hoppscotch-app/components/environments/ImportExport.vue b/packages/hoppscotch-app/components/environments/ImportExport.vueindex 79177067a..48dbcb7e8 100644--- a/packages/hoppscotch-app/components/environments/ImportExport.vue+++ b/packages/hoppscotch-app/components/environments/ImportExport.vue@@ -57,35 +57,36 @@</span></template><template #body>- <div class="flex flex-col space-y-2">+ <div class="flex flex-col space-y-2 px-2"><SmartItemv-tippy="{ theme: 'tooltip' }"- :title="$t('action.replace_current')"- svg="file"- :label="$t('action.replace_json')"- @click.native="openDialogChooseFileToReplaceWith"+ :title="$t('action.preserve_current')"+ svg="folder-plus"+ :label="$t('import.json')"+ @click.native="openDialogChooseFileToImportFrom"/><input- ref="inputChooseFileToReplaceWith"+ ref="inputChooseFileToImportFrom"class="input"type="file"accept="application/json"- @change="replaceWithJSON"+ @change="importFromJSON"/><SmartItemv-tippy="{ theme: 'tooltip' }"- :title="$t('action.preserve_current')"- svg="folder-plus"- :label="$t('import.json')"- @click.native="openDialogChooseFileToImportFrom"+ :title="$t('action.replace_current')"+ svg="file"+ :label="$t('action.replace_json')"+ @click.native="openDialogChooseFileToReplaceWith"/><input- ref="inputChooseFileToImportFrom"+ ref="inputChooseFileToReplaceWith"class="input"type="file"accept="application/json"- @change="importFromJSON"+ @change="replaceWithJSON"/>+ <hr /><SmartItemv-tippy="{ theme: 'tooltip' }":title="$t('action.download_file')"diff --git a/packages/hoppscotch-app/helpers/utils/parseInsomniaCollection.ts b/packages/hoppscotch-app/helpers/utils/parseInsomniaCollection.tsindex 59572fc1f..5d445984b 100644--- a/packages/hoppscotch-app/helpers/utils/parseInsomniaCollection.ts+++ b/packages/hoppscotch-app/helpers/utils/parseInsomniaCollection.ts@@ -68,7 +68,7 @@ function transformBody(insomniaBody: any) {default:console.warn("Warning: Body type unsupported; skipped!!! ... " +- insomniaBody.mimeType+ insomniaBody.mimeType)body.mode = "raw"body.raw =