Compare commits

..

4 Commits

Author SHA1 Message Date
Andrew Bastin
1cce117b0a chore: bump version to 2023.4.4 2023-06-02 11:06:51 -04:00
Liyas Thomas
abc7b4b6f3 chore: improve mobile responsiveness on environment selector (#3100) 2023-06-02 10:56:18 -04:00
Ankit Sridhar
05e32ef9e4 fix: update team invitation link to domain specified in .env [HBE-202] (#3096) 2023-05-31 10:36:34 -04:00
Nivedin
f0a1fc319c fix: sync popup firing multiple times (#3063) 2023-05-30 23:36:37 -04:00
10 changed files with 443 additions and 144 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "hoppscotch-backend", "name": "hoppscotch-backend",
"version": "2023.4.3", "version": "2023.4.4",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,

View File

@@ -126,7 +126,7 @@ export class TeamInvitationService {
template: 'team-invitation', template: 'team-invitation',
variables: { variables: {
invitee: creator.displayName ?? 'A Hoppscotch User', invitee: creator.displayName ?? 'A Hoppscotch User',
action_url: `https://hoppscotch.io/join-team?id=${invitation.id}`, action_url: `${process.env.VITE_BASE_URL}/join-team?id=${invitation.id}`,
invite_team_name: team.name, invite_team_name: team.name,
}, },
}), }),

View File

@@ -1,7 +1,7 @@
{ {
"name": "@hoppscotch/common", "name": "@hoppscotch/common",
"private": true, "private": true,
"version": "2023.4.3", "version": "2023.4.4",
"scripts": { "scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*", "dev": "pnpm exec npm-run-all -p -l dev:*",
"dev:vite": "vite", "dev:vite": "vite",

View File

@@ -126,7 +126,7 @@
/> />
<CollectionsEditRequest <CollectionsEditRequest
:show="showModalEditRequest" :show="showModalEditRequest"
v-bind:model-value="editingRequest ? editingRequest.name : ''" :model-value="editingRequest ? editingRequest.name : ''"
:loading-state="modalLoadingState" :loading-state="modalLoadingState"
@submit="updateEditingRequest" @submit="updateEditingRequest"
@hide-modal="displayModalEditRequest(false)" @hide-modal="displayModalEditRequest(false)"

View File

@@ -11,13 +11,14 @@
class="bg-transparent border-b border-dividerLight select-wrapper" class="bg-transparent border-b border-dividerLight select-wrapper"
> >
<HoppButtonSecondary <HoppButtonSecondary
v-if="selectedEnv.type !== 'NO_ENV_SELECTED'" :icon="IconLayers"
:label="selectedEnv.name" :label="
class="flex-1 !justify-start pr-8 rounded-none" mdAndLarger
/> ? selectedEnv.type !== 'NO_ENV_SELECTED'
<HoppButtonSecondary ? selectedEnv.name
v-else : `${t('environment.select')}`
:label="`${t('environment.select')}`" : ''
"
class="flex-1 !justify-start pr-8 rounded-none" class="flex-1 !justify-start pr-8 rounded-none"
/> />
</span> </span>
@@ -58,6 +59,7 @@
<HoppSmartItem <HoppSmartItem
v-for="(gen, index) in myEnvironments" v-for="(gen, index) in myEnvironments"
:key="`gen-${index}`" :key="`gen-${index}`"
:icon="IconLayers"
:label="gen.name" :label="gen.name"
:info-icon="index === selectedEnv.index ? IconCheck : undefined" :info-icon="index === selectedEnv.index ? IconCheck : undefined"
:active-info-icon="index === selectedEnv.index" :active-info-icon="index === selectedEnv.index"
@@ -99,6 +101,7 @@
<HoppSmartItem <HoppSmartItem
v-for="(gen, index) in teamEnvironmentList" v-for="(gen, index) in teamEnvironmentList"
:key="`gen-team-${index}`" :key="`gen-team-${index}`"
:icon="IconLayers"
:label="gen.environment.name" :label="gen.environment.name"
:info-icon=" :info-icon="
gen.id === selectedEnv.teamEnvID ? IconCheck : undefined gen.id === selectedEnv.teamEnvID ? IconCheck : undefined
@@ -148,6 +151,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed, ref, watch } from "vue" import { computed, ref, watch } from "vue"
import IconCheck from "~icons/lucide/check" import IconCheck from "~icons/lucide/check"
import IconLayers from "~icons/lucide/layers"
import { TippyComponent } from "vue-tippy" import { TippyComponent } from "vue-tippy"
import { useI18n } from "~/composables/i18n" import { useI18n } from "~/composables/i18n"
import { GQLError } from "~/helpers/backend/GQLClient" import { GQLError } from "~/helpers/backend/GQLClient"
@@ -160,6 +164,10 @@ import {
import { workspaceStatus$ } from "~/newstore/workspace" import { workspaceStatus$ } from "~/newstore/workspace"
import TeamEnvironmentAdapter from "~/helpers/teams/TeamEnvironmentAdapter" import TeamEnvironmentAdapter from "~/helpers/teams/TeamEnvironmentAdapter"
import { useColorMode } from "@composables/theming" import { useColorMode } from "@composables/theming"
import { breakpointsTailwind, useBreakpoints } from "@vueuse/core"
const breakpoints = useBreakpoints(breakpointsTailwind)
const mdAndLarger = breakpoints.greater("md")
const t = useI18n() const t = useI18n()

View File

@@ -66,8 +66,8 @@
</template> </template>
</AppPaneLayout> </AppPaneLayout>
<CollectionsEditRequest <CollectionsEditRequest
:show="showRenamingReqNameModal"
v-model="reqName" v-model="reqName"
:show="showRenamingReqNameModal"
@submit="renameReqName" @submit="renameReqName"
@hide-modal="showRenamingReqNameModal = false" @hide-modal="showRenamingReqNameModal = false"
/> />

View File

@@ -1,7 +1,7 @@
{ {
"name": "@hoppscotch/selfhost-web", "name": "@hoppscotch/selfhost-web",
"private": true, "private": true,
"version": "2023.4.3", "version": "2023.4.4",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev:vite": "vite", "dev:vite": "vite",

View File

@@ -1,7 +1,7 @@
{ {
"name": "hoppscotch-sh-admin", "name": "hoppscotch-sh-admin",
"private": true, "private": true,
"version": "2023.4.3", "version": "2023.4.4",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*", "dev": "pnpm exec npm-run-all -p -l dev:*",

View File

@@ -100,7 +100,7 @@
</div> </div>
</div> </div>
<div v-if="hasActions" class="w-64"> <div v-if="hasActions" :class="mdAndLarger ? 'w-64' : 'w-16'">
<slot name="actions" /> <slot name="actions" />
</div> </div>
@@ -115,7 +115,7 @@
}" }"
:style="[ :style="[
`--thumb-width: ${scrollThumb.width}px`, `--thumb-width: ${scrollThumb.width}px`,
`width: calc(100% - ${hasActions ? '19rem' : '3rem'})`, `width: calc(100% - ${hasActions ? mdAndLarger ? '19rem' : '7rem' : '3rem'})`,
]" ]"
id="myRange" id="myRange"
/> />
@@ -144,7 +144,7 @@ import {
nextTick, nextTick,
useSlots, useSlots,
} from "vue" } from "vue"
import { useElementSize } from "@vueuse/core" import { breakpointsTailwind, useBreakpoints, useElementSize } from "@vueuse/core"
import type { Slot } from "vue" import type { Slot } from "vue"
import draggable from "vuedraggable-es" import draggable from "vuedraggable-es"
import { HoppUIPluginOptions, HOPP_UI_OPTIONS } from "./../../index" import { HoppUIPluginOptions, HOPP_UI_OPTIONS } from "./../../index"
@@ -167,6 +167,9 @@ export type TabProvider = {
removeTabEntry: (tabID: string) => void removeTabEntry: (tabID: string) => void
} }
const breakpoints = useBreakpoints(breakpointsTailwind)
const mdAndLarger = breakpoints.greater("md")
const { t } = inject<HoppUIPluginOptions>(HOPP_UI_OPTIONS) ?? {} const { t } = inject<HoppUIPluginOptions>(HOPP_UI_OPTIONS) ?? {}
const props = withDefaults( const props = withDefaults(

542
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff