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

refactor: improvements made to how banners are to be dismissed (#3656)

Browse Source
This commit is contained in:
Joel Jacob Stephen
2023-12-15 17:08:57 +05:30
committed by GitHub
parent 93082c3816
commit cf8b5975ac
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
</span> </span>
</div> </div>
<icon-lucide-x <icon-lucide-x
v-if="dismissible" v-if="banner.dismissible"
class="opacity-50 hover:cursor-pointer hover:opacity-100" class="opacity-50 hover:cursor-pointer hover:opacity-100"
@click="emit('dismiss')" @click="emit('dismiss')"
/> />

3
packages/hoppscotch-common/src/components/app/Header.vue
View File

@@ -214,7 +214,7 @@
<AppBanner <AppBanner
v-if="bannerContent" v-if="bannerContent"
:banner="bannerContent" :banner="bannerContent"
:dismissible="true" :dismissable="bannerContent.dismissible"
@dismiss="dismissOfflineBanner" @dismiss="dismissOfflineBanner"
/> />
<TeamsModal :show="showTeamsModal" @hide-modal="showTeamsModal = false" /> <TeamsModal :show="showTeamsModal" @hide-modal="showTeamsModal = false" />
@@ -295,6 +295,7 @@ const offlineBanner: BannerContent = {
text: (t) => t("helpers.offline"), text: (t) => t("helpers.offline"),
alternateText: (t) => t("helpers.offline_short"), alternateText: (t) => t("helpers.offline_short"),
score: BANNER_PRIORITY_HIGH, score: BANNER_PRIORITY_HIGH,
dismissible: true,
} }
const network = reactive(useNetwork()) const network = reactive(useNetwork())

1
packages/hoppscotch-common/src/services/banner.service.ts
View File

@@ -15,6 +15,7 @@ export type BannerContent = {
alternateText?: (t: ReturnType<typeof getI18n>) => string alternateText?: (t: ReturnType<typeof getI18n>) => string
// Used to determine which banner should be displayed when multiple banners are present // Used to determine which banner should be displayed when multiple banners are present
score: number score: number
dismissible?: boolean
} }
export type Banner = { export type Banner = {

2
packages/hoppscotch-sh-admin/src/components.d.ts vendored
View File

@@ -30,8 +30,10 @@ declare module '@vue/runtime-core' {
HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable'] HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs'] HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle'] HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default'] IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
IconLucideInbox: typeof import('~icons/lucide/inbox')['default'] IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
IconLucideUser: typeof import('~icons/lucide/user')['default']
SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default'] SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default']
SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default'] SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default']
SettingsReset: typeof import('./components/settings/Reset.vue')['default'] SettingsReset: typeof import('./components/settings/Reset.vue')['default']