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

chore: cleanup

Browse Source
This commit is contained in:
liyasthomas
2021-08-27 09:37:29 +05:30
parent 46eb7d6786
commit bba4d7fcd9
39 changed files with 104 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/scss/styles.scss
View File

@@ -197,7 +197,7 @@ hr {
@apply flex flex-1;
@apply w-full;
@apply px-4 py-2;
@apply bg-primary;
@apply bg-transparent;
@apply rounded;
@apply text-secondaryDark;
@apply border border-divider;
@@ -236,7 +236,7 @@ button {
.floating-input:focus-within ~ label,
.floating-input:not(:placeholder-shown) ~ label {
@apply bg-primary;
@apply bg-transparent;
@apply transform;
@apply origin-top-left;
@apply scale-75;

2
components/app/Search.vue
View File

@@ -9,7 +9,7 @@
name="command"
:placeholder="$t('app.type_a_command_search')"
class="
bg-primary
bg-transparent
border-b border-dividerLight
text-secondaryDark text-base
leading-normal

3
components/app/Shortcuts.vue
View File

@@ -3,6 +3,7 @@
<template #content>
<div
class="
bg-primary
border-b border-dividerLight
flex
p-2
@@ -22,7 +23,7 @@
/>
</div>
</div>
<div class="border-b border-dividerLight">
<div class="bg-primary border-b border-dividerLight">
<div class="flex flex-col my-4 mx-6 search-wrapper">
<input
v-model="filterText"

2
components/collections/ChooseType.vue
View File

@@ -18,7 +18,7 @@
type="text"
autofocus
class="
bg-primary
bg-transparent
border-b border-transparent
cursor-pointer
flex

2
components/collections/graphql/index.vue
View File

@@ -19,7 +19,7 @@
v-model="filterText"
type="search"
:placeholder="$t('action.search')"
class="bg-primary flex w-full py-2 pr-2 pl-10"
class="bg-transparent flex w-full py-2 pr-2 pl-10"
/>
</div>
<div class="flex flex-1 justify-between">

2
components/collections/index.vue
View File

@@ -21,7 +21,7 @@
v-model="filterText"
type="search"
:placeholder="$t('action.search')"
class="bg-primary flex w-full py-2 pr-2 pl-10"
class="bg-transparent flex w-full py-2 pr-2 pl-10"
/>
</div>
<CollectionsChooseType

4
components/environments/Edit.vue
View File

@@ -46,13 +46,13 @@
>
<input
v-model="variable.key"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.variable', { count: index + 1 })"
:name="'param' + index"
/>
<input
v-model="variable.value"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.value', { count: index + 1 })"
:name="'value' + index"
/>

2
components/environments/index.vue
View File

@@ -16,7 +16,7 @@
v-tippy="{ theme: 'tooltip' }"
:title="$t('environment.select')"
class="
bg-primary
bg-transparent
border-b border-dividerLight
flex-1
select-wrapper

2
components/graphql/Request.vue
View File

@@ -16,7 +16,7 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent focus-visible:border-dividerDark
"
:placeholder="$t('request.url')"
@keyup.enter="onConnectClick"

5
components/graphql/RequestOptions.vue
View File

@@ -159,7 +159,7 @@
:value="header.key"
autofocus
styles="
bg-primary
bg-transparent
flex
flex-1
py-1
@@ -176,7 +176,7 @@
"
/>
<input
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.value', { count: index + 1 })"
:name="`value ${index}`"
:value="header.value"
@@ -329,7 +329,6 @@ export default defineComponent({
watch(
headers,
() => {
console.log("changed")
if (
(headers.value[headers.value.length - 1]?.key !== "" ||
headers.value[headers.value.length - 1]?.value !== "") &&

2
components/graphql/Sidebar.vue
View File

@@ -9,7 +9,7 @@
v-model="graphqlFieldsFilterText"
type="search"
:placeholder="$t('action.search')"
class="bg-primary flex w-full py-2 pr-2 pl-10"
class="bg-transparent flex w-full py-2 pr-2 pl-10"
/>
</div>
<div class="flex">

2
components/history/index.vue
View File

@@ -14,7 +14,7 @@
<input
v-model="filterText"
type="search"
class="bg-primary flex w-full py-2 pr-2 pl-10"
class="bg-transparent flex w-full py-2 pr-2 pl-10"
:placeholder="$t('action.search')"
/>
</div>

19
components/http/Authorization.vue
View File

@@ -115,14 +115,14 @@
<SmartEnvInput
v-if="EXPERIMENTAL_URL_BAR_ENABLED"
v-model="basicUsername"
class="bg-primary flex flex-1 py-1 px-4"
class="bg-transparent flex flex-1 py-1 px-4"
:placeholder="$t('authorization.username')"
/>
<input
v-else
id="http_basic_user"
v-model="basicUsername"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('authorization.username')"
name="http_basic_user"
/>
@@ -133,14 +133,14 @@
<SmartEnvInput
v-if="EXPERIMENTAL_URL_BAR_ENABLED"
v-model="basicPassword"
class="bg-primary flex flex-1 py-1 px-4"
class="bg-transparent flex flex-1 py-1 px-4"
:placeholder="$t('authorization.password')"
/>
<input
v-else
id="http_basic_passwd"
v-model="basicPassword"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('authorization.password')"
name="http_basic_passwd"
:type="passwordFieldType"
@@ -157,6 +157,7 @@
</div>
<div
class="
bg-primary
h-full
top-upperTertiaryStickyFold
min-w-46
@@ -188,14 +189,14 @@
<SmartEnvInput
v-if="EXPERIMENTAL_URL_BAR_ENABLED"
v-model="bearerToken"
class="bg-primary flex flex-1 py-1 px-4"
class="bg-transparent flex flex-1 py-1 px-4"
placeholder="Token"
/>
<input
v-else
id="bearer_token"
v-model="bearerToken"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
placeholder="Token"
name="bearer_token"
/>
@@ -203,6 +204,7 @@
</div>
<div
class="
bg-primary
h-full
top-upperTertiaryStickyFold
min-w-46
@@ -237,14 +239,14 @@
<SmartEnvInput
v-if="EXPERIMENTAL_URL_BAR_ENABLED"
v-model="oauth2Token"
class="bg-primary flex flex-1 py-1 px-4"
class="bg-transparent flex flex-1 py-1 px-4"
placeholder="Token"
/>
<input
v-else
id="oauth2_token"
v-model="oauth2Token"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
placeholder="Token"
name="oauth2_token"
/>
@@ -253,6 +255,7 @@
</div>
<div
class="
bg-primary
h-full
top-upperTertiaryStickyFold
min-w-46

3
components/http/Body.vue
View File

@@ -5,7 +5,10 @@
bg-primary
border-b border-dividerLight
flex flex-1
top-upperSecondaryStickyFold
pl-4
z-10
sticky
items-center
justify-between
"

24
components/http/BodyParameters.vue
View File

@@ -5,7 +5,7 @@
bg-primary
border-b border-dividerLight
flex flex-1
top-upperSecondaryStickyFold
top-upperTertiaryStickyFold
pl-4
z-10
sticky
@@ -48,7 +48,7 @@
v-model="param.key"
:placeholder="$t('count.parameter', { count: index + 1 })"
styles="
bg-primaryLight
bg-transparent
flex
flex-1
py-1
@@ -65,7 +65,7 @@
/>
<input
v-else
class="bg-primaryLight flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.parameter', { count: index + 1 })"
:name="'param' + index"
:value="param.key"
@@ -96,12 +96,12 @@
v-model="param.value"
:placeholder="$t('count.value', { count: index + 1 })"
styles="
bg-primaryLight
flex
flex-1
py-1
px-4
"
bg-transparent
flex
flex-1
py-1
px-4
"
@change="
updateBodyParam(index, {
key: param.key,
@@ -113,7 +113,7 @@
/>
<input
v-else
class="bg-primaryLight flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.value', { count: index + 1 })"
:name="'value' + index"
:value="param.value"
@@ -256,8 +256,6 @@ export default defineComponent({
entry: FormDataKeyValue,
event: InputEvent
) => {
console.log(index, event)
const fileEntry: FormDataKeyValue = {
...entry,
isFile: true,
@@ -304,7 +302,7 @@ export default defineComponent({
@apply flex flex-1;
@apply whitespace-nowrap;
@apply overflow-auto;
@apply bg-primaryLight;
@apply bg-transparent;
.file-chips-wrapper {
@apply flex;

8
components/http/Headers.vue
View File

@@ -50,7 +50,7 @@
:value="header.key"
autofocus
styles="
bg-primary
bg-transparent
flex
flex-1
py-1
@@ -71,7 +71,7 @@
v-model="header.value"
:placeholder="$t('count.value', { count: index + 1 })"
styles="
bg-primary
bg-transparent
flex
flex-1
py-1
@@ -87,7 +87,7 @@
/>
<input
v-else
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.value', { count: index + 1 })"
:name="'value' + index"
:value="header.value"
@@ -182,7 +182,6 @@ export default defineComponent({
watch: {
headers$: {
handler(newValue) {
console.log("changed")
if (
(newValue[newValue.length - 1]?.key !== "" ||
newValue[newValue.length - 1]?.value !== "") &&
@@ -203,7 +202,6 @@ export default defineComponent({
addRESTHeader({ key: "", value: "", active: true })
},
updateHeader(index: number, item: HoppRESTHeader) {
console.log(index, item)
updateRESTHeader(index, item)
},
deleteHeader(index: number) {

10
components/http/OAuth2Authorization.vue
View File

@@ -4,7 +4,7 @@
<input
id="oidcDiscoveryURL"
v-model="oidcDiscoveryURL"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
placeholder="OpenID Connect Discovery URL"
name="oidcDiscoveryURL"
/>
@@ -13,7 +13,7 @@
<input
id="authURL"
v-model="authURL"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
placeholder="Authentication URL"
name="authURL"
/>
@@ -22,7 +22,7 @@
<input
id="accessTokenURL"
v-model="accessTokenURL"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
placeholder="Access Token URL"
name="accessTokenURL"
/>
@@ -31,7 +31,7 @@
<input
id="clientID"
v-model="clientID"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
placeholder="Client ID"
name="clientID"
/>
@@ -40,7 +40,7 @@
<input
id="scope"
v-model="scope"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
placeholder="Scope"
name="scope"
/>

8
components/http/Parameters.vue
View File

@@ -48,7 +48,7 @@
v-model="param.key"
:placeholder="$t('count.parameter', { count: index + 1 })"
styles="
bg-primary
bg-transparent
flex
flex-1
py-1
@@ -64,7 +64,7 @@
/>
<input
v-else
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.parameter', { count: index + 1 })"
:name="'param' + index"
:value="param.key"
@@ -82,7 +82,7 @@
v-model="param.value"
:placeholder="$t('count.value', { count: index + 1 })"
styles="
bg-primary
bg-transparent
flex
flex-1
py-1
@@ -98,7 +98,7 @@
/>
<input
v-else
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.value', { count: index + 1 })"
:name="'value' + index"
:value="param.value"

1
components/http/PreRequestScript.vue
View File

@@ -48,6 +48,7 @@
</div>
<div
class="
bg-primary
h-full
top-upperTertiaryStickyFold
min-w-46

2
components/http/RawBody.vue
View File

@@ -5,7 +5,7 @@
bg-primary
border-b border-dividerLight
flex flex-1
top-upperSecondaryStickyFold
top-upperTertiaryStickyFold
pl-4
z-10
sticky

30
components/http/Request.vue
View File

@@ -26,7 +26,8 @@
px-4
w-28
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent
focus-visible:border-dividerDark
"
:value="newMethod"
:readonly="!isCustomMethod"
@@ -50,18 +51,18 @@
v-model="newEndpoint"
:placeholder="$t('request.url')"
styles="
bg-primaryLight
border border-divider
flex
flex-1
rounded-r
text-secondaryDark
py-1
px-4
hover:border-dividerDark
focus-visible:border-dividerDark
focus-visible:bg-primary
"
bg-primaryLight
border border-divider
flex
flex-1
rounded-r
text-secondaryDark
py-1
px-4
hover:border-dividerDark
focus-visible:border-dividerDark
focus-visible:bg-transparent
"
@enter="newSendRequest()"
/>
<input
@@ -79,7 +80,7 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent focus-visible:border-dividerDark
"
name="url"
type="text"
@@ -295,7 +296,6 @@ const newSendRequest = () => {
subscribeToStream(
runRESTRequest$(),
(responseState) => {
console.log(responseState)
if (loading.value) {
// Check exists because, loading can be set to false
// when cancelled

1
components/http/Tests.vue
View File

@@ -48,6 +48,7 @@
</div>
<div
class="
bg-primary
h-full
top-upperTertiaryStickyFold
min-w-46

1
components/lenses/renderers/RawLensRenderer.vue
View File

@@ -82,7 +82,6 @@ export default defineComponent({
},
methods: {
downloadResponse() {
console.log(this.responseType)
const dataToWrite = this.responseBodyText
const file = new Blob([dataToWrite], { type: this.responseType })
const a = document.createElement("a")

2
components/realtime/Log.vue
View File

@@ -60,7 +60,7 @@ export default defineComponent({
<style scoped lang="scss">
.realtime-log {
@apply p-4;
@apply bg-primary;
@apply bg-transparent;
@apply text-secondary;
@apply overflow-auto;

3
components/realtime/Mqtt.vue
View File

@@ -21,7 +21,8 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent
focus-visible:border-dividerDark
"
:placeholder="$t('mqtt.url')"
/>

6
components/realtime/Socketio.vue
View File

@@ -24,7 +24,8 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent
focus-visible:border-dividerDark
"
:placeholder="$t('socketio.url')"
@keyup.enter="urlValid ? toggleConnection() : null"
@@ -42,7 +43,8 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent
focus-visible:border-dividerDark
"
spellcheck="false"
/>

4
components/realtime/Sse.vue
View File

@@ -20,7 +20,7 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent focus-visible:border-dividerDark
"
:placeholder="$t('sse.url')"
@keyup.enter="serverValid ? toggleSSEConnection() : null"
@@ -52,7 +52,7 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent focus-visible:border-dividerDark
"
spellcheck="false"
/>

5
components/realtime/Websocket.vue
View File

@@ -19,7 +19,8 @@
py-2
px-4
hover:border-dividerDark
focus-visible:bg-primary focus-visible:border-dividerDark
focus-visible:bg-transparent
focus-visible:border-dividerDark
"
type="url"
spellcheck="false"
@@ -84,7 +85,7 @@
>
<input
v-model="protocol.value"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('count.protocol', { count: index + 1 })"
name="message"
type="text"

2
components/smart/AutoComplete.vue
View File

@@ -198,7 +198,7 @@ export default defineComponent({
ul.suggestions {
@apply hidden;
@apply bg-primary;
@apply bg-popover;
@apply absolute;
@apply mx-2;
@apply left-0;

2
components/smart/DeletableChip.vue
View File

@@ -18,7 +18,7 @@
@apply rounded;
@apply pl-2;
@apply pr-0.5;
@apply bg-primary;
@apply bg-transparent;
@apply border border-divider;
}

2
components/smart/Tabs.vue
View File

@@ -114,7 +114,7 @@ export default defineComponent({
@apply left-4;
@apply right-4;
@apply bottom-0;
@apply bg-primary;
@apply bg-transparent;
@apply z-2;
@apply h-0.5;

20
components/teams/Edit.vue
View File

@@ -35,7 +35,7 @@
class="divide-x divide-dividerLight flex"
>
<input
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('team.email')"
:name="'param' + index"
:value="member.user.email"
@@ -52,7 +52,13 @@
<template #trigger>
<span class="select-wrapper">
<input
class="bg-primary cursor-pointer flex flex-1 py-2 px-4"
class="
bg-transparent
cursor-pointer
flex flex-1
py-2
px-4
"
:placeholder="$t('team.permissions')"
:name="'value' + index"
:value="
@@ -96,7 +102,7 @@
>
<input
v-model="member.key"
class="bg-primary flex flex-1 py-2 px-4"
class="bg-transparent flex flex-1 py-2 px-4"
:placeholder="$t('team.email')"
:name="'member' + index"
autofocus
@@ -112,7 +118,13 @@
<template #trigger>
<span class="select-wrapper">
<input
class="bg-primary cursor-pointer flex flex-1 py-2 px-4"
class="
bg-transparent
cursor-pointer
flex flex-1
py-2
px-4
"
:placeholder="$t('team.permissions')"
:name="'value' + index"
:value="

2
helpers/actions.ts
View File

@@ -66,11 +66,9 @@ export function unbindAction(action: HoppAction, handler: () => void) {
export function defineActionHandler(action: HoppAction, handler: () => void) {
onMounted(() => {
bindAction(action, handler)
console.log(`Action bound: ${action}`)
})
onBeforeUnmount(() => {
unbindAction(action, handler)
console.log(`Action unbound: ${action}`)
})
}

6
helpers/fb/history.ts
View File

@@ -94,8 +94,6 @@ async function toggleStar(entry: any, col: HistoryFBCollections) {
if (currentUser$.value == null)
throw new Error("User not logged in to toggle star")
console.log(entry)
try {
await firebase
.firestore()
@@ -207,7 +205,3 @@ export function initHistory() {
}
})
}
restHistoryStore.dispatches$.subscribe((state) => {
console.log(state)
})

1
helpers/fb/request.ts
View File

@@ -76,7 +76,6 @@ export function startRequestSync(): Subscription {
)
.subscribe(() => {
// NOTE: This subscription should be kept
console.log("synced request")
})
return sub

2
helpers/keybindings.ts
View File

@@ -158,12 +158,10 @@ export function useKeybindingDisabler() {
// TODO: Move to a lock based system that keeps the bindings disabled until all locks are lifted
const disableKeybindings = () => {
keybindingsEnabled = false
console.log("Keybinds disabled by a component")
}
const enableKeybindings = () => {
keybindingsEnabled = true
console.log("Keybinds enabled by a component")
}
return {

1
helpers/lenses/lenses.js
View File

@@ -8,7 +8,6 @@ export const lenses = [jsonLens, imageLens, htmlLens, xmlLens, rawLens]
export function getSuitableLenses(response) {
const contentType = response.headers.find((h) => h.key === "content-type")
console.log(contentType)
if (!contentType) return [rawLens]

4
newstore/RESTSession.ts
View File

@@ -27,8 +27,8 @@ export const defaultRESTRequest: HoppRESTRequest = {
v: RESTReqSchemaVersion,
endpoint: "https://echo.hoppscotch.io",
name: "Untitled request",
params: [],
headers: [],
params: [{ key: "", value: "", active: true }],
headers: [{ key: "", value: "", active: true }],
method: "GET",
auth: {
authType: "none",

13
pages/index.vue
View File

@@ -83,7 +83,6 @@
import {
computed,
defineComponent,
getCurrentInstance,
onBeforeMount,
onBeforeUnmount,
onMounted,
@@ -112,7 +111,6 @@ import {
pluckRef,
useReadonlyStream,
useStream,
useStreamSubscriber,
} from "~/helpers/utils/composables"
import { loadRequestFromSync, startRequestSync } from "~/helpers/fb/request"
import { onLoggedIn } from "~/helpers/fb/auth"
@@ -210,7 +208,6 @@ function setupRequestSync(
) {
const request = await loadRequestFromSync()
if (request) {
console.log("sync le request nnd")
// setRESTRequest(request)
if (!isEqual(request, getRESTRequest())) {
requestForSync.value = request
@@ -235,23 +232,13 @@ export default defineComponent({
const confirmSync = ref(false)
const internalInstance = getCurrentInstance()
console.log("yoo", internalInstance)
const syncRequest = () => {
console.log("syncinggg")
setRESTRequest(requestForSync.value!)
}
const { subscribeToStream } = useStreamSubscriber()
setupRequestSync(confirmSync, requestForSync)
bindRequestToURLParams()
subscribeToStream(restRequest$, (x) => {
console.log(x)
})
return {
newActiveParamsCount$: useReadonlyStream(
restActiveParamsCount$.pipe(