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

fix: use base url instead of hardcoded url

Browse Source
This commit is contained in:
Liyas Thomas
2023-12-08 13:48:30 +05:30
committed by Andrew Bastin
parent ebf90207e5
commit b53ae0cefe
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/hoppscotch-common/src/components/embeds/index.vue
View File

@@ -105,9 +105,11 @@ const requestCancelFunc: Ref<(() => void) | null> = ref(null)
const loading = ref(false) const loading = ref(false)
const baseURL = import.meta.env.VITE_SHORTCODE_BASE_URL ?? "https://hopp.sh" const shortcodeBaseURL =
import.meta.env.VITE_SHORTCODE_BASE_URL ?? "https://hopp.sh"
const sharedRequestURL = computed(() => { const sharedRequestURL = computed(() => {
return `${baseURL}/r/${props.sharedRequestID}` return `${shortcodeBaseURL}/r/${props.sharedRequestID}`
}) })
const { subscribeToStream } = useStreamSubscriber() const { subscribeToStream } = useStreamSubscriber()

15
packages/hoppscotch-common/src/components/share/CustomizeModal.vue
View File

@@ -370,10 +370,11 @@ const linkVariants: LinkVariant[] = [
}, },
] ]
const baseURL = import.meta.env.VITE_SHORTCODE_BASE_URL ?? "https://hopp.sh" const shortcodeBaseURL =
import.meta.env.VITE_SHORTCODE_BASE_URL ?? "https://hopp.sh"
const copyEmbed = () => { const copyEmbed = () => {
return `<iframe src="${baseURL}/e/${props.request?.id}' style='width: 100%; height: 500px; border: 0; border-radius: 4px; overflow: hidden;'></iframe>` return `<iframe src="${shortcodeBaseURL}/e/${props.request?.id}" title="Hoppscotch Embed" style="width: 100%; height: 480px; border-radius: 4px; border: 1px solid rgba(0, 0, 0, 0.1);"></iframe>`
} }
const copyButton = ( const copyButton = (
@@ -390,18 +391,18 @@ const copyButton = (
} }
if (type === "markdown") { if (type === "markdown") {
return `[![Run in Hoppscotch](${baseURL}/${badge})](${baseURL}/r/${props.request?.id})` return `[![Run in Hoppscotch](${shortcodeBaseURL}/${badge})](${shortcodeBaseURL}/r/${props.request?.id})`
} }
return `<a href="${baseURL}/r/${props.request?.id}"><img src="${baseURL}/${badge}" alt="Run in Hoppscotch" /></a>` return `<a href="${shortcodeBaseURL}/r/${props.request?.id}"><img src="${shortcodeBaseURL}/${badge}" alt="Run in Hoppscotch" /></a>`
} }
const copyLink = (variationID: string) => { const copyLink = (variationID: string) => {
if (variationID === "link1") { if (variationID === "link1") {
return `${baseURL}/r/${props.request?.id}` return `${shortcodeBaseURL}/r/${props.request?.id}`
} else if (variationID === "link2") { } else if (variationID === "link2") {
return `<a href="${baseURL}/r/${props.request?.id}">Run in Hoppscotch</a>` return `<a href="${shortcodeBaseURL}/r/${props.request?.id}">Run in Hoppscotch</a>`
} }
return `[Run in Hoppscotch](${baseURL}/r/${props.request?.id})` return `[Run in Hoppscotch](${shortcodeBaseURL}/r/${props.request?.id})`
} }
const copyContent = ({ const copyContent = ({

7
packages/hoppscotch-common/src/components/share/templates/Link.vue
View File

@@ -21,7 +21,12 @@ const props = defineProps<{
label?: string | undefined label?: string | undefined
}>() }>()
const shortcodeBaseURL =
import.meta.env.VITE_SHORTCODE_BASE_URL ?? "https://hopp.sh"
const text = computed(() => { const text = computed(() => {
return props.label ? t(props.label) : `hopp.sh/r/${props.link ?? "xxxx"}` return props.label
? t(props.label)
: `${shortcodeBaseURL}/r/${props.link ?? "xxxx"}`
}) })
</script> </script>