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

chore: minoir ui and code refactor

Browse Source
This commit is contained in:
nivedin
2024-05-29 14:07:45 +05:30
parent bf65654126
commit 850954efdf
3 changed files with 44 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-common/src/components/app/Interceptor.vue
View File

@@ -20,7 +20,7 @@
:label="unref(interceptor.name(t))" :label="unref(interceptor.name(t))"
:selected="interceptorSelection === interceptor.interceptorID" :selected="interceptorSelection === interceptor.interceptorID"
:class="{ :class="{
'px-0 hover:bg-transparent': !isTooltipComponent, '!px-0 hover:bg-transparent': !isTooltipComponent,
}" }"
@change="interceptorSelection = interceptor.interceptorID" @change="interceptorSelection = interceptor.interceptorID"
/> />

15
packages/hoppscotch-common/src/newstore/settings.ts
View File

@@ -1,8 +1,6 @@
import { cloneDeep, defaultsDeep, has } from "lodash-es" import { cloneDeep, defaultsDeep, has } from "lodash-es"
import { Observable } from "rxjs" import { Observable } from "rxjs"
import { distinctUntilChanged, pluck } from "rxjs/operators" import { distinctUntilChanged, pluck } from "rxjs/operators"
import { nextTick } from "vue"
import { platform } from "~/platform"
import type { KeysMatching } from "~/types/ts-utils" import type { KeysMatching } from "~/types/ts-utils"
import DispatchingStore, { defineDispatchers } from "./DispatchingStore" import DispatchingStore, { defineDispatchers } from "./DispatchingStore"
@@ -70,8 +68,7 @@ export type SettingsDef = {
HAS_OPENED_SPOTLIGHT: boolean HAS_OPENED_SPOTLIGHT: boolean
} }
export const getDefaultSettings = (): SettingsDef => { export const getDefaultSettings = (): SettingsDef => ({
const defaultSettings: SettingsDef = {
syncCollections: true, syncCollections: true,
syncHistory: true, syncHistory: true,
syncEnvironments: true, syncEnvironments: true,
@@ -95,6 +92,7 @@ export const getDefaultSettings = (): SettingsDef => {
cookie: true, cookie: true,
}, },
// Set empty because interceptor module will set the default value
CURRENT_INTERCEPTOR_ID: "", CURRENT_INTERCEPTOR_ID: "",
// TODO: Interceptor related settings should move under the interceptor systems // TODO: Interceptor related settings should move under the interceptor systems
@@ -115,17 +113,8 @@ export const getDefaultSettings = (): SettingsDef => {
COLUMN_LAYOUT: true, COLUMN_LAYOUT: true,
HAS_OPENED_SPOTLIGHT: false, HAS_OPENED_SPOTLIGHT: false,
}
// Wait for platform to initialize before setting CURRENT_INTERCEPTOR_ID
nextTick(() => {
defaultSettings.CURRENT_INTERCEPTOR_ID =
platform?.interceptors.default || "browser"
}) })
return defaultSettings
}
type ApplySettingPayload = { type ApplySettingPayload = {
[K in keyof SettingsDef]: { [K in keyof SettingsDef]: {
settingKey: K settingKey: K

5
packages/hoppscotch-common/src/pages/settings.vue
View File

@@ -98,13 +98,10 @@
</p> </p>
</div> </div>
<div class="space-y-8 p-8 md:col-span-2"> <div class="space-y-8 p-8 md:col-span-2">
<section class="flex flex-col"> <section class="flex flex-col space-y-2">
<h4 class="font-semibold text-secondaryDark"> <h4 class="font-semibold text-secondaryDark">
{{ t("settings.interceptor") }} {{ t("settings.interceptor") }}
</h4> </h4>
<p class="my-1 text-secondaryLight capitalize">
{{ interceptorService.currentInterceptor.value?.interceptorID }}
</p>
<AppInterceptor :is-tooltip-component="false" /> <AppInterceptor :is-tooltip-component="false" />
</section> </section>
<section v-for="[id, settings] in interceptorsWithSettings" :key="id"> <section v-for="[id, settings] in interceptorsWithSettings" :key="id">