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

Merge branch 'refactor/ui' of https://github.com/hoppscotch/hoppscotch into refactor/ui

Browse Source
This commit is contained in:
Liyas Thomas
2021-07-06 18:13:49 +00:00
committed by GitHub
parent fc5a5aad8d ed91486d53
commit 7bb570cdc7
5 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/landing/Globe.vue
View File

@@ -92,14 +92,6 @@ export default {
.hexPolygonResolution(3) .hexPolygonResolution(3)
.hexPolygonMargin(0.5) .hexPolygonMargin(0.5)
.hexPolygonColor(() => `#aaaaaa`) .hexPolygonColor(() => `#aaaaaa`)
// labels layer
// .labelsData(this.labelsData)
// .labelLat("lat")
// .labelLng("lng")
// .labelText("text")
// .labelColor("color")
// .labelSize(1.5)
// .labelDotRadius(0.5)
// labels layer // labels layer
.labelsData(this.labelsData) .labelsData(this.labelsData)

1
components/smart/DeletableChip.vue
View File

@@ -20,7 +20,6 @@
@apply bg-primaryDark; @apply bg-primaryDark;
@apply text-secondary; @apply text-secondary;
@apply font-mono; @apply font-mono;
@apply border border-divider; @apply border border-divider;
} }

9
layouts/default.vue
View File

@@ -140,3 +140,12 @@ export default {
}, },
} }
</script> </script>
<style lang="scss" scoped>
.splitpanes--vertical > .splitpanes__splitter {
display: none;
}
.splitpanes--horizontal > .splitpanes__splitter {
display: none;
}
</style>

7
pages/api.vue
View File

@@ -145,11 +145,7 @@
<div class="flex flex-1"> <div class="flex flex-1">
<span> <span>
<SmartToggle <SmartToggle
v-if="canListParameters"
:on="rawInput" :on="rawInput"
@change="rawInput = $event"
>
{{ $t("raw_input") }}
</SmartToggle> </SmartToggle>
</span> </span>
</div> </div>
@@ -177,9 +173,6 @@
</div> </div>
<div class="flex flex-1"> <div class="flex flex-1">
<span> <span>
<ButtonSecondary
@click.native="showCurlImportModal = !showCurlImportModal"
v-tippy="{ theme: 'tooltip' }"
:title="$t('import_curl')" :title="$t('import_curl')"
icon="import_export" icon="import_export"
/> />

82
pages/graphql.vue
View File

@@ -349,50 +349,54 @@
v-for="field in filteredQueryFields" v-for="field in filteredQueryFields"
:key="field.name" :key="field.name"
> >
<GraphqlField <GraphqlField
:gql-field="field" :gql-field="field"
:jump-type-callback="handleJumpToType" :jump-type-callback="handleJumpToType"
/> />
</div> </div>
</SmartTab> </SmartTab>
<SmartTab <SmartTab
v-if="mutationFields.length > 0" v-if="mutationFields.length > 0"
:id="'mutations'" :id="'mutations'"
:label="$t('mutations')" :label="$t('mutations')"
>
<div
v-for="field in filteredMutationFields"
:key="field.name"
> >
<div <GraphqlField
v-for="field in filteredMutationFields" :gql-field="field"
:key="field.name" :jump-type-callback="handleJumpToType"
> />
<GraphqlField </div>
:gql-field="field" </SmartTab>
:jump-type-callback="handleJumpToType"
/>
</div>
</SmartTab>
<SmartTab <SmartTab
v-if="subscriptionFields.length > 0" v-if="subscriptionFields.length > 0"
:id="'subscriptions'" :id="'subscriptions'"
:label="$t('subscriptions')" :label="$t('subscriptions')"
>
<div
v-for="field in filteredSubscriptionFields"
:key="field.name"
> >
<div <GraphqlField
v-for="field in filteredSubscriptionFields" :gql-field="field"
:key="field.name" :jump-type-callback="handleJumpToType"
> />
<GraphqlField </div>
:gql-field="field" </SmartTab>
:jump-type-callback="handleJumpToType"
/>
</div>
</SmartTab>
<SmartTab <SmartTab
v-if="graphqlTypes.length > 0" v-if="graphqlTypes.length > 0"
:id="'types'" :id="'types'"
ref="typesTab" ref="typesTab"
:label="$t('types')" :label="$t('types')"
>
<div
v-for="type in filteredGraphqlTypes"
:key="type.name"
> >
<div <div
v-for="type in filteredGraphqlTypes" v-for="type in filteredGraphqlTypes"