diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts index ed96a3671..d90e016fa 100644 --- a/packages/hoppscotch-common/src/components.d.ts +++ b/packages/hoppscotch-common/src/components.d.ts @@ -99,6 +99,7 @@ declare module '@vue/runtime-core' { HttpTests: typeof import('./components/http/Tests.vue')['default'] HttpURLEncodedParams: typeof import('./components/http/URLEncodedParams.vue')['default'] IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'] + IconLucideBrush: typeof import('~icons/lucide/brush')['default'] IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default'] IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default'] IconLucideGlobe: typeof import('~icons/lucide/globe')['default'] @@ -107,6 +108,7 @@ declare module '@vue/runtime-core' { IconLucideLayers: typeof import('~icons/lucide/layers')['default'] IconLucideLoader: typeof import('~icons/lucide/loader')['default'] IconLucideMinus: typeof import('~icons/lucide/minus')['default'] + IconLucideRss: typeof import('~icons/lucide/rss')['default'] IconLucideSearch: typeof import('~icons/lucide/search')['default'] IconLucideUser: typeof import('~icons/lucide/user')['default'] IconLucideUsers: typeof import('~icons/lucide/users')['default'] @@ -119,7 +121,6 @@ declare module '@vue/runtime-core' { LensesRenderersRawLensRenderer: typeof import('./components/lenses/renderers/RawLensRenderer.vue')['default'] LensesRenderersXMLLensRenderer: typeof import('./components/lenses/renderers/XMLLensRenderer.vue')['default'] LensesResponseBodyRenderer: typeof import('./components/lenses/ResponseBodyRenderer.vue')['default'] - Newcollections: typeof import('./components/newcollections/index.vue')['default'] ProfilePicture: typeof import('./components/profile/Picture.vue')['default'] ProfileShortcode: typeof import('./components/profile/Shortcode.vue')['default'] RealtimeCommunication: typeof import('./components/realtime/Communication.vue')['default'] diff --git a/packages/hoppscotch-common/src/components/app/Footer.vue b/packages/hoppscotch-common/src/components/app/Footer.vue index 6332aa762..76426a05d 100644 --- a/packages/hoppscotch-common/src/components/app/Footer.vue +++ b/packages/hoppscotch-common/src/components/app/Footer.vue @@ -194,6 +194,7 @@ :show="showDeveloperOptions" @hide-modal="showDeveloperOptions = false" /> + @@ -231,6 +232,7 @@ const t = useI18n() const showShortcuts = ref(false) const showShare = ref(false) const showDeveloperOptions = ref(false) +const showLogin = ref(false) defineActionHandler("flyouts.keybinds.toggle", () => { showShortcuts.value = !showShortcuts.value @@ -240,6 +242,10 @@ defineActionHandler("modals.share.toggle", () => { showShare.value = !showShare.value }) +defineActionHandler("modals.login.toggle", () => { + showLogin.value = !showLogin.value +}) + const EXPAND_NAVIGATION = useSetting("EXPAND_NAVIGATION") const SIDEBAR = useSetting("SIDEBAR") const ZEN_MODE = useSetting("ZEN_MODE") diff --git a/packages/hoppscotch-common/src/components/app/Header.vue b/packages/hoppscotch-common/src/components/app/Header.vue index caeb28eee..ba4c40d20 100644 --- a/packages/hoppscotch-common/src/components/app/Header.vue +++ b/packages/hoppscotch-common/src/components/app/Header.vue @@ -42,12 +42,12 @@ :label="t('header.save_workspace')" filled class="hidden md:flex" - @click="showLogin = true" + @click="invokeAction('modals.login.toggle')" />
-
@@ -181,7 +180,6 @@ const t = useI18n() const showInstallButton = computed(() => !!pwaDefferedPrompt.value) -const showLogin = ref(false) const showTeamsModal = ref(false) const breakpoints = useBreakpoints(breakpointsTailwind) diff --git a/packages/hoppscotch-common/src/components/app/PaneLayout.vue b/packages/hoppscotch-common/src/components/app/PaneLayout.vue index e087ed636..7763abe1c 100644 --- a/packages/hoppscotch-common/src/components/app/PaneLayout.vue +++ b/packages/hoppscotch-common/src/components/app/PaneLayout.vue @@ -76,10 +76,10 @@ type PaneEvent = { size: number } -const PANE_SIDEBAR_SIZE = ref(25) -const PANE_MAIN_SIZE = ref(75) -const PANE_MAIN_TOP_SIZE = ref(45) -const PANE_MAIN_BOTTOM_SIZE = ref(65) +const PANE_MAIN_SIZE = ref(74) +const PANE_SIDEBAR_SIZE = ref(26) +const PANE_MAIN_TOP_SIZE = ref(42) +const PANE_MAIN_BOTTOM_SIZE = ref(58) if (!COLUMN_LAYOUT.value) { PANE_MAIN_TOP_SIZE.value = 50 diff --git a/packages/hoppscotch-common/src/components/collections/ChooseType.vue b/packages/hoppscotch-common/src/components/collections/ChooseType.vue index 01729110a..52974141a 100644 --- a/packages/hoppscotch-common/src/components/collections/ChooseType.vue +++ b/packages/hoppscotch-common/src/components/collections/ChooseType.vue @@ -12,7 +12,6 @@ import IconUsers from "~icons/lucide/users" import IconDone from "~icons/lucide/check" -import { ref, watch } from "vue" +import { nextTick, ref, watch } from "vue" import { GetMyTeamsQuery, Team } from "~/helpers/backend/graphql" import { currentUserInfo$ } from "~/helpers/teams/BackendUserInfo" import TeamListAdapter from "~/helpers/teams/TeamListAdapter" @@ -86,6 +85,7 @@ import { useReadonlyStream } from "@composables/stream" import { onLoggedIn } from "@composables/auth" import { useI18n } from "@composables/i18n" import { useLocalState } from "~/newstore/localstate" +import { invokeAction } from "~/helpers/actions" type TeamData = GetMyTeamsQuery["myTeams"][number] @@ -153,7 +153,10 @@ const updateSelectedTeam = (team: TeamData | undefined) => { emit("update-selected-team", team) } -watch(selectedCollectionTab, (newValue: string) => { - updateCollectionsType(newValue) +watch(selectedCollectionTab, (newValue: CollectionTabs) => { + if (newValue === "team-collections" && !currentUser.value) { + invokeAction("modals.login.toggle") + nextTick(() => (selectedCollectionTab.value = "my-collections")) + } else updateCollectionsType(newValue) }) diff --git a/packages/hoppscotch-common/src/components/environments/ChooseType.vue b/packages/hoppscotch-common/src/components/environments/ChooseType.vue index b88fab444..0aae6bfa0 100644 --- a/packages/hoppscotch-common/src/components/environments/ChooseType.vue +++ b/packages/hoppscotch-common/src/components/environments/ChooseType.vue @@ -12,7 +12,6 @@ diff --git a/packages/hoppscotch-common/src/components/environments/index.vue b/packages/hoppscotch-common/src/components/environments/index.vue index bcc0b1c0c..881e6e130 100644 --- a/packages/hoppscotch-common/src/components/environments/index.vue +++ b/packages/hoppscotch-common/src/components/environments/index.vue @@ -8,7 +8,6 @@ interactive trigger="click" theme="popover" - arrow :on-shown="() => tippyActions!.focus()" > - + -
- - {{ t("state.loading") }} +
+
+ +
@@ -138,7 +138,6 @@ to="/" />
-
@@ -163,6 +162,7 @@ import { useReadonlyStream } from "@composables/stream" import { useToast } from "@composables/toast" import { useI18n } from "~/composables/i18n" import IconHome from "~icons/lucide/home" +import { invokeAction } from "~/helpers/actions" type GetInviteDetailsError = | "team_invite/not_valid_viewer" @@ -214,12 +214,12 @@ export default defineComponent({ toast: useToast(), t: useI18n(), IconHome, + invokeAction, } }, data() { return { invalidLink: false, - showLogin: false, loading: false, revokedLink: false, inviteID: "", diff --git a/packages/hoppscotch-common/src/pages/profile.vue b/packages/hoppscotch-common/src/pages/profile.vue index d6f0c9a09..07475c782 100644 --- a/packages/hoppscotch-common/src/pages/profile.vue +++ b/packages/hoppscotch-common/src/pages/profile.vue @@ -24,7 +24,7 @@
@@ -285,7 +285,6 @@
- @@ -317,6 +316,7 @@ import { deleteShortcode as backendDeleteShortcode } from "~/helpers/backend/mut import IconVerified from "~icons/lucide/verified" import IconSettings from "~icons/lucide/settings" import IconHelpCircle from "~icons/lucide/help-circle" +import { invokeAction } from "~/helpers/actions" type ProfileTabs = "sync" | "teams" @@ -330,8 +330,6 @@ usePageHead({ title: computed(() => t("navigation.profile")), }) -const showLogin = ref(false) - const SYNC_COLLECTIONS = useSetting("syncCollections") const SYNC_ENVIRONMENTS = useSetting("syncEnvironments") const SYNC_HISTORY = useSetting("syncHistory")